google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add flag to not target elements directly for typography. (Closes #1038)

master
Jonathan Garbee 2015-07-14 19:58:14 -04:00
parent 1f7afb96f1
commit 180420f492
2 changed files with 100 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/_variables.scss
View File

@ -108,6 +108,13 @@ $color-accent-contrast: $color-dark-contrast !default;
$text-color-primary: unquote("rgba(#{$color-black}, 0.87)") !default;
$text-link-color: unquote("rgb(#{$color-accent})") !default;
// Define whether to target elements directly for typographic enhancements.
// Turning this off means you need to use mdl-* classes more often.
// Other components may also fail to adhere to MD without these rules.
// It is strongly recommended you leave this as true.
$target-elements-directly: true !default;
/* ========== Components ========== */
/* ========== Standard Buttons ========== */

56
src/typography/_typography.scss
View File

@ -17,6 +17,7 @@
@import "../variables";
@import "../mixins";
@if $target-elements-directly == true {
html, body {
font-family: $performance_font;
font-size: 14px;
@ -35,47 +36,55 @@ h1, h2, h3, h4, h5, h6, p {
h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
@include typo-display-3($colorContrast: true);
font-size: 0.6em;
}
h1 {
@include typo-display-3();
@include typo-display-3;
margin-top: 24px;
margin-bottom: 24px;
}
h2 {
@include typo-display-2();
@include typo-display-2;
margin-top: 24px;
margin-bottom: 24px;
}
h3 {
@include typo-display-1();
@include typo-display-1;
margin-top: 24px;
margin-bottom: 24px;
}
h4 {
@include typo-headline();
@include typo-headline;
margin-top: 24px;
margin-bottom: 16px;
}
h5 {
@include typo-title();
@include typo-title;
margin-top: 24px;
margin-bottom: 16px;
}
h6 {
@include typo-subhead();
@include typo-subhead;
margin-top: 24px;
margin-bottom: 16px;
}
p {
@include typo-body-1();
@include typo-body-1;
margin-bottom: 16px;
}
@ -85,7 +94,7 @@ a {
}
blockquote {
@include typo-blockquote();
@include typo-blockquote;
}
mark {
@ -97,12 +106,14 @@ dt {
}
address {
@include typo-caption();
@include typo-caption;
font-style: normal;
}
ul, ol {
@include typo-body-1();
@include typo-body-1;
}
}
/**
@ -110,7 +121,7 @@ ul, ol {
*/
.mdl-typography--display-4 {
@include typo-display-4();
@include typo-display-4;
}
.mdl-typography--display-4-color-contrast {
@ -118,7 +129,7 @@ ul, ol {
}
.mdl-typography--display-3 {
@include typo-display-3();
@include typo-display-3;
}
.mdl-typography--display-3-color-contrast {
@ -126,7 +137,7 @@ ul, ol {
}
.mdl-typography--display-2 {
@include typo-display-2();
@include typo-display-2;
}
.mdl-typography--display-2-color-contrast {
@ -134,7 +145,7 @@ ul, ol {
}
.mdl-typography--display-1 {
@include typo-display-1();
@include typo-display-1;
}
.mdl-typography--display-1-color-contrast {
@ -142,7 +153,7 @@ ul, ol {
}
.mdl-typography--headline {
@include typo-headline();
@include typo-headline;
}
.mdl-typography--headline-color-contrast {
@ -150,7 +161,7 @@ ul, ol {
}
.mdl-typography--title {
@include typo-title();
@include typo-title;
}
.mdl-typography--title-color-contrast {
@ -158,7 +169,7 @@ ul, ol {
}
.mdl-typography--subhead {
@include typo-subhead();
@include typo-subhead;
}
.mdl-typography--subhead-color-contrast {
@ -166,7 +177,7 @@ ul, ol {
}
.mdl-typography--body-2 {
@include typo-body-2();
@include typo-body-2;
}
.mdl-typography--body-2-color-contrast {
@ -174,7 +185,7 @@ ul, ol {
}
.mdl-typography--body-1 {
@include typo-body-1();
@include typo-body-1;
}
.mdl-typography--body-1-color-contrast {
@ -198,7 +209,7 @@ ul, ol {
}
.mdl-typography--caption {
@include typo-caption();
@include typo-caption;
}
.mdl-typography--caption-force-preferred-font {
@ -214,7 +225,7 @@ ul, ol {
}
.mdl-typography--menu {
@include typo-menu();
@include typo-menu;
}
.mdl-typography--menu-color-contrast {
@ -222,7 +233,7 @@ ul, ol {
}
.mdl-typography--button {
@include typo-button();
@include typo-button;
}
.mdl-typography--button-color-contrast {
@ -249,7 +260,6 @@ ul, ol {
white-space: nowrap;
}
.mdl-typography--text-lowercase {
text-transform: lowercase;
}