Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…into integration
  • Loading branch information...
commit 08b1a49c2bc574c4f79824ea2453cb1ceb7e00ed 2 parents bc6ea2e + a7304f3
@felipesilverstripe felipesilverstripe authored
View
2  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; }
View
12 admin/css/screen.css
@@ -260,6 +260,7 @@ body.cms { overflow: hidden; }
.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-all, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-top, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-left, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-tl { border-radius: 0; }
.cms-edit-form .cms-content-header-tabs .ui-tabs-nav li a { text-indent: 0; }
+.cms-edit-form .cms-content-header-tabs .ui-tabs-nav .ui-state-default a, .cms-edit-form .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-default a, .cms-edit-form .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-default a { color: #1f1f1f; }
/** -------------------------------------------- Tabs -------------------------------------------- */
.ui-tabs .cms-content-header .ui-tabs-nav li, .cms-dialog .ui-tabs-nav li { margin: 0; }
@@ -466,8 +467,17 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
/** -------------------------------------------- Item Edit Form -------------------------------------------- */
#Form_ItemEditForm .field { width: 100%; }
-#Form_ItemEditForm .field .fieldgroup { height: 240px; float: left; }
+#Form_ItemEditForm .field .fieldgroup { height: 320px; float: left; }
#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first { position: relative; margin-left: 0px; }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item { margin: 0; padding: 16px; overflow: auto; }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-preview { height: 96px; line-height: 96px; width: 264px; text-align: center; font-weight: bold; font-size: 21.6px; float: left; overflow: hidden; }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-preview.ss-uploadfield-dropzone { -moz-box-shadow: #9a9a9a 0 0 3px 3px inset; -webkit-box-shadow: #9a9a9a 0 0 3px 3px inset; -o-box-shadow: #9a9a9a 0 0 3px 3px inset; box-shadow: #9a9a9a 0 0 3px 3px inset; border: 2px dashed gray; background: rgba(201, 205, 206, 0.8); }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-name { float: none; display: block; clear: both; padding: 8px 0; }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer { padding-top: 0px; margin-right: 8px; }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer span.ui-button-text { padding-left: 28px; }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer .ss-uploadfield { position: absolute; left: -9999em; }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromfiles { padding-top: 0px; margin: 0; }
+#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromfiles span.ui-button-text { padding-left: 28px; }
#Form_ItemEditForm .field .fieldgroup .fieldgroup-field { clear: both; width: 500px; margin-left: 420px; }
#Form_ItemEditForm .field .fieldgroup .fieldgroup-field img { -moz-border-radius: 8px; -webkit-border-radius: 8px; -o-border-radius: 8px; -ms-border-radius: 8px; -khtml-border-radius: 8px; border-radius: 8px; border-width: 3px; border-style: dashed; border-color: #8c99a1; position: absolute; top: 8px; }
#Form_ItemEditForm .field .fieldgroup .fieldgroup-field label { font-weight: bold; float: left; padding-top: 8px; line-height: 16px; text-shadow: white 1px 1px 0; }
View
55 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;
}
View
14 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;
+ }
+ }
+ }
+ }
+ }
}
View
3  css/GridField.css
@@ -7,6 +7,9 @@
.cms table.ss-gridfield-table tbody { background: #FFF; }
.cms table.ss-gridfield-table tbody td { /* Emulate a link by default */ }
.cms table.ss-gridfield-table tbody td button { border: none; background: none; margin: 0 0 0 2px; padding: 0; width: auto; text-shadow: none; }
+.cms table.ss-gridfield-table tbody td button.ui-state-hover { background: none; border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
+.cms table.ss-gridfield-table tbody td button span.ui-button-text { text-indent: -9999em; background: url(../images/icons/decline.png) no-repeat 0 2px; padding: 0; width: 20px; height: 20px; }
+.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; height: 20px; width: 20px; text-indent: -9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; }
.cms table.ss-gridfield-table tfoot { color: #1d2224; }
.cms table.ss-gridfield-table tfoot tr td { background: #95a5ab; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); }
.cms table.ss-gridfield-table tr.title { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; }
View
19 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;
}
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.