Browse Source

toggles

pull/253/head
connors 11 years ago
parent
commit
55b1e3fe14
  1. 5
      dist/android-theme.css
  2. 3
      dist/ios-theme.css
  3. 8
      docs-assets/css/docs.css
  4. 2
      docs-assets/js/docs.js
  5. 5
      lib/sass/theme-android.scss
  6. 4
      lib/sass/theme-ios.scss

5
dist/android-theme.css vendored

@ -347,9 +347,10 @@ textarea,
left: 0; left: 0;
width: 50px; width: 50px;
height: 24px; height: 24px;
border: 0; border: 1px solid #b5b5b5;
border-radius: 0; border-radius: 0;
background-color: #bebebe; 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 { .toggle:before {
top: 1px; top: 1px;
@ -370,7 +371,7 @@ textarea,
} }
.toggle.active:before { .toggle.active:before {
left: auto; left: auto;
right: 15px; right: 14px;
color: #fff; color: #fff;
content: "On"; content: "On";
} }

3
dist/ios-theme.css vendored

@ -392,9 +392,6 @@ textarea,
.toggle:before { .toggle:before {
display: none; display: none;
} }
.toggle:active .toggle-handle {
width: 35px;
}
.toggle.active { .toggle.active {
border: 2px solid #4cd964; border: 2px solid #4cd964;
background-color: transparent; background-color: transparent;

8
docs-assets/css/docs.css

@ -1145,9 +1145,6 @@ hr {
.platform-ios .toggle:before { .platform-ios .toggle:before {
display: none; display: none;
} }
.platform-ios .toggle:active .toggle-handle {
width: 35px;
}
.platform-ios .toggle.active { .platform-ios .toggle.active {
border: 2px solid #4cd964; border: 2px solid #4cd964;
background-color: transparent; background-color: transparent;
@ -1501,9 +1498,10 @@ hr {
left: 0; left: 0;
width: 50px; width: 50px;
height: 24px; height: 24px;
border: 0; border: 1px solid #b5b5b5;
border-radius: 0; border-radius: 0;
background-color: #bebebe; 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 { .platform-android .toggle:before {
top: 1px; top: 1px;
@ -1524,7 +1522,7 @@ hr {
} }
.platform-android .toggle.active:before { .platform-android .toggle.active:before {
left: auto; left: auto;
right: 15px; right: 14px;
color: #fff; color: #fff;
content: "On"; content: "On";
} }

2
docs-assets/js/docs.js

@ -149,8 +149,6 @@ $(function() {
var calculateToggle = function () { var calculateToggle = function () {
var currentTop = win.scrollTop(); var currentTop = win.scrollTop();
console.log('yep');
if(currentTop >= toggleTop) { if(currentTop >= toggleTop) {
platformToggle.addClass('fixed'); platformToggle.addClass('fixed');
$('.docs-components').css('padding-top', toggleHeight); $('.docs-components').css('padding-top', toggleHeight);

5
lib/sass/theme-android.scss

@ -491,9 +491,10 @@ textarea,
left: 0; left: 0;
width: 50px; width: 50px;
height: 24px; height: 24px;
border: 0; border: 1px solid #b5b5b5;
border-radius: 0; border-radius: 0;
background-color: #bebebe; background-color: #bebebe;
box-shadow: inset 0 1px 0 rgba(255,255,255,.3), inset 0 -1px 0 rgba(0,0,0,.1);
} }
&:before { &:before {
top: 1px; top: 1px;
@ -515,7 +516,7 @@ textarea,
} }
&:before { &:before {
left: auto; left: auto;
right: 15px; right: 14px;
color: #fff; color: #fff;
content: "On"; content: "On";
} }

4
lib/sass/theme-ios.scss

@ -521,10 +521,6 @@ textarea,
&:before { &:before {
display: none; display: none;
} }
&:active .toggle-handle {
padding-right: 4px;
padding-left: 4px;
}
// Active state for toggle // Active state for toggle
&.active { &.active {
border: 2px solid $positive-color; border: 2px solid $positive-color;

Loading…
Cancel
Save