Skip to content

Commit 139a9e4

Browse files
author
Fez Vrasta
committed
Merge pull request mdbootstrap#109 from jorjordandan/develop
Change fonts, button radius, and btn-fab style to match google guides.
2 parents 958e4a8 + fb89578 commit 139a9e4

11 files changed

Lines changed: 71 additions & 31 deletions

‎dist/css/material-wfont.css‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,10 +1559,14 @@ h6,
15591559
.h1,
15601560
.h2,
15611561
.h3,
1562-
.h4,
1563-
.h5,
1564-
.h6 {
1562+
.h4 {
1563+
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
1564+
font-weight: 300;
1565+
}
1566+
h5,
1567+
h6 {
15651568
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
1569+
font-weight: 400;
15661570
}
15671571
body .well,
15681572
.container .well,
@@ -1890,7 +1894,7 @@ body .jumbotron-material-lightgrey,
18901894
border: 0;
18911895
margin: 10px 1px;
18921896
cursor: pointer;
1893-
border-radius: 4px;
1897+
border-radius: 2px;
18941898
text-transform: uppercase;
18951899
text-decoration: none;
18961900
color: rgba(255, 255, 255, 0.84);
@@ -2078,7 +2082,7 @@ body .jumbotron-material-lightgrey,
20782082
.btn-group,
20792083
.btn-group-vertical {
20802084
position: relative;
2081-
border-radius: 4px;
2085+
border-radius: 2px;
20822086
margin: 10px 1px;
20832087
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
20842088
-webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@@ -2126,6 +2130,10 @@ body .jumbotron-material-lightgrey,
21262130
height: 56px;
21272131
}
21282132
.btn-fab,
2133+
.btn-fab:hover {
2134+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
2135+
}
2136+
.btn-fab,
21292137
.btn-fab:hover,
21302138
.btn-fab-default,
21312139
.btn-fab:hover-default {

‎dist/css/material-wfont.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/material.css‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,10 +1558,14 @@ h6,
15581558
.h1,
15591559
.h2,
15601560
.h3,
1561-
.h4,
1562-
.h5,
1563-
.h6 {
1561+
.h4 {
1562+
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
1563+
font-weight: 300;
1564+
}
1565+
h5,
1566+
h6 {
15641567
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
1568+
font-weight: 400;
15651569
}
15661570
body .well,
15671571
.container .well,
@@ -1889,7 +1893,7 @@ body .jumbotron-material-lightgrey,
18891893
border: 0;
18901894
margin: 10px 1px;
18911895
cursor: pointer;
1892-
border-radius: 4px;
1896+
border-radius: 2px;
18931897
text-transform: uppercase;
18941898
text-decoration: none;
18951899
color: rgba(255, 255, 255, 0.84);
@@ -2077,7 +2081,7 @@ body .jumbotron-material-lightgrey,
20772081
.btn-group,
20782082
.btn-group-vertical {
20792083
position: relative;
2080-
border-radius: 4px;
2084+
border-radius: 2px;
20812085
margin: 10px 1px;
20822086
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
20832087
-webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@@ -2125,6 +2129,10 @@ body .jumbotron-material-lightgrey,
21252129
height: 56px;
21262130
}
21272131
.btn-fab,
2132+
.btn-fab:hover {
2133+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
2134+
}
2135+
.btn-fab,
21282136
.btn-fab:hover,
21292137
.btn-fab-default,
21302138
.btn-fab:hover-default {

‎dist/css/material.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎less/_buttons.import.less‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
margin: 10px 1px;
1616

1717
cursor: pointer;
18-
border-radius: 4px;
18+
border-radius: 2px;
1919
text-transform: uppercase;
2020
text-decoration: none;
2121
color: @darkbg-text;
@@ -64,7 +64,7 @@
6464

6565
.btn-group, .btn-group-vertical {
6666
position: relative;
67-
border-radius: 4px;
67+
border-radius: 2px;
6868
margin: 10px 1px;
6969

7070
.btn-shadow();
@@ -93,6 +93,7 @@
9393
width: 56px;
9494
height: 56px;
9595
&, &:hover {
96+
.shadow-z-1();
9697
.variations(~"", background-color, transparent);
9798
}
9899
&, .ripple-wrapper {

‎less/material.less‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@ body {
1717
}
1818
}
1919

20-
body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
20+
body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 {
21+
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
22+
font-weight: 300;
23+
}
24+
25+
h5, h6{
2126
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
27+
font-weight: 400;
28+
2229
}
2330

2431
// Well and Jumbotrons

‎template/material/css/material-wfont.css‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,10 +1559,14 @@ h6,
15591559
.h1,
15601560
.h2,
15611561
.h3,
1562-
.h4,
1563-
.h5,
1564-
.h6 {
1562+
.h4 {
1563+
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
1564+
font-weight: 300;
1565+
}
1566+
h5,
1567+
h6 {
15651568
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
1569+
font-weight: 400;
15661570
}
15671571
body .well,
15681572
.container .well,
@@ -1890,7 +1894,7 @@ body .jumbotron-material-lightgrey,
18901894
border: 0;
18911895
margin: 10px 1px;
18921896
cursor: pointer;
1893-
border-radius: 4px;
1897+
border-radius: 2px;
18941898
text-transform: uppercase;
18951899
text-decoration: none;
18961900
color: rgba(255, 255, 255, 0.84);
@@ -2078,7 +2082,7 @@ body .jumbotron-material-lightgrey,
20782082
.btn-group,
20792083
.btn-group-vertical {
20802084
position: relative;
2081-
border-radius: 4px;
2085+
border-radius: 2px;
20822086
margin: 10px 1px;
20832087
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
20842088
-webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@@ -2126,6 +2130,10 @@ body .jumbotron-material-lightgrey,
21262130
height: 56px;
21272131
}
21282132
.btn-fab,
2133+
.btn-fab:hover {
2134+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
2135+
}
2136+
.btn-fab,
21292137
.btn-fab:hover,
21302138
.btn-fab-default,
21312139
.btn-fab:hover-default {

‎template/material/css/material-wfont.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎template/material/css/material.css‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,10 +1558,14 @@ h6,
15581558
.h1,
15591559
.h2,
15601560
.h3,
1561-
.h4,
1562-
.h5,
1563-
.h6 {
1561+
.h4 {
1562+
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
1563+
font-weight: 300;
1564+
}
1565+
h5,
1566+
h6 {
15641567
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
1568+
font-weight: 400;
15651569
}
15661570
body .well,
15671571
.container .well,
@@ -1889,7 +1893,7 @@ body .jumbotron-material-lightgrey,
18891893
border: 0;
18901894
margin: 10px 1px;
18911895
cursor: pointer;
1892-
border-radius: 4px;
1896+
border-radius: 2px;
18931897
text-transform: uppercase;
18941898
text-decoration: none;
18951899
color: rgba(255, 255, 255, 0.84);
@@ -2077,7 +2081,7 @@ body .jumbotron-material-lightgrey,
20772081
.btn-group,
20782082
.btn-group-vertical {
20792083
position: relative;
2080-
border-radius: 4px;
2084+
border-radius: 2px;
20812085
margin: 10px 1px;
20822086
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
20832087
-webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@@ -2125,6 +2129,10 @@ body .jumbotron-material-lightgrey,
21252129
height: 56px;
21262130
}
21272131
.btn-fab,
2132+
.btn-fab:hover {
2133+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
2134+
}
2135+
.btn-fab,
21282136
.btn-fab:hover,
21292137
.btn-fab-default,
21302138
.btn-fab:hover-default {

‎template/material/css/material.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)