Merge branch 'integration' of github.com:silverstripe-big-o/sapphire …

…into integration
silverstripe · Feb 29, 2012 · 08b1a49 · 08b1a49
2 parents bc6ea2e + a7304f3
commit 08b1a49
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 2 deletions.
diff --git a/admin/css/ie7.css b/admin/css/ie7.css
@@ -14,3 +14,5 @@ html { overflow: hidden; }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background-image: none; }
 
 .jstree li a .ui-icon { text-indent: 0px !important; }
+
+.cms table.ss-gridfield-table tbody td button span.ui-button-text { zoom: 1; }
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
@@ -193,6 +193,13 @@ body.cms {
 					text-indent:0;
 				}
 			}
+			.ui-state-default, 
+			.ui-widget-content .ui-state-default, 
+			.ui-widget-header .ui-state-default {
+				a {
+					color:$color-text-dark;
+				}
+			}
 		}
 	}		
 }
@@ -1240,9 +1247,55 @@ body.cms-dialog {
 	.field {
 		width:100%;
 		.fieldgroup { 
-			height:$grid-y * 30;
+			height:$grid-y * 40;
 			float:left;
 		 	.fieldgroup-field.first {
+		 		.ss-uploadfield-item {
+					margin: 0;
+					padding: $grid-x * 2;
+					overflow: auto;
+					.ss-uploadfield-item-preview {
+						height: $grid-y * 12;
+						line-height: $grid-y * 12;
+						width: $grid-x * 33;
+						text-align: center;
+						font: {
+							weight:bold;
+							size:$font-base-size * 1.8;
+						}	
+						float: left;
+						overflow: hidden;
+						&.ss-uploadfield-dropzone { 
+							@include box-shadow(lighten($color-medium-separator, 10%) 0 0 3px 3px inset);
+							border: 2px dashed $color-medium-separator;
+							background: $color-light-separator;
+						}
+					}	
+					.ss-uploadfield-item-name {
+						float:none;
+						display:block;
+						clear:both;
+						padding:$grid-y 0;
+					}
+					.ss-uploadfield-fromcomputer {
+						padding-top:0px;
+						margin-right:$grid-x;
+						span.ui-button-text {
+							padding-left:$grid-x * 3.5;
+						}
+						.ss-uploadfield {
+							position:absolute;
+							left:-9999em;
+						}
+					}
+					.ss-uploadfield-fromfiles {
+						padding-top:0px;
+						margin:0;
+						span.ui-button-text {
+							padding-left:$grid-x * 3.5;
+						}
+					}
+				}
 		 		position:relative;
 		 		margin-left:0px;
 		 	}

diff --git a/admin/scss/ie7.scss b/admin/scss/ie7.scss
@@ -51,4 +51,18 @@ html {
 // fix jstree themeroller plugin bug: tree disappear in IE7
 .jstree li a .ui-icon {
 	text-indent: 0px !important;
+}
+
+.cms {
+	table.ss-gridfield-table {
+		tbody {
+			td {
+				button {
+					span.ui-button-text {
+						zoom:1;
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/css/GridField.css b/css/GridField.css
diff --git a/scss/GridField.scss b/scss/GridField.scss
@@ -73,6 +73,25 @@ $gf_grid_x:	16px;
 					padding: 0;
 					width: auto;
 					text-shadow: none;
+					&.ui-state-hover {
+						background:none;
+						border:none;
+						@include box-shadow-none;
+					}
+					span.ui-button-text {
+						text-indent:-9999em;
+						background: url(../images/icons/decline.png) no-repeat 0 2px;
+						padding:0;
+						width:20px;
+						height:20px;
+					}
+				}
+				a.edit-link {
+					display:inline-block;
+					height:20px;
+					width:20px;
+					text-indent:-9999em;
+					background: url(../images/icons/document--pencil.png) no-repeat 0 1px;
 				}				
 			}			
 		}