From 42f3c542f8793d1e5c15bc1483328ac0d9639021 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 14 Feb 2012 15:45:56 +0100 Subject: [PATCH] MINOR Shorter SCSS $grid-* variables to promote wider usage (amended) --- admin/scss/_style.scss | 12 ++++++------ css/AssetUploadField.css | 2 +- css/UploadField.css | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 06370b0a5..ef77250a0 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -1079,7 +1079,7 @@ body.cms-dialog { @include border-radius(5px); @include background-clip(padding-box); background: #E2E2E2; - margin-bottom: $grid-horizontal*2; + margin-bottom: $grid-x*2; &.loading { width: 100%; @@ -1096,10 +1096,10 @@ body.cms-dialog { .thumbnail { display: inline-block; vertical-align: middle; - padding: $grid-horizontal/2; + padding: $grid-x/2; img { - max-height: $grid-horizontal*3; + max-height: $grid-x*3; } } @@ -1109,8 +1109,8 @@ body.cms-dialog { background: #fff; border: 1px solid lighten($color-medium-separator, 20%); @include border-radius(5px); - margin-left: $grid-horizontal*2; - padding: $grid-horizontal/2; + margin-left: $grid-x*2; + padding: $grid-x/2; } .action-delete { @@ -1119,7 +1119,7 @@ body.cms-dialog { } .details { - padding: $grid-horizontal*2; + padding: $grid-x*2; } } diff --git a/css/AssetUploadField.css b/css/AssetUploadField.css index b16b53c1e..b593c817c 100644 --- a/css/AssetUploadField.css +++ b/css/AssetUploadField.css @@ -2,7 +2,7 @@ /** ----------------------------------------------- Colours ------------------------------------------------ */ /** ----------------------------------------------- Textures ----------------------------------------------- */ /** ----------------------------------------------- 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 ------------------------------------------------ */ /** Helper SCSS file for generating sprites for the interface. */ /* CMS action button sprite mix-in for UploadField, copied from admin/scss/_forms.scss */ diff --git a/css/UploadField.css b/css/UploadField.css index 9840bd9e2..dc825a9e9 100644 --- a/css/UploadField.css +++ b/css/UploadField.css @@ -2,7 +2,7 @@ /** ----------------------------------------------- Colours ------------------------------------------------ */ /** ----------------------------------------------- Textures ----------------------------------------------- */ /** ----------------------------------------------- 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 ------------------------------------------------ */ /** Helper SCSS file for generating sprites for the interface. */ /* CMS action button sprite mix-in for UploadField, copied from admin/scss/_forms.scss */