diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index 656f377618..60e67fdd68 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -323,6 +323,7 @@ body, .ionic-body { overflow: hidden; margin: 0; padding: 0; + color: black; word-wrap: break-word; font-size: 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -351,9 +352,9 @@ body, .ionic-body { .content-wrapper { position: absolute; top: 0; - height: 100%; - width: 100%; overflow: auto; + width: 100%; + height: 100%; -webkit-overflow-scrolling: touch; } .has-header { @@ -385,15 +386,22 @@ body, .ionic-body { .platform-ios7 .has-header { margin-top: 64px; } -.hidden, .hide { +.hidden, +.hide { display: none !important; } .padded { padding: 10px; } +.padded-2 { + padding: 20px; } + .inset { margin: 10px; } +.inset-2 { + margin: 20px; } + .rounded { border-radius: 4px; } @@ -402,8 +410,8 @@ p { .lead { margin-bottom: 20px; - font-size: 16.1px; font-weight: 200; + font-size: 16.1px; line-height: 1.4; } small { @@ -423,8 +431,9 @@ cite { h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: black; font-weight: 500; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; line-height: 1.1; } h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small { @@ -485,12 +494,12 @@ dd { margin-left: 0; } blockquote { - padding: 10px 20px; margin: 0 0 20px; + padding: 10px 20px; border-left: 5px solid gray; } blockquote p { - font-size: 17.5px; font-weight: 300; + font-size: 17.5px; line-height: 1.25; } blockquote p:last-child { margin-bottom: 0; } diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css index 39b6f003fd..834497be02 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -1066,6 +1066,7 @@ overflow: hidden; margin: 0; padding: 0; + color: black; word-wrap: break-word; font-size: 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1089,9 +1090,9 @@ .ionic .content-wrapper { position: absolute; top: 0; - height: 100%; - width: 100%; overflow: auto; + width: 100%; + height: 100%; -webkit-overflow-scrolling: touch; } .ionic .has-header { margin-top: 44px; } @@ -1111,20 +1112,25 @@ height: 100%; background-color: #fff; -webkit-overflow-scrolling: touch; } - .ionic .hidden, .ionic .hide { + .ionic .hidden, + .ionic .hide { display: none !important; } .ionic .padded { padding: 10px; } + .ionic .padded-2 { + padding: 20px; } .ionic .inset { margin: 10px; } + .ionic .inset-2 { + margin: 20px; } .ionic .rounded { border-radius: 4px; } .ionic p { margin: 0 0 10px; } .ionic .lead { margin-bottom: 20px; - font-size: 16.1px; font-weight: 200; + font-size: 16.1px; line-height: 1.4; } .ionic small { font-size: 85%; } @@ -1138,8 +1144,9 @@ text-align: center; } .ionic h1, .ionic h2, .ionic h3, .ionic h4, .ionic h5, .ionic h6, .ionic .h1, .ionic .h2, .ionic .h3, .ionic .h4, .ionic .h5, .ionic .h6 { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: black; font-weight: 500; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; line-height: 1.1; } .ionic h1 small, .ionic h2 small, .ionic h3 small, .ionic h4 small, .ionic h5 small, .ionic h6 small, .ionic .h1 small, .ionic .h2 small, .ionic .h3 small, .ionic .h4 small, .ionic .h5 small, .ionic .h6 small { @@ -1184,12 +1191,12 @@ .ionic dd { margin-left: 0; } .ionic blockquote { - padding: 10px 20px; margin: 0 0 20px; + padding: 10px 20px; border-left: 5px solid gray; } .ionic blockquote p { - font-size: 17.5px; font-weight: 300; + font-size: 17.5px; line-height: 1.25; } .ionic blockquote p:last-child { margin-bottom: 0; } diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 04afcd4b6b..be5b595bd7 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1387,6 +1387,7 @@ body, .ionic-body { overflow: hidden; margin: 0; padding: 0; + color: black; word-wrap: break-word; font-size: 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1415,9 +1416,9 @@ body, .ionic-body { .content-wrapper { position: absolute; top: 0; - height: 100%; - width: 100%; overflow: auto; + width: 100%; + height: 100%; -webkit-overflow-scrolling: touch; } .has-header { @@ -1442,15 +1443,22 @@ body, .ionic-body { background-color: #fff; -webkit-overflow-scrolling: touch; } -.hidden, .hide { +.hidden, +.hide { display: none !important; } .padded { padding: 10px; } +.padded-2 { + padding: 20px; } + .inset { margin: 10px; } +.inset-2 { + margin: 20px; } + .rounded { border-radius: 4px; } @@ -1459,8 +1467,8 @@ p { .lead { margin-bottom: 20px; - font-size: 16.1px; font-weight: 200; + font-size: 16.1px; line-height: 1.4; } small { @@ -1480,8 +1488,9 @@ cite { h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: black; font-weight: 500; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; line-height: 1.1; } h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small { @@ -1542,12 +1551,12 @@ dd { margin-left: 0; } blockquote { - padding: 10px 20px; margin: 0 0 20px; + padding: 10px 20px; border-left: 5px solid gray; } blockquote p { - font-size: 17.5px; font-weight: 300; + font-size: 17.5px; line-height: 1.25; } blockquote p:last-child { margin-bottom: 0; } diff --git a/scss/ionic/_scaffolding.scss b/scss/ionic/_scaffolding.scss index 6126d50209..9b194b9d05 100644 --- a/scss/ionic/_scaffolding.scss +++ b/scss/ionic/_scaffolding.scss @@ -24,6 +24,7 @@ body, .ionic-body { overflow: hidden; margin: 0; padding: 0; + color: $base-color; word-wrap: break-word; font-size: $font-size-base; font-family: $base-font-family; @@ -63,9 +64,9 @@ body, .ionic-body { .content-wrapper { position: absolute; top: 0; - height: 100%; - width: 100%; overflow: auto; + width: 100%; + height: 100%; -webkit-overflow-scrolling: touch; } diff --git a/scss/ionic/_type.scss b/scss/ionic/_type.scss index 2345826633..18bb8b39f5 100644 --- a/scss/ionic/_type.scss +++ b/scss/ionic/_type.scss @@ -11,8 +11,8 @@ p { } .lead { margin-bottom: $line-height-computed; - font-size: ($font-size-base * 1.15); font-weight: 200; + font-size: ($font-size-base * 1.15); line-height: 1.4; } @@ -37,8 +37,9 @@ cite { font-style: normal; } h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: $headings-font-family; + color: $base-color; font-weight: $headings-font-weight; + font-family: $headings-font-family; line-height: $headings-line-height; small { font-weight: normal; @@ -84,17 +85,17 @@ dt { font-weight: bold; } dd { - margin-left: 0; // Undo browser default + margin-left: 0; // Undo browser default; } // Blockquotes blockquote { - padding: ($line-height-computed / 2) $line-height-computed; margin: 0 0 $line-height-computed; + padding: ($line-height-computed / 2) $line-height-computed; border-left: 5px solid gray; p { - font-size: ($font-size-base * 1.25); font-weight: 300; + font-size: ($font-size-base * 1.25); line-height: 1.25; } p:last-child { @@ -104,7 +105,7 @@ blockquote { display: block; line-height: $line-height-base; &:before { - content: '\2014 \00A0';// EM DASH, NBSP + content: '\2014 \00A0';// EM DASH, NBSP; } } @@ -123,7 +124,7 @@ blockquote { content: ''; } &:after { - content: '\00A0 \2014';// NBSP, EM DASH + content: '\00A0 \2014';// NBSP, EM DASH; } } } diff --git a/scss/ionic/_util.scss b/scss/ionic/_util.scss index 51dc89a437..71d7f2de80 100644 --- a/scss/ionic/_util.scss +++ b/scss/ionic/_util.scss @@ -1,13 +1,24 @@ -.hidden, .hide { display: none !important; } +.hidden, +.hide { + display: none !important; +} .padded { padding: $content-padding; } +.padded-2 { + padding: $content-padding * 2; +} + .inset { margin: $inset-margin; } +.inset-2 { + margin: $inset-margin * 2; +} + .rounded { border-radius: $border-radius-base; } diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss index d6d19e8b3d..548565b15f 100644 --- a/scss/ionic/_variables.scss +++ b/scss/ionic/_variables.scss @@ -58,8 +58,9 @@ $mono-font-family: Monaco, Menlo, Consolas, "Courier New", monospace !de // Base // ------------------------------- -$base-font-family: $sans-font-family; -$base-background-color: $white; +$base-font-family: $sans-font-family; +$base-background-color: $white; +$base-color: #000; $content-padding: 10px; $inset-margin: 10px; $border-radius-base: 4px !default;