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

MINOR Shorter SCSS $grid-* variables to promote wider usage (amended)

Browse Source
This commit is contained in:
Ingo Schommer 2012-02-14 15:45:56 +01:00
parent 8d9b00a4fd
commit 42f3c542f8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/scss/_style.scss
View File

@ -1079,7 +1079,7 @@ body.cms-dialog {
@include border-radius(5px); @include border-radius(5px);
@include background-clip(padding-box); @include background-clip(padding-box);
background: #E2E2E2; background: #E2E2E2;
margin-bottom: $grid-horizontal*2; margin-bottom: $grid-x*2;
&.loading { &.loading {
width: 100%; width: 100%;
@ -1096,10 +1096,10 @@ body.cms-dialog {
.thumbnail { .thumbnail {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
padding: $grid-horizontal/2; padding: $grid-x/2;
img { img {
max-height: $grid-horizontal*3; max-height: $grid-x*3;
} }
} }
@ -1109,8 +1109,8 @@ body.cms-dialog {
background: #fff; background: #fff;
border: 1px solid lighten($color-medium-separator, 20%); border: 1px solid lighten($color-medium-separator, 20%);
@include border-radius(5px); @include border-radius(5px);
margin-left: $grid-horizontal*2; margin-left: $grid-x*2;
padding: $grid-horizontal/2; padding: $grid-x/2;
} }
.action-delete { .action-delete {
@ -1119,7 +1119,7 @@ body.cms-dialog {
} }
.details { .details {
padding: $grid-horizontal*2; padding: $grid-x*2;
} }
} }

2
css/AssetUploadField.css
View File

@ -2,7 +2,7 @@
/** ----------------------------------------------- Colours ------------------------------------------------ */ /** ----------------------------------------------- Colours ------------------------------------------------ */
/** ----------------------------------------------- Textures ----------------------------------------------- */ /** ----------------------------------------------- Textures ----------------------------------------------- */
/** ----------------------------------------------- Typography. ------------------------------------------------ */ /** ----------------------------------------------- Typography. ------------------------------------------------ */
/** ----------------------------------------------- Grid Units (px) We have a vertical rhythm that the grid is based off both vertical and horizontal. All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */ /** ----------------------------------------------- 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 ------------------------------------------------ */
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */ /** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
/** Helper SCSS file for generating sprites for the interface. */ /** Helper SCSS file for generating sprites for the interface. */
/* CMS action button sprite mix-in for UploadField, copied from admin/scss/_forms.scss */ /* CMS action button sprite mix-in for UploadField, copied from admin/scss/_forms.scss */

2
css/UploadField.css
View File

@ -2,7 +2,7 @@
/** ----------------------------------------------- Colours ------------------------------------------------ */ /** ----------------------------------------------- Colours ------------------------------------------------ */
/** ----------------------------------------------- Textures ----------------------------------------------- */ /** ----------------------------------------------- Textures ----------------------------------------------- */
/** ----------------------------------------------- Typography. ------------------------------------------------ */ /** ----------------------------------------------- Typography. ------------------------------------------------ */
/** ----------------------------------------------- Grid Units (px) We have a vertical rhythm that the grid is based off both vertical and horizontal. All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */ /** ----------------------------------------------- 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 ------------------------------------------------ */
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */ /** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
/** Helper SCSS file for generating sprites for the interface. */ /** Helper SCSS file for generating sprites for the interface. */
/* CMS action button sprite mix-in for UploadField, copied from admin/scss/_forms.scss */ /* CMS action button sprite mix-in for UploadField, copied from admin/scss/_forms.scss */