tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'origin/master' into translation-staging

Browse Source
This commit is contained in:
TeamCity 2012-11-03 08:20:31 +13:00
commit 4e403160f3
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/css/screen.css
View File

@ -135,6 +135,7 @@ body, html { font-size: 12px; line-height: 16px; font-family: Arial, sans-serif;
.cms .ui-widget input, .cms .ui-widget select, .cms .ui-widget textarea, .cms .ui-widget button { color: #444444; font-size: 12px; font-family: Arial, sans-serif; } .cms .ui-widget input, .cms .ui-widget select, .cms .ui-widget textarea, .cms .ui-widget button { color: #444444; font-size: 12px; font-family: Arial, sans-serif; }
.cms .ui-accordion .ui-accordion-header { border-color: #c0c0c2; margin-bottom: 0; } .cms .ui-accordion .ui-accordion-header { border-color: #c0c0c2; margin-bottom: 0; }
.cms .ui-accordion .ui-accordion-content { border: 1px solid #c0c0c2; border-top: none; } .cms .ui-accordion .ui-accordion-content { border: 1px solid #c0c0c2; border-top: none; }
.cms .ui-autocomplete { max-height: 240px; overflow-x: hidden; overflow-y: auto; }
/** This file defines common styles for form elements used throughout the CMS interface. It is an addition to the base styles defined in framework/css/Form.css. @package framework @subpackage admin */ /** This file defines common styles for form elements used throughout the CMS interface. It is an addition to the base styles defined in framework/css/Form.css. @package framework @subpackage admin */
/** ---------------------------------------------------- Basic form fields ---------------------------------------------------- */ /** ---------------------------------------------------- Basic form fields ---------------------------------------------------- */

13
admin/scss/_uitheme.scss
View File

@ -51,8 +51,7 @@
font-size: $font-base-size; font-size: $font-base-size;
font-family: $font-family; font-family: $font-family;
border: 0; border: 0;
} }
.ui-widget-header { .ui-widget-header {
background-color: darken($color-widget-bg, 20%); background-color: darken($color-widget-bg, 20%);
@ -68,9 +67,7 @@
& .ui-dialog-title { & .ui-dialog-title {
padding: 6px 0; padding: 6px 0;
text-shadow: lighten($color-base, 10%) 1px 1px 0; text-shadow: lighten($color-base, 10%) 1px 1px 0;
} }
& a.ui-dialog-titlebar-close { & a.ui-dialog-titlebar-close {
position: absolute; position: absolute;
@ -120,4 +117,10 @@
border-top: none; border-top: none;
} }
} }
.ui-autocomplete{
max-height: 240px;
overflow-x: hidden;
overflow-y: auto;
}
} }

1
scss/GridField.scss
View File

@ -118,7 +118,6 @@ $gf_grid_x: 16px;
display: inline-block; display: inline-block;
} }
} }
table.ss-gridfield-table { table.ss-gridfield-table {
display: table; display: table;
@include box-shadow-none; @include box-shadow-none;