Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

Commit

Permalink
Extend typography classes with % (fixes #21)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gpbl
gpbl committed Jan 10, 2015
1 parent 7e15bcc commit a2d9abe
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 41 deletions.
14 changes: 7 additions & 7 deletions material-ui/_html.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ hr {
border-bottom: solid 1px $border-color;
}

h1 { @extend .mui-font-style-display-2; }
h2 { @extend .mui-font-style-display-1; }
h3 { @extend .mui-font-style-headline; }
h4 { @extend .mui-font-style-title; }
h5 { @extend .mui-font-style-subhead-1; }
h6 { @extend .mui-font-style-body-2; }
p { @extend .mui-font-style-body-1; }
h1 { @extend %mui-font-style-display-2; }
h2 { @extend %mui-font-style-display-1; }
h3 { @extend %mui-font-style-headline; }
h4 { @extend %mui-font-style-title; }
h5 { @extend %mui-font-style-subhead-1; }
h6 { @extend %mui-font-style-body-2; }
p { @extend %mui-font-style-body-1; }
hr {
margin-top: 0;
margin-bottom: 18px;
Expand Down
2 changes: 1 addition & 1 deletion material-ui/components/_app-bar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

.mui-app-bar-title {
@extend .mui-font-style-headline;
@extend %mui-font-style-headline;
color: $app-bar-text-color;
padding-top: 0;
line-height: $desktop-keyline-increment;
Expand Down
2 changes: 1 addition & 1 deletion material-ui/components/_card.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
line-height: 56px;
height: 56px;
padding-left: 0 $card-padding;
@extend .mui-font-style-menu;
@extend %mui-font-style-menu;
}
}
2 changes: 1 addition & 1 deletion material-ui/components/_flat-button.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.mui-flat-button {

@include ease-out();
@extend .mui-font-style-button;
@extend %mui-font-style-button;
border-radius: 2px;
user-select: none;

Expand Down
2 changes: 1 addition & 1 deletion material-ui/components/_menu.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
vertical-align: top;
top: -12px;
position: relative;
@extend .mui-font-weight-light;
@extend %mui-font-weight-light;
}

.mui-icon-arrow-drop-right {
Expand Down
2 changes: 1 addition & 1 deletion material-ui/components/_raised-button.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

.mui-raised-button-label {
position: relative;
@extend .mui-font-style-button;
@extend %mui-font-style-button;
margin: 0;
padding: 0 $desktop-gutter-less;
user-select: none;
Expand Down
2 changes: 1 addition & 1 deletion material-ui/components/_subheader.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.mui-subheader {
@extend .mui-font-style-body-2;
@extend %mui-font-style-body-2;
margin: 0;
height: $desktop-subheader-height + $desktop-gutter-mini;
line-height: $desktop-subheader-height;
Expand Down
2 changes: 1 addition & 1 deletion material-ui/components/date-picker/_calendar-toolbar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
line-height: 48px;
font-size: 14px;
text-align: center;
@extend .mui-font-weight-medium;
@extend %mui-font-weight-medium;
}

.mui-date-picker-calendar-toolbar-button-left {
Expand Down
2 changes: 1 addition & 1 deletion material-ui/components/date-picker/_calendar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

.mui-date-picker-calendar-week-title {
@include clearfix();
@extend .mui-font-weight-medium;
@extend %mui-font-weight-medium;
color: lighten($date-picker-calendar-text-color, 50%);

line-height: 12px;
Expand Down
52 changes: 26 additions & 26 deletions material-ui/core/_typography.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
letter-spacing: -7px;
padding-top: 17px;
margin-bottom: 15px;
@extend .mui-font-weight-light;
@extend .mui-text-light-black;
@extend %mui-font-weight-light;
@extend %mui-text-light-black;
}

%mui-font-style-display-3,
Expand All @@ -61,8 +61,8 @@
letter-spacing: -2px;
padding-top: 8px;
margin-bottom: 28px;
@extend .mui-font-weight-normal;
@extend .mui-text-light-black;
@extend %mui-font-weight-normal;
@extend %mui-text-light-black;
}

%mui-font-style-display-2,
Expand All @@ -71,8 +71,8 @@
line-height: 48px;
margin-bottom: 11px;
letter-spacing: -1px;
@extend .mui-font-weight-normal;
@extend .mui-text-light-black;
@extend %mui-font-weight-normal;
@extend %mui-text-light-black;
}

%mui-font-style-display-1,
Expand All @@ -82,8 +82,8 @@
padding-top: 8px;
margin-bottom: 12px;
letter-spacing: -1px;
@extend .mui-font-weight-normal;
@extend .mui-text-light-black;
@extend %mui-font-weight-normal;
@extend %mui-text-light-black;
}

%mui-font-style-headline,
Expand All @@ -93,8 +93,8 @@
padding-top: 16px;
margin-bottom: 12px;
letter-spacing: 0;
@extend .mui-font-weight-normal;
@extend .mui-text-dark-black;
@extend %mui-font-weight-normal;
@extend %mui-text-dark-black;
}

%mui-font-style-title,
Expand All @@ -104,8 +104,8 @@
padding-top: 19px;
margin-bottom: 13px;
letter-spacing: 0;
@extend .mui-font-weight-medium;
@extend .mui-text-dark-black;
@extend %mui-font-weight-medium;
@extend %mui-text-dark-black;
}

%mui-font-style-subhead-2,
Expand All @@ -115,17 +115,17 @@
padding-top: 2px;
margin-bottom: 10px;
letter-spacing: 0;
@extend .mui-font-weight-normal;
@extend .mui-text-dark-black;
@extend %mui-font-weight-normal;
@extend %mui-text-dark-black;
}

%mui-font-style-subhead-1,
.mui-font-style-subhead-1 {
@extend .mui-font-style-subhead-2;
@extend %mui-font-style-subhead-2;
line-height: 24px;
padding-top: 3px;
margin-bottom: 13px;
@extend .mui-text-dark-black;
@extend %mui-text-dark-black;
}

%mui-font-style-body-2,
Expand All @@ -135,8 +135,8 @@
padding-top: 4px;
margin-bottom: 12px;
letter-spacing: 0;
@extend .mui-font-weight-medium;
@extend .mui-text-dark-black;
@extend %mui-font-weight-medium;
@extend %mui-text-dark-black;
}

%mui-font-style-body-1,
Expand All @@ -146,8 +146,8 @@
padding-top: 6px;
margin-bottom: 14px;
letter-spacing: 0;
@extend .mui-font-weight-normal;
@extend .mui-text-dark-black;
@extend %mui-font-weight-normal;
@extend %mui-text-dark-black;
}

%mui-font-style-caption,
Expand All @@ -157,8 +157,8 @@
padding-top: 6px;
margin-bottom: 14px;
letter-spacing: 0;
@extend .mui-font-weight-normal;
@extend .mui-text-light-black;
@extend %mui-font-weight-normal;
@extend %mui-text-light-black;
}

%mui-font-style-menu,
Expand All @@ -168,8 +168,8 @@
padding-top: 6px;
margin-bottom: 14px;
letter-spacing: 0;
@extend .mui-font-weight-medium;
@extend .mui-text-dark-black;
@extend %mui-font-weight-medium;
@extend %mui-text-dark-black;
}

%mui-font-style-button,
Expand All @@ -180,6 +180,6 @@
margin-bottom: 15px;
letter-spacing: 0;
text-transform: uppercase;
@extend .mui-font-weight-medium;
@extend .mui-text-dark-black;
@extend %mui-font-weight-medium;
@extend %mui-text-dark-black;
}

0 comments on commit a2d9abe

Please sign in to comment.