From 4a630af54adb0edacccbb033c200a86f0a0956cb Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Mon, 10 Jun 2013 09:51:49 +0200 Subject: [PATCH] Removing box-shadow() mixin references that are deprecated in Bourbon, missed in previous commit. See #44 --- core/admin/assets/sass/layouts/editor.scss | 26 +++++----- core/admin/assets/sass/layouts/login.scss | 2 +- core/admin/assets/sass/layouts/manage.scss | 7 ++- core/admin/assets/sass/layouts/settings.scss | 10 ++-- core/admin/assets/sass/modules/forms.scss | 18 ++++--- core/admin/assets/sass/modules/global.scss | 50 ++++++++++---------- core/admin/assets/sass/modules/mixins.scss | 4 -- 7 files changed, 55 insertions(+), 62 deletions(-) diff --git a/core/admin/assets/sass/layouts/editor.scss b/core/admin/assets/sass/layouts/editor.scss index 66b75fa653..60e806961a 100644 --- a/core/admin/assets/sass/layouts/editor.scss +++ b/core/admin/assets/sass/layouts/editor.scss @@ -26,7 +26,7 @@ position:relative; @include breakpoint($mobile) { - @include box-shadow(none); + box-shadow: none; } input { @@ -59,7 +59,7 @@ box-shadow: $shadow; @include breakpoint($mobile) { - @include box-shadow(none); + box-shadow: none; } // Convert all content areas to small boxes @@ -91,7 +91,7 @@ position:absolute; top:-40px; left:0; - @include box-shadow(rgba(0,0,0,0.1) 0 -2px 3px inset); + box-shadow: rgba(0,0,0,0.1) 0 -2px 3px inset; a { color:#fff; @@ -135,7 +135,7 @@ cursor:auto; color: $brown; background:#fff; - @include box-shadow(none); + box-shadow: none; a { color: $brown; } @@ -253,7 +253,7 @@ .floatingheader { @include breakpoint($netbook) { - @include box-shadow(none); + box-shadow: none; } &::before, @@ -264,7 +264,7 @@ .CodeMirror-scroll, .entry-preview-content { @include breakpoint($netbook) { - @include box-shadow(0 5px 5px rgba(0,0,0,0.05) inset); + box-shadow: 0 5px 5px rgba(0,0,0,0.05) inset; } } } @@ -364,7 +364,7 @@ body.zen { left:0; right:0; z-index:900; - @include box-shadow(0 -2px 8px rgba(0,0,0,0.2)); + box-shadow: 0 -2px 8px rgba(0,0,0,0.2); @include breakpoint($netbook) {font-weight:normal;} @@ -384,7 +384,7 @@ body.zen { min-height: 30px; height: 30px; margin-top:5px; - @include box-shadow(rgba(255,255,255,0.4) 0 1px 0 inset); + box-shadow: rgba(255,255,255,0.4) 0 1px 0 inset; &.up:hover { @include icon($i-chevron-down) { @@ -460,10 +460,9 @@ body.zen { color: $lightgrey; background: lighten($grey, 15%); border-radius: $rounded; - @include box-shadow( + box-shadow: rgba(255,255,255,0.2) 0 1px 0 inset, - #000 0 1px 3px - ); + #000 0 1px 3px; &:hover { cursor: pointer; @@ -478,10 +477,9 @@ body.zen { li.selected{ background: $blue; - @include box-shadow( + box-shadow: rgba(255,255,255,0.2) 0 1px 0 inset, - rgba(0,0,0,0.5) 0 1px 5px - ); + rgba(0,0,0,0.5) 0 1px 5px; } mark{ diff --git a/core/admin/assets/sass/layouts/login.scss b/core/admin/assets/sass/layouts/login.scss index e6d8ef3e8a..8cb6df51dc 100644 --- a/core/admin/assets/sass/layouts/login.scss +++ b/core/admin/assets/sass/layouts/login.scss @@ -125,7 +125,7 @@ padding: 9px; min-height: 30px; min-width: 80px; - @include box-shadow(rgba(255,255,255,0.15) 0 1px 0 inset); + box-shadow: rgba(255,255,255,0.15) 0 1px 0 inset; @include breakpoint(630px) { margin:0; diff --git a/core/admin/assets/sass/layouts/manage.scss b/core/admin/assets/sass/layouts/manage.scss index ede8b47b4a..d5b0e88b33 100644 --- a/core/admin/assets/sass/layouts/manage.scss +++ b/core/admin/assets/sass/layouts/manage.scss @@ -133,14 +133,13 @@ border-bottom: lighten($midgrey, 40%) 1px solid; background: lighten($midgrey, 45%); - @include box-shadow( + box-shadow: lighten($midgrey, 40%) 0 -1px 0, // top border rgba(0,0,0,0.06) 7px 0 0 inset, // big left border - lighten($midgrey, 40%) 1px 0 0 inset // small left border - ); + lighten($midgrey, 40%) 1px 0 0 inset; // small left border a:hover { - @include box-shadow(rgba(0,0,0,0.1) 7px 0 0 inset); + box-shadow: rgba(0,0,0,0.1) 7px 0 0 inset; @include transition(all 0.4s ease); } diff --git a/core/admin/assets/sass/layouts/settings.scss b/core/admin/assets/sass/layouts/settings.scss index 96bb05cc5f..368e9d6c25 100644 --- a/core/admin/assets/sass/layouts/settings.scss +++ b/core/admin/assets/sass/layouts/settings.scss @@ -51,10 +51,10 @@ left:0; bottom:0; z-index: 700; - @include box-shadow($lightbrown 1px 0 0); + box-shadow: $lightbrown 1px 0 0; @include breakpoint($tablet) { width:100%; - @include box-shadow(none); + box-shadow: none; } > header { @@ -62,7 +62,7 @@ padding: 30px 15px 30px 40px; margin-bottom: 0; border-bottom: none; - @include box-shadow(#edece4 0 -1px 0 inset); + box-shadow: #edece4 0 -1px 0 inset; @include breakpoint($netbook) { padding-left: 15px; }; @@ -112,7 +112,9 @@ position:relative; z-index: 300; border-top: #edece4 1px solid; - @include box-shadow(#fff 1px 0 0, #edece4 0 1px 0); + box-shadow: + #fff 1px 0 0, + #edece4 0 1px 0; @include transition; a { diff --git a/core/admin/assets/sass/modules/forms.scss b/core/admin/assets/sass/modules/forms.scss index fc48b6fc65..bfb37f6ed6 100644 --- a/core/admin/assets/sass/modules/forms.scss +++ b/core/admin/assets/sass/modules/forms.scss @@ -175,7 +175,7 @@ input[type="button"] { color:#777; font-weight: normal; background: #eee; - @include box-shadow(none); + box-shadow: none; &:hover { border-color: rgba(0,0,0,0.1); } @@ -187,7 +187,7 @@ button[type="submit"], input[type="submit"] { @extend %button; background: $blue; - @include box-shadow(none); + box-shadow: none; &:hover {background: darken($blue, 10%);} } @@ -204,7 +204,7 @@ button[type="reset"], input[type="reset"] { @extend %button; background: $red; - @include box-shadow(none); + box-shadow: none; &:hover {background: darken($red, 10%);} } @@ -266,11 +266,10 @@ input[type="reset"] { color: #fff; background: #e5e5e5; border-radius: 0 2px 2px 0; - @include box-shadow( + box-shadow: rgba(0,0,0,0.02) 0 1px 0 inset, rgba(0,0,0,0.02) -1px 0 0 inset, - rgba(0,0,0,0.02) 0 -1px 0 inset - ); + rgba(0,0,0,0.02) 0 -1px 0 inset; @include icon($i-chevron-down, 9px) { position: absolute; top: 50%; @@ -282,7 +281,7 @@ input[type="reset"] { // Spin the arrow on hover &:hover { - @include box-shadow(none); + box-shadow: none; background: #f8f8f8; @include icon($i-chevron-down) { @include transform(rotate(360deg)); @@ -306,11 +305,10 @@ input[type="reset"] { .options { color:#777; &:hover { - @include box-shadow( + box-shadow: rgba(0,0,0,0.07) 0 1px 0 inset, rgba(0,0,0,0.07) -1px 0 0 inset, - rgba(0,0,0,0.07) 0 -1px 0 inset - ); + rgba(0,0,0,0.07) 0 -1px 0 inset; } } } diff --git a/core/admin/assets/sass/modules/global.scss b/core/admin/assets/sass/modules/global.scss index 8e42292b48..e4ea78216b 100644 --- a/core/admin/assets/sass/modules/global.scss +++ b/core/admin/assets/sass/modules/global.scss @@ -106,24 +106,25 @@ h2 { h1 a:hover { text-decoration: none; - @include box-shadow($blue 0 -5px 0 inset); + + box-shadow: $blue 0 -5px 0 inset; } h2 a:hover { text-decoration: none; - @include box-shadow($blue 0 -4px 0 inset); + box-shadow: $blue 0 -4px 0 inset; } h3 a:hover { text-decoration: none; - @include box-shadow($blue 0 -3px 0 inset); + box-shadow: $blue 0 -3px 0 inset; } h4 a:hover, h5 a:hover, h6 a:hover { text-decoration: none; - @include box-shadow($blue 0 -1px 0 inset); + box-shadow: $blue 0 -1px 0 inset; } hgroup { @@ -140,7 +141,7 @@ hgroup { color: $darkgrey; &:hover { - @include box-shadow($darkgrey 0 -1px 0 inset); + box-shadow: $darkgrey 0 -1px 0 inset; } } @@ -285,7 +286,9 @@ kbd { font-weight: bold; background: #f4f4f4; border-radius: 4px; - @include box-shadow(0 1px 0 rgba(0, 0, 0, 0.2),0 1px 0 0 #fff inset); + box-shadow: + 0 1px 0 rgba(0, 0, 0, 0.2), + 0 1px 0 0 #fff inset; } // Tabular Data @@ -424,7 +427,7 @@ nav { text-decoration: none; position:relative; background:darken($grey, 2%); - @include box-shadow(0 -2px 2px rgba(0,0,0,0.2) inset); + box-shadow: 0 -2px 2px rgba(0,0,0,0.2) inset; } // Make a little arrow pointing up at the currently active menu item @@ -482,7 +485,7 @@ nav { color: $lightgrey; background: darken($grey, 3%); @include transition(none); - @include box-shadow(none); + box-shadow: none; } } @@ -496,7 +499,7 @@ nav { left:-1px; z-index: 800; background:darken($grey, 3%); - @include box-shadow(rgba(0,0,0,0.2) 0 4px 6px); + box-shadow: rgba(0,0,0,0.2) 0 4px 6px; } li { @@ -506,7 +509,7 @@ nav { &:hover { background: darken($darkgrey, 10%); @include transition(none); - @include box-shadow(none); + box-shadow: none; } &:before { margin-right: 1em; } // space for icons @@ -605,7 +608,7 @@ nav { border-bottom:$grey 1px solid; a:hover, - &.active a {@include box-shadow(none)} + &.active a {box-shadow: none;} &.active a:after {display:none;} @@ -652,13 +655,13 @@ nav { > ul { padding: 0; - @include box-shadow(none); + box-shadow: none; width: 100%; font-weight: 300; } .open { - @include box-shadow(rgba(0,0,0,0.4) 0 10px 20px); + box-shadow: rgba(0,0,0,0.4) 0 10px 20px; } li { @@ -707,7 +710,7 @@ nav { color: $lightgrey; background: $darkgrey; border-radius: 3px; - @include box-shadow(rgba(0,0,0,0.5) 0 1px 15px); + box-shadow: rgba(0,0,0,0.5) 0 1px 15px; // The triangle chiclet that points to where the menu came from // By default, this is bottom center. @@ -739,10 +742,9 @@ nav { &:hover { background: $blue; - @include box-shadow( + box-shadow: rgba(255,255,255,0.2) 0 1px 0 inset, - rgba(0,0,0,0.5) 0 1px 5px - ); + rgba(0,0,0,0.5) 0 1px 5px; } } @@ -949,10 +951,9 @@ main { .scrolling { .floatingheader { - @include box-shadow( + box-shadow: rgba(0,0,0,0.02) 0 1px 2px, - rgba(255, 255, 255, 0.5) 0 -1px 0 inset - ); + rgba(255, 255, 255, 0.5) 0 -1px 0 inset; &::before { content: ""; @@ -962,7 +963,7 @@ main { bottom:0; left:50%; margin-left: -40%; - @include box-shadow(rgba(0,0,0,0.02) 0 2px 2px); + box-shadow: rgba(0,0,0,0.02) 0 2px 2px; } &::after { content: ""; @@ -972,7 +973,7 @@ main { bottom:0; left:50%; margin-left: -15%; - @include box-shadow(rgba(0,0,0,0.02) 0 3px 3px); + box-shadow: rgba(0,0,0,0.02) 0 3px 3px; } } @@ -1068,12 +1069,11 @@ main { @include transition; &:hover { - @include box-shadow( + box-shadow: rgba(0,0,0,0.05) 5px 0 0 inset, rgba(0,0,0,0.05) -5px 0 0 inset, rgba(0,0,0,0.05) 0 5px 0 inset, - rgba(0,0,0,0.05) 0 -5px 0 inset - ); + rgba(0,0,0,0.05) 0 -5px 0 inset; @include transition; } diff --git a/core/admin/assets/sass/modules/mixins.scss b/core/admin/assets/sass/modules/mixins.scss index 57019e46a9..ff0a22d6d5 100644 --- a/core/admin/assets/sass/modules/mixins.scss +++ b/core/admin/assets/sass/modules/mixins.scss @@ -91,14 +91,12 @@ $green: #9FBB58; background-image: -moz-linear-gradient(bottom, $color1, lighten($color1, 10%)); background-image: -ms-linear-gradient(bottom, $color1, lighten($color1, 10%)); background-image: linear-gradient(bottom, $color1, lighten($color1, 10%)); - @include box-shadow(rgba(0,0,0,0.2) 0 -1px 0 inset, rgba(0,0,0,0.1) 0 1px 0 inset); } @else { background-color: $color2; background-image: -webkit-linear-gradient(bottom, $color1, $color2); background-image: -moz-linear-gradient(bottom, $color1, $color2); background-image: -ms-linear-gradient(bottom, $color1, $color2); background-image: linear-gradient(to top, $color1, $color2); - @include box-shadow(rgba(0,0,0,0.2) 0 -1px 0 inset, rgba(0,0,0,0.1) 0 1px 0 inset); } } @@ -113,14 +111,12 @@ $green: #9FBB58; background-image: -moz-linear-gradient(bottom, lighten($color1, 10%), $color1); background-image: -ms-linear-gradient(bottom, lighten($color1, 10%), $color1); background-image: linear-gradient(bottom, lighten($color1, 10%), $color1); - @include box-shadow(rgba(0,0,0,0.2) 0 -1px 0 inset, rgba(0,0,0,0.1) 0 1px 0 inset); } @else { background-color: $color1; background-image: -webkit-linear-gradient(bottom, $color2, $color1); background-image: -moz-linear-gradient(bottom, $color2, $color1); background-image: -ms-linear-gradient(bottom, $color2, $color1); background-image: linear-gradient(to top, $color2, $color1); - @include box-shadow(rgba(0,0,0,0.2) 0 -1px 0 inset, rgba(0,0,0,0.1) 0 1px 0 inset); } }