diff --git a/ionic/components/app/normalize.scss b/ionic/components/app/normalize.scss index e6cd4ccdfd..5846eb7574 100644 --- a/ionic/components/app/normalize.scss +++ b/ionic/components/app/normalize.scss @@ -37,15 +37,6 @@ template { } -// Links -// ========================================================================== - -// Remove the gray background color from active links in IE 10. -a { - background-color: transparent; -} - - // Text-level semantics // ========================================================================== diff --git a/ionic/components/app/typography.scss b/ionic/components/app/typography.scss index baa2c58238..825ba4695e 100644 --- a/ionic/components/app/typography.scss +++ b/ionic/components/app/typography.scss @@ -25,70 +25,83 @@ html { font-size: $font-size-root; } - -ion-app { +body { font-size: $font-size-base; font-family: $font-family-base; +} - h1, h2, h3, h4, h5, h6 { - font-weight: $headings-font-weight; - line-height: $headings-line-height; - margin-top: 1.6rem; - margin-bottom: 1rem; +a { + color: $link-color; + background-color: transparent; +} +a:hover, +a.hover { + color: $link-hover-color; +} - &:first-child { - margin-top: -0.3rem; - } - } +h1, h2, h3, h4, h5, h6 { + font-weight: $headings-font-weight; + line-height: $headings-line-height; + margin-top: 1.6rem; + margin-bottom: 1rem; - h1 + h2, - h1 + h3, - h2 + h3 { + &:first-child { margin-top: -0.3rem; } - - h1 { - font-size: 3.6rem; - margin-top: 2rem; - } - h2 { - font-size: 3rem; - margin-top: 1.8rem; - } - h3 { - font-size: 2.4rem; - } - h4 { - font-size: 2rem; - } - h5 { - font-size: 1.6rem; - } - h6 { - font-size: 1.4rem; - } - - small { - font-size: 75%; - } - - sub, - sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; - } - - sup { - top: -0.5em; - } - - sub { - bottom: -0.25em; - } } -body[mode=md] ion-app { +h1 + h2, +h1 + h3, +h2 + h3 { + margin-top: -0.3rem; +} + +h1 { + font-size: 3.6rem; + margin-top: 2rem; +} + +h2 { + font-size: 3rem; + margin-top: 1.8rem; +} + +h3 { + font-size: 2.4rem; +} + +h4 { + font-size: 2rem; +} + +h5 { + font-size: 1.6rem; +} + +h6 { + font-size: 1.4rem; +} + +small { + font-size: 75%; +} + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +body[mode=md] { font-family: "Roboto", "Helvetica Neue", sans-serif; } diff --git a/ionic/components/item/modes/material.scss b/ionic/components/item/modes/material.scss index b0733bdfb1..8aecdd1951 100644 --- a/ionic/components/item/modes/material.scss +++ b/ionic/components/item/modes/material.scss @@ -10,8 +10,8 @@ $item-md-padding-right: 16px !default; $item-md-padding-bottom: 16px !default; $item-md-padding-left: 16px !default; -$item-md-padding-media-top: 10px !default; -$item-md-padding-media-bottom: 11px !default; +$item-md-padding-media-top: 12px !default; +$item-md-padding-media-bottom: 12px !default; $item-md-body-text-font-size: 1.4rem !default; $item-md-body-text-line-height: 1.5 !default; @@ -87,6 +87,10 @@ $item-md-forward-icon-color: $item-md-border-color !default; min-height: 26px; } + .item-input .input + button { + margin-top: $item-md-padding-media-top; + } + .badge { margin-right: $item-md-padding-right; } diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss index d15ccd9fe5..ce3dec380f 100644 --- a/ionic/components/list/modes/ios.scss +++ b/ionic/components/list/modes/ios.scss @@ -2,7 +2,7 @@ // iOS List // -------------------------------------------------- -$list-ios-header-padding: 30px $item-ios-padding-right 10px $item-ios-padding-left !default; +$list-ios-header-padding: 10px $item-ios-padding-right 10px $item-ios-padding-left !default; $list-ios-header-font-size: 1.2rem !default; $list-ios-header-font-weight: 500 !default; $list-ios-header-letter-spacing: 0.1rem !default; diff --git a/ionic/components/list/modes/material.scss b/ionic/components/list/modes/material.scss index b703ef07c8..bfa0ba7165 100644 --- a/ionic/components/list/modes/material.scss +++ b/ionic/components/list/modes/material.scss @@ -2,11 +2,11 @@ // Material Design List // -------------------------------------------------- -$list-md-header-padding: 30px $item-md-padding-right 16px $item-md-padding-left !default; +$list-md-header-padding: 16px $item-md-padding-right 16px $item-md-padding-left !default; $list-md-header-font-size: 1.6rem !default; $list-md-header-color: #6d6d72 !default; -$list-md-footer-padding: 16px $item-md-padding-right 0 $item-md-padding-left !default; +$list-md-footer-padding: 16px $item-md-padding-right 16px $item-md-padding-left !default; $list-md-footer-font-size: 1.2rem !default; $list-md-footer-color: #8f8f94 !default; diff --git a/ionic/components/text-input/text-input.scss b/ionic/components/text-input/text-input.scss index f424973bb6..4ce20f51d1 100644 --- a/ionic/components/text-input/text-input.scss +++ b/ionic/components/text-input/text-input.scss @@ -51,4 +51,9 @@ ion-input.has-focus .text-input { .text-input { background-color: $list-background-color; } + + &:before, + &:after { + border: 0 !important; + } }