Permalink
Browse files

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

…into integration
  • Loading branch information...
2 parents bc6ea2e + a7304f3 commit 08b1a49c2bc574c4f79824ea2453cb1ceb7e00ed @felipesilverstripe felipesilverstripe committed Feb 29, 2012
Showing with 103 additions and 2 deletions.
  1. +2 −0 admin/css/ie7.css
  2. +11 −1 admin/css/screen.css
  3. +54 −1 admin/scss/_style.scss
  4. +14 −0 admin/scss/ie7.scss
  5. +3 −0 css/GridField.css
  6. +19 −0 scss/GridField.scss
View
@@ -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; }
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -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;
}
View
@@ -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;
+ }
+ }
+ }
+ }
+ }
}
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -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;
}
}
}

0 comments on commit 08b1a49

Please sign in to comment.