mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2025-11-04 09:57:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109 from jorjordandan/develop

Browse Source 
Change fonts, button radius, and btn-fab style to match google guides.
This commit is contained in:
Fez Vrasta 2014-10-11 09:02:25 +02:00
commit 3b281b1ac5
11 changed files with 71 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dist/css/material-wfont.css vendored
View File

@ -1559,10 +1559,14 @@ h6,
.h1, .h1,
.h2, .h2,
.h3, .h3,
.h4, .h4 {
.h5, font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
.h6 { font-weight: 300;
}
h5,
h6 {
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
} }
body .well, body .well,
.container .well, .container .well,
@ -1890,7 +1894,7 @@ body .jumbotron-material-lightgrey,
border: 0; border: 0;
margin: 10px 1px; margin: 10px 1px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 2px;
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
color: rgba(255, 255, 255, 0.84); color: rgba(255, 255, 255, 0.84);
@ -2078,7 +2082,7 @@ body .jumbotron-material-lightgrey,
.btn-group, .btn-group,
.btn-group-vertical { .btn-group-vertical {
position: relative; position: relative;
border-radius: 4px; border-radius: 2px;
margin: 10px 1px; margin: 10px 1px;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@ -2126,6 +2130,10 @@ body .jumbotron-material-lightgrey,
height: 56px; height: 56px;
} }
.btn-fab, .btn-fab,
.btn-fab:hover {
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
}
.btn-fab,
.btn-fab:hover, .btn-fab:hover,
.btn-fab-default, .btn-fab-default,
.btn-fab:hover-default { .btn-fab:hover-default {

2
dist/css/material-wfont.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
dist/css/material.css vendored
View File

@ -1558,10 +1558,14 @@ h6,
.h1, .h1,
.h2, .h2,
.h3, .h3,
.h4, .h4 {
.h5, font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
.h6 { font-weight: 300;
}
h5,
h6 {
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
} }
body .well, body .well,
.container .well, .container .well,
@ -1889,7 +1893,7 @@ body .jumbotron-material-lightgrey,
border: 0; border: 0;
margin: 10px 1px; margin: 10px 1px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 2px;
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
color: rgba(255, 255, 255, 0.84); color: rgba(255, 255, 255, 0.84);
@ -2077,7 +2081,7 @@ body .jumbotron-material-lightgrey,
.btn-group, .btn-group,
.btn-group-vertical { .btn-group-vertical {
position: relative; position: relative;
border-radius: 4px; border-radius: 2px;
margin: 10px 1px; margin: 10px 1px;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@ -2125,6 +2129,10 @@ body .jumbotron-material-lightgrey,
height: 56px; height: 56px;
} }
.btn-fab, .btn-fab,
.btn-fab:hover {
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
}
.btn-fab,
.btn-fab:hover, .btn-fab:hover,
.btn-fab-default, .btn-fab-default,
.btn-fab:hover-default { .btn-fab:hover-default {

2
dist/css/material.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
less/_buttons.import.less vendored
View File

@ -15,7 +15,7 @@
margin: 10px 1px; margin: 10px 1px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 2px;
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
color: @darkbg-text; color: @darkbg-text;
@ -64,7 +64,7 @@
.btn-group, .btn-group-vertical { .btn-group, .btn-group-vertical {
position: relative; position: relative;
border-radius: 4px; border-radius: 2px;
margin: 10px 1px; margin: 10px 1px;
.btn-shadow(); .btn-shadow();
@ -93,6 +93,7 @@
width: 56px; width: 56px;
height: 56px; height: 56px;
&, &:hover { &, &:hover {
.shadow-z-1();
.variations(~"", background-color, transparent); .variations(~"", background-color, transparent);
} }
&, .ripple-wrapper { &, .ripple-wrapper {

9
less/material.less
View File

@ -17,8 +17,15 @@ body {
} }
} }
body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 {
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 300;
}
h5, h6{
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
} }
// Well and Jumbotrons // Well and Jumbotrons

18
template/material/css/material-wfont.css
View File

@ -1559,10 +1559,14 @@ h6,
.h1, .h1,
.h2, .h2,
.h3, .h3,
.h4, .h4 {
.h5, font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
.h6 { font-weight: 300;
}
h5,
h6 {
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
} }
body .well, body .well,
.container .well, .container .well,
@ -1890,7 +1894,7 @@ body .jumbotron-material-lightgrey,
border: 0; border: 0;
margin: 10px 1px; margin: 10px 1px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 2px;
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
color: rgba(255, 255, 255, 0.84); color: rgba(255, 255, 255, 0.84);
@ -2078,7 +2082,7 @@ body .jumbotron-material-lightgrey,
.btn-group, .btn-group,
.btn-group-vertical { .btn-group-vertical {
position: relative; position: relative;
border-radius: 4px; border-radius: 2px;
margin: 10px 1px; margin: 10px 1px;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@ -2126,6 +2130,10 @@ body .jumbotron-material-lightgrey,
height: 56px; height: 56px;
} }
.btn-fab, .btn-fab,
.btn-fab:hover {
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
}
.btn-fab,
.btn-fab:hover, .btn-fab:hover,
.btn-fab-default, .btn-fab-default,
.btn-fab:hover-default { .btn-fab:hover-default {

2
template/material/css/material-wfont.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
template/material/css/material.css
View File

@ -1558,10 +1558,14 @@ h6,
.h1, .h1,
.h2, .h2,
.h3, .h3,
.h4, .h4 {
.h5, font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
.h6 { font-weight: 300;
}
h5,
h6 {
font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
} }
body .well, body .well,
.container .well, .container .well,
@ -1889,7 +1893,7 @@ body .jumbotron-material-lightgrey,
border: 0; border: 0;
margin: 10px 1px; margin: 10px 1px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 2px;
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
color: rgba(255, 255, 255, 0.84); color: rgba(255, 255, 255, 0.84);
@ -2077,7 +2081,7 @@ body .jumbotron-material-lightgrey,
.btn-group, .btn-group,
.btn-group-vertical { .btn-group-vertical {
position: relative; position: relative;
border-radius: 4px; border-radius: 2px;
margin: 10px 1px; margin: 10px 1px;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); -webkit-transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@ -2125,6 +2129,10 @@ body .jumbotron-material-lightgrey,
height: 56px; height: 56px;
} }
.btn-fab, .btn-fab,
.btn-fab:hover {
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
}
.btn-fab,
.btn-fab:hover, .btn-fab:hover,
.btn-fab-default, .btn-fab-default,
.btn-fab:hover-default { .btn-fab:hover-default {

2
template/material/css/material.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
template/material/js/ripples.js
View File

@ -1,6 +1,6 @@
/* Copyright 2014+, Federico Zivolo, LICENSE at https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md */ /* Copyright 2014+, Federico Zivolo, LICENSE at https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md */
/* globals CustomEvent */ /* globals CustomEvent */
/*jshint maxlen: 500 */
window.ripples = { window.ripples = {
init : function(withRipple) { init : function(withRipple) {
"use strict"; "use strict";
@ -56,10 +56,10 @@ window.ripples = {
// This changes the alpha value of the rgba (opacity) to the constant __rippleOpacity__ // This changes the alpha value of the rgba (opacity) to the constant __rippleOpacity__
// Not sure if regexp is quicker... // Not sure if regexp is quicker...
rgbArr = targetColor.split(','); rgbArr = targetColor.split(",");
rgbArr.pop(); rgbArr.pop();
rgbArr.push(" " + __rippleOpacity__ + ")") rgbArr.push(" " + __rippleOpacity__ + ")");
targetColor = rgbArr.join(','); targetColor = rgbArr.join(",");
// Insert new ripple into ripple wrapper // Insert new ripple into ripple wrapper