Skip to content
This repository
Browse code

MINOR Moved "insert x" dialog styling from generic UploadField.scss t…

…o CMS-specific _style.scss
  • Loading branch information...
commit 9009d43f632647a60db40e3fa55a18ccf1504c4a 1 parent f0f6f1a
Ingo Schommer authored June 11, 2012
19  admin/css/screen.css
@@ -526,6 +526,25 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .
526 526
 body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; position: relative; }
527 527
 
528 528
 /** -------------------------------------------- "Insert X" forms -------------------------------------------- */
  529
+.htmleditorfield-dialog.ui-dialog-content { padding: 0; position: relative; }
  530
+.htmleditorfield-dialog .cms-content-header { padding: 0; width: 100%; height: 40px; }
  531
+.htmleditorfield-dialog .cms-content-header h3 { padding: 0 8px; margin: 10px; }
  532
+.htmleditorfield-dialog .ui-tabs { position: static; }
  533
+.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav { float: right; position: absolute; top: 0; right: 40px; }
  534
+.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzhjYTFhZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); -webkit-border-radius: 0px; -moz-border-radius: 0px; -ms-border-radius: 0px; -o-border-radius: 0px; border-radius: 0px; padding-top: 10px; height: 28px; overflow: hidden; font-weight: bold; }
  535
