fix(css): minor updates to match previous snapshots

ionic-team · Jan 29, 2016 · 9749b06 · 9749b06
1 parent 181a070
commit 9749b06
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -25,7 +25,7 @@
 
     <ion-item>
       <ion-label stacked>Label 4</ion-label>
-      <ion-textarea value="ion-textarea 4"></ion-textarea>
+      <ion-textarea value="Textarea 4"></ion-textarea>
     </ion-item>
 
     <ion-item>
@@ -40,7 +40,7 @@
 
     <ion-item>
       <ion-label stacked>Label 7</ion-label>
-      <ion-textarea value="ion-textarea 7"></ion-textarea>
+      <ion-textarea value="Textarea 7"></ion-textarea>
     </ion-item>
 
     <ion-item>
@@ -55,7 +55,7 @@
 
     <ion-item>
       <ion-label stacked>Label 10</ion-label>
-      <ion-textarea value="ion-textarea 10"></ion-textarea>
+      <ion-textarea value="Textarea 10"></ion-textarea>
     </ion-item>
 
   </ion-list>

diff --git a/ionic/components/item/test/text/main.html b/ionic/components/item/test/text/main.html
@@ -44,7 +44,7 @@ <h4>H4 Title Text</h4>
 
   <ion-item>
     <ion-label>
-      ion-label
+      Item using inner ion-label
     </ion-label>
   </ion-item>
 

diff --git 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
@@ -12,15 +12,14 @@ $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;
 }
 
 
 // Material Design Default Label Inside An Input Item
 // --------------------------------------------------
 
 .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
@@ -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
@@ -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
@@ -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
@@ -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