From b2f0a8aea9f2646b2e9a23362de4226dd06f4ac7 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Wed, 21 Aug 2013 19:28:32 +0200 Subject: [PATCH] // fix switch + ignore bower_components --- .gitignore | 3 ++- admin-dev/themes/default/css/_toggle-switch.sass | 4 ++-- admin-dev/themes/default/css/admin-theme.css | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 071b226c8..46ab7e014 100644 --- a/.gitignore +++ b/.gitignore @@ -105,4 +105,5 @@ modules/upscarrier modules/uspscarrier modules/wexpay modules/yotpo -modules/zingaya \ No newline at end of file +modules/zingaya +admin-dev/themes/default/bower_components diff --git a/admin-dev/themes/default/css/_toggle-switch.sass b/admin-dev/themes/default/css/_toggle-switch.sass index 94b474ddd..f3ffacf99 100755 --- a/admin-dev/themes/default/css/_toggle-switch.sass +++ b/admin-dev/themes/default/css/_toggle-switch.sass @@ -139,7 +139,7 @@ // http://css-tricks.com/webkit-sibling-bug/ .switch, .toggle -webkit-animation: bugfix infinite 1s - @-webkit-keyframes bugfix { from { position: relative; } to { position: relative; } } + //@-webkit-keyframes bugfix { from { position: relative; } to { position: relative; } } // Prestashop Theme .prestashop-switch @@ -147,7 +147,7 @@ color: #666 text-align: center border-radius: 3px - @include box-shadow(rgba(black,0.3) 0 0 6px 1px inset) + @include box-shadow(rgba(black,0.2) 0 2px 5px 1px inset) label padding-top: 0!important font-weight: 500 diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 9f80f3453..e083b06d8 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -6590,14 +6590,13 @@ a .icon-flip-vertical:before { .switch, .toggle { -webkit-animation: bugfix infinite 1s; } - @-webkit-keyframes bugfix { from { position: relative; } to { position: relative; } }; .prestashop-switch { min-width: 150px; color: #666666; text-align: center; border-radius: 3px; - -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 0 6px 1px inset; - box-shadow: rgba(0, 0, 0, 0.3) 0 0 6px 1px inset; } + -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 2px 5px 1px inset; + box-shadow: rgba(0, 0, 0, 0.2) 0 2px 5px 1px inset; } .prestashop-switch label { padding-top: 0 !important; font-weight: 500; }