+.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li a { color: #fff; text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2); }
  536
+.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active { background: #f0f3f4 url("../admin/images/textures/bg_cms_main_content.png") repeat left top; }
  537
+.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active a { color: #444444; text-shadow: none; }
  538
+.htmleditorfield-dialog .ui-tabs .ui-tabs-panel { padding: 0; }
  539
+.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions { padding: 8px 16px; }
  540
+.htmleditorfield-dialog .details .file-url { display: block; width: 450px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
  541
+.htmleditorfield-dialog .details .cms-file-info .field { border: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
  542
+.htmleditorfield-dialog .details .field { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
  543
+.htmleditorfield-dialog .details .field.last { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); margin-bottom: 0; }
  544
+.htmleditorfield-dialog .details .img-detail-group { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px 0; }
  545
+.htmleditorfield-dialog .details .img-detail-group .extraLabel { display: block; position: relative; top: -8px; margin-left: 184px; color: #ccc; color: rgba(0, 0, 0, 0.5); font-style: italic; padding: 0; text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.7); }
  546
+.htmleditorfield-dialog .details .img-detail-group .field { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
  547
+
529 548
 .htmleditorfield-linkform .step2 { margin-bottom: 16px; }
530 549
 
531 550
 .htmleditorfield-mediaform .ss-gridfield tbody td:first-child img { max-height: 30px; }
95  admin/scss/_style.scss
@@ -1429,6 +1429,101 @@ body.cms-dialog {
1429 1429
 /** --------------------------------------------
1430 1430
  * "Insert X" forms
1431 1431
  * -------------------------------------------- */
  1432
+.htmleditorfield-dialog{
  1433
+	&.ui-dialog-content{
  1434
+		padding:0;
  1435
+		position:relative;
  1436
+	}
  1437
+
  1438
+	.cms-content-header{
  1439
+		padding:0;
  1440
+		width:100%;
  1441
+		height: 40px;
  1442
+		h3{
  1443
+			padding: 0 8px;
  1444
+			margin: 10px;
  1445
+		}
  1446
+	}
  1447
+	.ui-tabs{
  1448
+		position:static;
  1449
+		ul.ui-tabs-nav{
  1450
+			float:right;
  1451
+			position:absolute;
  1452
+			top:0;
  1453
+			right: 40px;
  1454
+			li{
  1455
+				@include background-image(
  1456
+					linear-gradient(#B0BEC7, #8CA1AE)
  1457
+				);			
  1458
+				@include border-radius(0px);
  1459
+				padding-top: 10px;
  1460
+				height: 28px;
  1461
+				overflow:hidden;
  1462
+				font-weight:bold;
  1463
+				a{
  1464
+					color:#fff;
  1465
+					text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
  1466
+				}
  1467
+				&.ui-state-active{
  1468
+					background:  #F0F3F4 url("../admin/images/textures/bg_cms_main_content.png") repeat left top;
  1469
+					a{
  1470
+						color:$color-text;
  1471
+						text-shadow: none;
  1472
+					}
  1473
+				}
  1474
+			}
  1475
+		}
  1476
+		.ui-tabs-panel{
  1477
+			padding:0;
  1478
+		}
  1479
+	}
  1480
+	.ss-insert-media, .Actions{
  1481
+		padding:$grid-y $grid-x*2 ;
  1482
+	}
  1483
+	.details{
  1484
+		.file-url{
  1485
+			display:block;
  1486
+			width:450px;
  1487
+			@include hide-text-overflow;
  1488
+		}
  1489
+		.cms-file-info{
  1490
+			.field{
  1491
+				border:none;
  1492
+				@include box-shadow(0 0 0 rgba(0, 0, 0, 0));
  1493
+			}
  1494
+		}
  1495
+		.field{
  1496
+			border-bottom: 1px solid $color-shadow-light;
  1497
+    		@include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));
  1498
+    		&.last{				
  1499
+				border-bottom:none;
  1500
+				@include box-shadow(0 0 0 rgba(0, 0, 0, 0));
  1501
+				margin-bottom:0;
  1502
+			}	
  1503
+		}
  1504
+		.img-detail-group{
  1505
+			border-bottom: 1px solid $color-shadow-light;
  1506
+    		@include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));
  1507
+    		margin: 0 0 8px 0;
  1508
+    		.extraLabel{
  1509
+				display:block;
  1510
+				position:relative;
  1511
+				top: 0 - $grid-y;
  1512
+				margin-left:176px + $grid-y; //width of main label
  1513
+				color: #ccc;
  1514
+				color: rgba(#000, 0.5);
  1515
+				font-style:italic;
  1516
+				padding:0;
  1517
+				@include text-shadow(1px 1px 0 rgba($color-text-shadow, 0.7));
  1518
+			}					
  1519
+			.field{
  1520
+				border-bottom:none;
  1521
+				@include box-shadow(0 0 0 rgba(0, 0, 0, 0));
  1522
+			}
  1523
+		}
  1524
+	}
  1525
+}
  1526
+
1432 1527
 .htmleditorfield-linkform {
1433 1528
 	.step2 {
1434 1529
 		margin-bottom: $grid-x*2;
21  css/UploadField.css
@@ -4,25 +4,6 @@
4 4
 /** ----------------------------------------------- Typography.  ------------------------------------------------ */
5 5
 /** ----------------------------------------------- Grid Units (px)  We have a vertical rhythm that the grid is based off both x (=horizontal) and y (=vertical). All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */
6 6
 /** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
7  
-.htmleditorfield-dialog.ui-dialog-content { padding: 0; position: relative; }
8  
-.htmleditorfield-dialog .cms-content-header { padding: 0; width: 100%; height: 40px; }
9  
-.htmleditorfield-dialog .cms-content-header h3 { padding: 0 8px; margin: 10px; }
10  
-.htmleditorfield-dialog .ui-tabs { position: static; }
11  
-.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav { float: right; position: absolute; top: 0; right: 40px; }
12  
-.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); -webkit-border-radius: 0px; -moz-border-radius: 0px; -ms-border-radius: 0px; -o-border-radius: 0px; border-radius: 0px; padding-top: 10px; height: 28px; overflow: hidden; font-weight: bold; }
13  
-.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li a { color: #fff; text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2); }
14  
-.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active { background: #f0f3f4 url("../admin/images/textures/bg_cms_main_content.png") repeat left top; }
15  
-.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active a { color: #444444; text-shadow: none; }
16  
-.htmleditorfield-dialog .ui-tabs .ui-tabs-panel { padding: 0; }
17  
-.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions { padding: 8px 16px; }
18  
-.htmleditorfield-dialog .details .file-url { display: block; width: 450px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; }
19  
-.htmleditorfield-dialog .details .cms-file-info .field { border: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
20  
-.htmleditorfield-dialog .details .field { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
21  
-.htmleditorfield-dialog .details .field.last { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); margin-bottom: 0; }
22  
-.htmleditorfield-dialog .details .img-detail-group { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px 0; }
23  
-.htmleditorfield-dialog .details .img-detail-group .extraLabel { display: block; position: relative; top: -8px; margin-left: 184px; color: #ccc; color: rgba(0, 0, 0, 0.5); font-style: italic; padding: 0; text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.7); }
24  
-.htmleditorfield-dialog .details .img-detail-group .field { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
25  
-
26 7
 .ss-uploadfield .clear { clear: both; }
27 8
 .ss-insert-media .ss-uploadfield { margin-top: 20px; }
28 9
 .ss-insert-media .ss-uploadfield h4 { float: left; }
@@ -33,7 +14,7 @@
33 14
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info { margin: 0 0 0 100px; }
34 15
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name { display: block; line-height: 13px; height: 26px; margin: 0; text-align: left; }
35 16
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name b { font-weight: bold; padding: 0 5px 0 0; }
36  
-.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .name { font-size: 11px; color: #848484; width: 290px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; display: inline; float: left; }
  17
+.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .name { font-size: 11px; color: #848484; width: 290px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; display: inline; float: left; }
37 18
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status { float: right; padding: 0 0 0 5px; width: 100px; text-align: right; }
38 19
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-error-text { color: red; font-weight: bold; }
39 20
 .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #cc7600; }
98  scss/UploadField.scss
@@ -4,104 +4,6 @@
4 4
 @import "../admin/scss/themes/default.scss";
5 5
 @import "../admin/scss/_mixins";
6 6
 
7  
-.htmleditorfield-dialog{
8  
-	&.ui-dialog-content{
9  
-		padding:0;
10  
-		position:relative;
11  
-	}
12  
-
13  
-	.cms-content-header{
14  
-		padding:0;
15  
-		width:100%;
16  
-		height: 40px;
17  
-		h3{
18  
-			padding: 0 8px;
19  
-			margin: 10px;
20  
-		}
21  
-	}
22  
-	.ui-tabs{
23  
-		position:static;
24  
-		ul.ui-tabs-nav{
25  
-			float:right;
26  
-			position:absolute;
27  
-			top:0;
28  
-			right: 40px;
29  
-			li{
30  
-				@include background-image(
31  
-					linear-gradient(#B0BEC7, #8CA1AE)
32  
-				);			
33  
-				@include border-radius(0px);
34  
-				padding-top: 10px;
35  
-				height: 28px;
36  
-				overflow:hidden;
37  
-				font-weight:bold;
38  
-				a{
39  
-					color:#fff;
40  
-					text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
41  
-				}
42  
-				&.ui-state-active{
43  
-					background:  #F0F3F4 url("../admin/images/textures/bg_cms_main_content.png") repeat left top;
44  
-					a{
45  
-						color:$color-text;
46  
-						text-shadow: none;
47  
-					}
48  
-				}
49  
-			}
50  
-		}
51  
-		.ui-tabs-panel{
52  
-			padding:0;
53  
-		}
54  
-	}
55  
-	.ss-insert-media, .Actions{
56  
-		padding:$grid-y $grid-x*2 ;
57  
-	}
58  
-	.details{
59  
-
60  
-		.file-url{
61  
-			display:block;
62  
-			width:450px;
63  
-			@include hide-text-overflow;
64  
-		}
65  
-
66  
-
67  
-		.cms-file-info{
68  
-			.field{
69  
-				border:none;
70  
-				@include box-shadow(0 0 0 rgba(0, 0, 0, 0));
71  
-			}
72  
-		}
73  
-		.field{
74  
-			border-bottom: 1px solid $color-shadow-light;
75  
-    		@include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));
76  
-    		&.last{				
77  
-				border-bottom:none;
78  
-				@include box-shadow(0 0 0 rgba(0, 0, 0, 0));
79  
-				margin-bottom:0;
80  
-			}	
81  
-		}
82  
-		.img-detail-group{
83  
-			border-bottom: 1px solid $color-shadow-light;
84  
-    		@include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));
85  
-    		margin: 0 0 8px 0;
86  
-    		.extraLabel{
87  
-				display:block;
88  
-				position:relative;
89  
-				top: 0 - $grid-y;
90  
-				margin-left:176px + $grid-y; //width of main label
91  
-				color: #ccc;
92  
-				color: rgba(#000, 0.5);
93  
-				font-style:italic;
94  
-				padding:0;
95  
-				@include text-shadow(1px 1px 0 rgba($color-text-shadow, 0.7));
96  
-			}					
97  
-			.field{
98  
-				border-bottom:none;
99  
-				@include box-shadow(0 0 0 rgba(0, 0, 0, 0));
100  
-			}
101  
-		}
102  
-	}
103  
-}
104  
-
105 7
 .ss-uploadfield {
106 8
 
107 9
 	.clear {

0 notes on commit 9009d43

Please sign in to comment.
Something went wrong with that request. Please try again.