Merge
commit
5fec753033
|
@ -2,3 +2,4 @@ build
|
|||
lib
|
||||
node_modules
|
||||
npm-debug.log
|
||||
.idea
|
||||
|
|
|
@ -17,6 +17,8 @@ $color-accent-contrast: $color-dark-contrast !default;
|
|||
$unit: 1rem;
|
||||
|
||||
// -- Fonts
|
||||
$font-icon-url: 'https://fonts.googleapis.com/icon?family=Material+Icons' !default;
|
||||
$font-roboto-url: 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700' !default;
|
||||
$preferred-font: "Roboto", "Helvetica", "Arial", sans-serif !default;
|
||||
$font-size: 1.6 * $unit !default;
|
||||
$font-size-tiny: 1.2 * $unit !default;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
@import "~normalize.css";
|
||||
@import "./base";
|
||||
@import url(http://fonts.googleapis.com/css?family=Roboto:300,400,500,700);
|
||||
@import url($font-roboto-url);
|
||||
|
||||
html {
|
||||
font-size: 62.5%;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@import url('https://fonts.googleapis.com/icon?family=Material+Icons');
|
||||
@import url($font-icon-url);
|
||||
|
||||
%icon {
|
||||
display: inline-block;
|
||||
|
|
Loading…
Reference in New Issue