From 9749b06aa983c8989d67610f4e508c639ace2a92 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 28 Jan 2016 21:20:08 -0600 Subject: [PATCH] fix(css): minor updates to match previous snapshots --- ionic/components/checkbox/checkbox.ios.scss | 2 +- ionic/components/checkbox/checkbox.md.scss | 2 +- ionic/components/input/input.ios.scss | 2 +- ionic/components/input/test/stacked-labels/main.html | 6 +++--- ionic/components/item/test/text/main.html | 2 +- ionic/components/label/label.ios.scss | 3 ++- ionic/components/label/label.md.scss | 3 +-- ionic/components/radio/radio.ios.scss | 2 +- ionic/components/radio/radio.md.scss | 2 +- ionic/components/toggle/toggle.ios.scss | 2 +- ionic/components/toggle/toggle.md.scss | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ionic/components/checkbox/checkbox.ios.scss b/ionic/components/checkbox/checkbox.ios.scss index 040aedd6c3..bd6d946e58 100644 --- a/ionic/components/checkbox/checkbox.ios.scss +++ b/ionic/components/checkbox/checkbox.ios.scss @@ -19,7 +19,7 @@ $checkbox-ios-icon-checkmark-color: $background-ios-color !default; $checkbox-ios-media-margin: $item-ios-padding-media-top $item-ios-padding-right $item-ios-padding-media-bottom 2px !default; -$checkbox-ios-disabled-opacity: 0.4 !default; +$checkbox-ios-disabled-opacity: 0.3 !default; ion-checkbox { diff --git a/ionic/components/checkbox/checkbox.md.scss b/ionic/components/checkbox/checkbox.md.scss index 16046ce220..acafe3b47f 100644 --- a/ionic/components/checkbox/checkbox.md.scss +++ b/ionic/components/checkbox/checkbox.md.scss @@ -9,7 +9,7 @@ $checkbox-md-border-bottom-color: $list-md-border-color !default; $checkbox-md-padding: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom 0 !default; $checkbox-md-margin: 0 !default; $checkbox-md-media-margin: $item-md-padding-media-top 36px $item-md-padding-media-bottom 4px !default; -$checkbox-md-disabled-opacity: 0.4 !default; +$checkbox-md-disabled-opacity: 0.3 !default; $checkbox-md-icon-background-color-off: $list-md-background-color !default; $checkbox-md-icon-background-color-on: map-get($colors-md, primary) !default; diff --git a/ionic/components/input/input.ios.scss b/ionic/components/input/input.ios.scss index 9b20ab1b1a..9375848cf1 100644 --- a/ionic/components/input/input.ios.scss +++ b/ionic/components/input/input.ios.scss @@ -25,7 +25,7 @@ $text-input-ios-input-clear-icon-size: 18px !default; // -------------------------------------------------- .inset-input { - margin: ($item-ios-padding-top / 2) $item-ios-padding-right ($item-ios-padding-bottom / 2) $item-ios-padding-left; + margin: ($item-ios-padding-top / 2) $item-ios-padding-right ($item-ios-padding-bottom / 2) 0; padding: ($item-ios-padding-top / 2) ($item-ios-padding-right / 2) ($item-ios-padding-bottom / 2) ($item-ios-padding-left / 2); } diff --git a/ionic/components/input/test/stacked-labels/main.html b/ionic/components/input/test/stacked-labels/main.html index 29de0ba767..b5a3e11c38 100644 --- a/ionic/components/input/test/stacked-labels/main.html +++ b/ionic/components/input/test/stacked-labels/main.html @@ -25,7 +25,7 @@ Label 4 - + @@ -40,7 +40,7 @@ Label 7 - + @@ -55,7 +55,7 @@ Label 10 - + diff --git a/ionic/components/item/test/text/main.html b/ionic/components/item/test/text/main.html index 2cccfb0b02..9e3d7a8e56 100644 --- a/ionic/components/item/test/text/main.html +++ b/ionic/components/item/test/text/main.html @@ -44,7 +44,7 @@ - ion-label + Item using inner ion-label diff --git a/ionic/components/label/label.ios.scss b/ionic/components/label/label.ios.scss index c07280e7b6..d3a4fb531b 100644 --- a/ionic/components/label/label.ios.scss +++ b/ionic/components/label/label.ios.scss @@ -22,7 +22,8 @@ ion-label { color: $label-ios-text-color; } -ion-label + ion-input .text-input { +ion-label + ion-input .text-input, +ion-label + ion-textarea .text-input { margin-left: $item-ios-padding-left; } diff --git a/ionic/components/label/label.md.scss b/ionic/components/label/label.md.scss index fc0cb3518b..dd5282e835 100644 --- a/ionic/components/label/label.md.scss +++ b/ionic/components/label/label.md.scss @@ -12,7 +12,7 @@ $label-md-text-color-focused: map-get($colors-md, primary) !default; // -------------------------------------------------- ion-label { - margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom ($item-md-padding-left / 2); + margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom 0; } @@ -20,7 +20,6 @@ ion-label { // -------------------------------------------------- .item-input ion-label { - margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom 0; color: $label-md-text-color; } diff --git a/ionic/components/radio/radio.ios.scss b/ionic/components/radio/radio.ios.scss index 3a252316d8..6d0e987d17 100644 --- a/ionic/components/radio/radio.ios.scss +++ b/ionic/components/radio/radio.ios.scss @@ -10,7 +10,7 @@ $radio-ios-icon-height: 21px !default; $radio-ios-icon-border-width: 2px !default; $radio-ios-icon-border-style: solid !default; -$radio-ios-disabled-opacity: 0.4 !default; +$radio-ios-disabled-opacity: 0.3 !default; ion-radio { diff --git a/ionic/components/radio/radio.md.scss b/ionic/components/radio/radio.md.scss index e2f0c42fff..4e6927a4c5 100644 --- a/ionic/components/radio/radio.md.scss +++ b/ionic/components/radio/radio.md.scss @@ -15,7 +15,7 @@ $radio-md-icon-border-radius: 50% !default; $radio-md-transition-duration: 280ms !default; $radio-md-transition-easing: cubic-bezier(.4, 0, .2, 1) !default; -$radio-md-disabled-opacity: 0.4 !default; +$radio-md-disabled-opacity: 0.3 !default; ion-radio { diff --git a/ionic/components/toggle/toggle.ios.scss b/ionic/components/toggle/toggle.ios.scss index 0ce271c984..1b4a33f93f 100644 --- a/ionic/components/toggle/toggle.ios.scss +++ b/ionic/components/toggle/toggle.ios.scss @@ -25,7 +25,7 @@ $toggle-ios-media-padding: 6px ($item-ios-padding-right / 2) 5px ($i $toggle-ios-transition-duration: 300ms !default; -$toggle-ios-disabled-opacity: 0.4 !default; +$toggle-ios-disabled-opacity: 0.3 !default; // iOS Toggle diff --git a/ionic/components/toggle/toggle.md.scss b/ionic/components/toggle/toggle.md.scss index 0aff152d20..a95789b9a2 100644 --- a/ionic/components/toggle/toggle.md.scss +++ b/ionic/components/toggle/toggle.md.scss @@ -22,7 +22,7 @@ $toggle-md-media-padding: 12px ($item-md-padding-right / 2) 12px $toggle-md-transition-duration: 300ms !default; -$toggle-md-disabled-opacity: 0.4 !default; +$toggle-md-disabled-opacity: 0.3 !default; // Material Design Toggle