javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

label colors

Browse Source
This commit is contained in:
Adam Bradley
2015-09-04 09:54:55 -05:00
parent 641244160c
commit 662e843a47
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components.ts
View File

@ -13,7 +13,7 @@ export * from 'ionic/components/item/item'
export * from 'ionic/components/item/item-group' export * from 'ionic/components/item/item-group'
export * from 'ionic/components/form/input' export * from 'ionic/components/form/input'
export * from 'ionic/components/text-input/text-input' export * from 'ionic/components/text-input/text-input'
export * from 'ionic/components/form/label' export * from 'ionic/components/text-input/label'
export * from 'ionic/components/list/list' export * from 'ionic/components/list/list'
export * from 'ionic/components/show-hide-when/show-hide-when' export * from 'ionic/components/show-hide-when/show-hide-when'

9
ionic/components/form/label.scss → ionic/components/text-input/label.scss
View File

@ -2,25 +2,18 @@
// Label // Label
// -------------------------------------------------- // --------------------------------------------------
$input-label-color: #888 !default;
ion-label { ion-label {
display: block; display: block;
max-width: 200px; max-width: 200px;
color: $input-label-color;
font-size: inherit; font-size: inherit;
white-space: nowrap; white-space: nowrap;
} }
[fixed-label] ion-label { [fixed-label] ion-label {
display: block;
max-width: 200px;
width: 30%; width: 30%;
min-width: 100px; min-width: 100px;
color: $input-label-color; max-width: 200px;
font-size: inherit;
white-space: nowrap;
} }
ion-input[stacked-label] { ion-input[stacked-label] {

0
ionic/components/form/label.ts → ionic/components/text-input/label.ts
View File

3
ionic/components/text-input/modes/ios.scss
View File

@ -2,6 +2,8 @@
// iOS Text Input // iOS Text Input
// -------------------------------------------------- // --------------------------------------------------
$input-label-ios-color: #7f7f7f !default;
.list[mode=ios], .list[mode=ios],
ion-card[mode=ios] { ion-card[mode=ios] {
@ -18,6 +20,7 @@ ion-card[mode=ios] {
ion-label { ion-label {
margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom ($item-ios-padding-left / 2); margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom ($item-ios-padding-left / 2);
color: $input-label-ios-color;
} }
} }

8
ionic/components/text-input/modes/material.scss
View File

@ -2,6 +2,9 @@
// Material Design Text Input // Material Design Text Input
// -------------------------------------------------- // --------------------------------------------------
$text-input-highlight-color: map-get($colors, primary) !default;
$input-label-md-color: #999 !default;
.list[mode=md], .list[mode=md],
ion-card[mode=md] { ion-card[mode=md] {
@ -18,14 +21,15 @@ ion-card[mode=md] {
ion-label { 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 ($item-md-padding-left / 2);
color: $input-label-md-color;
} }
ion-input.has-focus:after { ion-input.has-focus:after {
border-top: 2px solid blue; border-top: 2px solid $text-input-highlight-color;
} }
ion-input.has-focus + ion-input:before { ion-input.has-focus + ion-input:before {
border-top-color: blue; border-top-color: $text-input-highlight-color;
} }
} }

2
ionic/components/text-input/text-input.ts
View File

@ -3,7 +3,7 @@ import {Directive, View, Host, Optional, ElementRef, Attribute, Query, QueryList
import {IonicDirective} from '../../config/annotations'; import {IonicDirective} from '../../config/annotations';
import {IonicConfig} from '../../config/config'; import {IonicConfig} from '../../config/config';
import {IonInput} from '../form/input'; import {IonInput} from '../form/input';
import {Label} from '../form/label'; import {Label} from './label';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonicApp} from '../app/app'; import {IonicApp} from '../app/app';
import {Content} from '../content/content'; import {Content} from '../content/content';

2
ionic/ionic.core.scss
View File

@ -25,9 +25,9 @@
"components/icon/icon", "components/icon/icon",
"components/item/item", "components/item/item",
"components/form/form", "components/form/form",
"components/form/label",
"components/grid/grid", "components/grid/grid",
"components/text-input/text-input", "components/text-input/text-input",
"components/text-input/label",
"components/list/list", "components/list/list",
"components/card/card", "components/card/card",
"components/modal/modal", "components/modal/modal",