dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix switch + ignore bower_components

Browse Source
This commit is contained in:
Kevin Granger
2013-08-21 19:28:32 +02:00
parent 3f8649b6b4
commit b2f0a8aea9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -1
View File
@@ -105,4 +105,5 @@ modules/upscarrier
modules/uspscarrier modules/uspscarrier
modules/wexpay modules/wexpay
modules/yotpo modules/yotpo
modules/zingaya modules/zingaya
admin-dev/themes/default/bower_components
admin-dev/themes/default/css/_toggle-switch.sass
+2 -2
View File
@@ -139,7 +139,7 @@
// http://css-tricks.com/webkit-sibling-bug/ // http://css-tricks.com/webkit-sibling-bug/
.switch, .toggle .switch, .toggle
-webkit-animation: bugfix infinite 1s -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 Theme
.prestashop-switch .prestashop-switch
@@ -147,7 +147,7 @@
color: #666 color: #666
text-align: center text-align: center
border-radius: 3px 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 label
padding-top: 0!important padding-top: 0!important
font-weight: 500 font-weight: 500
admin-dev/themes/default/css/admin-theme.css
+2 -3
View File
@@ -6590,14 +6590,13 @@ a .icon-flip-vertical:before {
.switch, .toggle { .switch, .toggle {
-webkit-animation: bugfix infinite 1s; } -webkit-animation: bugfix infinite 1s; }
@-webkit-keyframes bugfix { from { position: relative; } to { position: relative; } };
.prestashop-switch { .prestashop-switch {
min-width: 150px; min-width: 150px;
color: #666666; color: #666666;
text-align: center; text-align: center;
border-radius: 3px; border-radius: 3px;
-webkit-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.3) 0 0 6px 1px inset; } box-shadow: rgba(0, 0, 0, 0.2) 0 2px 5px 1px inset; }
.prestashop-switch label { .prestashop-switch label {
padding-top: 0 !important; padding-top: 0 !important;
font-weight: 500; } font-weight: 500; }