From 55b1e3fe14193107ce5ec8ea44711ea1a3fa58b7 Mon Sep 17 00:00:00 2001 From: connors Date: Sat, 8 Feb 2014 16:25:34 -0800 Subject: [PATCH] toggles --- dist/android-theme.css | 5 +++-- dist/ios-theme.css | 3 --- docs-assets/css/docs.css | 8 +++----- docs-assets/js/docs.js | 2 -- lib/sass/theme-android.scss | 5 +++-- lib/sass/theme-ios.scss | 4 ---- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dist/android-theme.css b/dist/android-theme.css index 67d81ba..80b7f5b 100644 --- a/dist/android-theme.css +++ b/dist/android-theme.css @@ -347,9 +347,10 @@ textarea, left: 0; width: 50px; height: 24px; - border: 0; + border: 1px solid #b5b5b5; border-radius: 0; background-color: #bebebe; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } .toggle:before { top: 1px; @@ -370,7 +371,7 @@ textarea, } .toggle.active:before { left: auto; - right: 15px; + right: 14px; color: #fff; content: "On"; } diff --git a/dist/ios-theme.css b/dist/ios-theme.css index 17e9ab3..23b5c7d 100644 --- a/dist/ios-theme.css +++ b/dist/ios-theme.css @@ -392,9 +392,6 @@ textarea, .toggle:before { display: none; } -.toggle:active .toggle-handle { - width: 35px; -} .toggle.active { border: 2px solid #4cd964; background-color: transparent; diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 413b7be..bf2ec0f 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -1145,9 +1145,6 @@ hr { .platform-ios .toggle:before { display: none; } -.platform-ios .toggle:active .toggle-handle { - width: 35px; -} .platform-ios .toggle.active { border: 2px solid #4cd964; background-color: transparent; @@ -1501,9 +1498,10 @@ hr { left: 0; width: 50px; height: 24px; - border: 0; + border: 1px solid #b5b5b5; border-radius: 0; background-color: #bebebe; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } .platform-android .toggle:before { top: 1px; @@ -1524,7 +1522,7 @@ hr { } .platform-android .toggle.active:before { left: auto; - right: 15px; + right: 14px; color: #fff; content: "On"; } diff --git a/docs-assets/js/docs.js b/docs-assets/js/docs.js index 53c5bab..b2f6fbe 100644 --- a/docs-assets/js/docs.js +++ b/docs-assets/js/docs.js @@ -148,8 +148,6 @@ $(function() { } var calculateToggle = function () { var currentTop = win.scrollTop(); - - console.log('yep'); if(currentTop >= toggleTop) { platformToggle.addClass('fixed'); diff --git a/lib/sass/theme-android.scss b/lib/sass/theme-android.scss index 26b352d..e2e0427 100644 --- a/lib/sass/theme-android.scss +++ b/lib/sass/theme-android.scss @@ -491,9 +491,10 @@ textarea, left: 0; width: 50px; height: 24px; - border: 0; + border: 1px solid #b5b5b5; border-radius: 0; background-color: #bebebe; + box-shadow: inset 0 1px 0 rgba(255,255,255,.3), inset 0 -1px 0 rgba(0,0,0,.1); } &:before { top: 1px; @@ -515,7 +516,7 @@ textarea, } &:before { left: auto; - right: 15px; + right: 14px; color: #fff; content: "On"; } diff --git a/lib/sass/theme-ios.scss b/lib/sass/theme-ios.scss index 805d3a1..ec30727 100644 --- a/lib/sass/theme-ios.scss +++ b/lib/sass/theme-ios.scss @@ -521,10 +521,6 @@ textarea, &:before { display: none; } - &:active .toggle-handle { - padding-right: 4px; - padding-left: 4px; - } // Active state for toggle &.active { border: 2px solid $positive-color;