change font to Roboto, change border radius and fab style to reflect google guidelines

This commit is contained in:
Jordan Davis 2014-10-10 23:22:15 -07:00
parent 958e4a827c
commit a1552e592f
13 changed files with 5321 additions and 17919 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

5793
dist/css/material.css vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

19
dist/css/ripples.css vendored
View File

@ -1,6 +1,6 @@
.withripple {
position: relative;
}
position: relative; }
.ripple-wrapper {
position: absolute;
top: 0;
@ -9,8 +9,8 @@
width: 100%;
height: 100%;
overflow: hidden;
border-radius: 2px;
}
border-radius: 2px; }
.ripple {
position: absolute;
width: 20px;
@ -26,15 +26,14 @@
-ms-transform-origin: 50%;
transform-origin: 50%;
opacity: 0;
pointer-events: none;
}
pointer-events: none; }
.ripple.ripple-on {
-webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
opacity: 1;
}
opacity: 1; }
.ripple.ripple-out {
-webkit-transition: opacity 0.1s linear 0s !important;
transition: opacity 0.1s linear 0s !important;
opacity: 0;
}
opacity: 0; }

View File

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

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-weight: 400;
}
// Well and Jumbotrons

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
.withripple {
position: relative;
}
position: relative; }
.ripple-wrapper {
position: absolute;
top: 0;
@ -9,8 +9,8 @@
width: 100%;
height: 100%;
overflow: hidden;
border-radius: 2px;
}
border-radius: 2px; }
.ripple {
position: absolute;
width: 20px;
@ -26,15 +26,14 @@
-ms-transform-origin: 50%;
transform-origin: 50%;
opacity: 0;
pointer-events: none;
}
pointer-events: none; }
.ripple.ripple-on {
-webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
opacity: 1;
}
opacity: 1; }
.ripple.ripple-out {
-webkit-transition: opacity 0.1s linear 0s !important;
transition: opacity 0.1s linear 0s !important;
opacity: 0;
}
opacity: 0; }

View File

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