From 8fee196c0ed650e8be3016712aff66525cf1078e Mon Sep 17 00:00:00 2001 From: Evan Theurer Date: Fri, 2 May 2014 17:45:16 +0200 Subject: [PATCH] Remove vendor prefixes - handled by autoprefixer. --- src/styles/components/_audiolevel.scss | 10 +++------- src/styles/components/_bar.scss | 18 +++++++----------- src/styles/global/_animations.scss | 4 ++-- src/styles/global/_base.scss | 7 +++---- src/styles/global/_mixins.scss | 10 ---------- src/styles/global/_overlaybar.scss | 2 +- 6 files changed, 16 insertions(+), 35 deletions(-) diff --git a/src/styles/components/_audiolevel.scss b/src/styles/components/_audiolevel.scss index fc0558ae..af1daa60 100644 --- a/src/styles/components/_audiolevel.scss +++ b/src/styles/components/_audiolevel.scss @@ -29,11 +29,7 @@ z-index: 6; .audio-level { background: #9dd53a; /* Old browsers */ - background: -moz-linear-gradient(top, #9dd53a 0%, #a1d54f 50%, #80c217 51%, #7cbc0a 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9dd53a), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* IE10+ */ + background: gradient(linear, left top, left bottom, color-stop(0%,#9dd53a), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */ background: linear-gradient(to bottom, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* W3C */ height: 4px; position: absolute; @@ -41,7 +37,7 @@ left: 0; right: 0; width: 0; - @include border-radius(0 0 2px 2px); - @include transition(width 0.05s ease-in-out); + border-radius: 0 0 2px 2px; + transition: width 0.05s ease-in-out; } } diff --git a/src/styles/components/_bar.scss b/src/styles/components/_bar.scss index ab69db0d..42fbfa00 100644 --- a/src/styles/components/_bar.scss +++ b/src/styles/components/_bar.scss @@ -29,21 +29,19 @@ } .bar { - // without height bar jumps and disappears on reload - // use em to scale with text. - height: #{$minbarheight/$base-font-size}em; background-color: $componentbg; + box-shadow: 0 2px 10px 0 $componentfg3; color: $componentfg1; font: bold 1em/40px $font-sans-serif; + // without height bar jumps and disappears on reload, use em to scale with text. + height: #{$minbarheight/$base-font-size}em; text-align: center; - // @include adjust-leading-to(2); - @include box-shadow(0 2px 10px 0 $componentfg3); + touch-callout: none; + user-select: none; // @include debug-vertical-alignment(); - @include touch-callout(none); - @include user-select(none); @include breakpt($breakpoint-medium) { z-index: 40; - @include box-shadow(none); + box-shadow: none; } .btn { position: relative; @@ -66,7 +64,6 @@ text-align: left; width: 90px; vertical-align: middle; - // @include adjust-font-size-to(11px,0.4); span { font-style: italic; left: 38px; @@ -166,11 +163,10 @@ padding: 0; text-align: center; width: 42px; - // @include adjust-font-size-to(24px); &:focus { border: none; outline: none; - @include box-shadow(0); + box-shadow: 0; } &:hover { background-color: none; diff --git a/src/styles/global/_animations.scss b/src/styles/global/_animations.scss index 3b7bcce0..795d0297 100644 --- a/src/styles/global/_animations.scss +++ b/src/styles/global/_animations.scss @@ -28,7 +28,7 @@ &.ng-hide-add { opacity: 1; display: block !important; - @include transition(all linear 0.5s); + transition: all linear 0.5s; &.ng-hide-add-active { opacity: 0; } @@ -36,7 +36,7 @@ &.ng-hide-remove { opacity: 0; display: block !important; - @include transition(all linear 0.5s); + transition: all linear 0.5s; &.ng-hide-remove-active { opacity: 1; } diff --git a/src/styles/global/_base.scss b/src/styles/global/_base.scss index 6bc06e9d..37ce1d91 100644 --- a/src/styles/global/_base.scss +++ b/src/styles/global/_base.scss @@ -25,7 +25,6 @@ body { background-color: $background; height: 100%; font: normal $base-font-size $font-sans-serif; - // @include debug-vertical-alignment(); } body { @@ -101,8 +100,8 @@ a { right: 15%; top: 15%; z-index: 20000; - @include transition-property(opacity); - @include transition-duration(.5s); + transition-property: opacity; + transition-duration: .5s; div { color: $lighter-text; display: block; @@ -125,7 +124,7 @@ a { position: absolute; right: 0; top: 44px; - @include user-select(none); + user-select: none; } .welcome { diff --git a/src/styles/global/_mixins.scss b/src/styles/global/_mixins.scss index 2af71aad..7021a24e 100644 --- a/src/styles/global/_mixins.scss +++ b/src/styles/global/_mixins.scss @@ -4,13 +4,3 @@ @content; } } - -@mixin linear-gradient($gradient...) { - background: #9dd53a; /* Old browsers */ - background: linear-gradient(to bottom, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* W3C */ - background: -o-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* IE10+ */ - background: -moz-linear-gradient(top, #9dd53a 0%, #a1d54f 50%, #80c217 51%, #7cbc0a 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9dd53a), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Chrome10+,Safari5.1+ */ -} diff --git a/src/styles/global/_overlaybar.scss b/src/styles/global/_overlaybar.scss index 531d103b..56991417 100644 --- a/src/styles/global/_overlaybar.scss +++ b/src/styles/global/_overlaybar.scss @@ -27,7 +27,7 @@ position: absolute; text-shadow: 0 0 5px black; vertical-align: middle; - @include user-select(none); + user-select: none; } .overlaybar {