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

md list updates

Browse Source
This commit is contained in:
Adam Bradley
2015-08-18 09:34:35 -05:00
parent 512fc21491
commit eed7107b54
6 changed files with 83 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ionic/components/app/normalize.scss vendored
View File

@ -37,15 +37,6 @@ template {
} }
// Links
// ==========================================================================
// Remove the gray background color from active links in IE 10.
a {
background-color: transparent;
}
// Text-level semantics // Text-level semantics
// ========================================================================== // ==========================================================================

125
ionic/components/app/typography.scss
View File

@ -25,70 +25,83 @@ html {
font-size: $font-size-root; font-size: $font-size-root;
} }
body {
ion-app {
font-size: $font-size-base; font-size: $font-size-base;
font-family: $font-family-base; font-family: $font-family-base;
}
h1, h2, h3, h4, h5, h6 { a {
font-weight: $headings-font-weight; color: $link-color;
line-height: $headings-line-height; background-color: transparent;
margin-top: 1.6rem; }
margin-bottom: 1rem; a:hover,
a.hover {
color: $link-hover-color;
}
&:first-child { h1, h2, h3, h4, h5, h6 {
margin-top: -0.3rem; font-weight: $headings-font-weight;
} line-height: $headings-line-height;
} margin-top: 1.6rem;
margin-bottom: 1rem;
h1 + h2, &:first-child {
h1 + h3,
h2 + h3 {
margin-top: -0.3rem; 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; font-family: "Roboto", "Helvetica Neue", sans-serif;
} }

8
ionic/components/item/modes/material.scss
View File

@ -10,8 +10,8 @@ $item-md-padding-right: 16px !default;
$item-md-padding-bottom: 16px !default; $item-md-padding-bottom: 16px !default;
$item-md-padding-left: 16px !default; $item-md-padding-left: 16px !default;
$item-md-padding-media-top: 10px !default; $item-md-padding-media-top: 12px !default;
$item-md-padding-media-bottom: 11px !default; $item-md-padding-media-bottom: 12px !default;
$item-md-body-text-font-size: 1.4rem !default; $item-md-body-text-font-size: 1.4rem !default;
$item-md-body-text-line-height: 1.5 !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; min-height: 26px;
} }
.item-input .input + button {
margin-top: $item-md-padding-media-top;
}
.badge { .badge {
margin-right: $item-md-padding-right; margin-right: $item-md-padding-right;
} }

2
ionic/components/list/modes/ios.scss
View File

@ -2,7 +2,7 @@
// iOS List // 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-size: 1.2rem !default;
$list-ios-header-font-weight: 500 !default; $list-ios-header-font-weight: 500 !default;
$list-ios-header-letter-spacing: 0.1rem !default; $list-ios-header-letter-spacing: 0.1rem !default;

4
ionic/components/list/modes/material.scss
View File

@ -2,11 +2,11 @@
// Material Design List // 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-font-size: 1.6rem !default;
$list-md-header-color: #6d6d72 !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-font-size: 1.2rem !default;
$list-md-footer-color: #8f8f94 !default; $list-md-footer-color: #8f8f94 !default;

5
ionic/components/text-input/text-input.scss
View File

@ -51,4 +51,9 @@ ion-input.has-focus .text-input {
.text-input { .text-input {
background-color: $list-background-color; background-color: $list-background-color;
} }
&:before,
&:after {
border: 0 !important;
}
} }