taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move material-design font-face to custom.scss

stable
Juanfran 2015-09-16 08:05:21 +02:00
parent 8aa25e6871
commit fa0009c5ed
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/themes/material-design/custom.scss
View File

@ -4,6 +4,20 @@
// Fezzik: I'm on the Brute Squad. // Fezzik: I'm on the Brute Squad.
// Max: [sees Fezzik's size] You are the Brute Squad! // Max: [sees Fezzik's size] You are the Brute Squad!
//**************************
//** TYPOGRAPHY
//**************************
@each $font-face in OpenSans-CondLight, OpenSans-Light, opensans-regular, opensans-semibold, taiga {
@font-face {
font-family: '#{$font-face}';
src: url('../fonts/#{$font-face}.eot?#iefix') format('embedded-opentype'),
url('../fonts/#{$font-face}.woff') format('woff'),
url('../fonts/#{$font-face}.ttf') format('truetype'),
url('../fonts/#{$font-face}.svg#{$font-face}') format('svg');
}
}
//************************* //*************************
//** LAYOUT //** LAYOUT
//************************* //*************************

14
app/themes/material-design/variables.scss
View File

@ -34,20 +34,6 @@ $yellow-pear: #ffc107;
$top-icon-color: $white; $top-icon-color: $white;
$dropdown-color: rgba(darken($primary-dark, 20%), 1); $dropdown-color: rgba(darken($primary-dark, 20%), 1);
//**************************
//** TYPOGRAPHY
//**************************
@each $font-face in OpenSans-CondLight, OpenSans-Light, opensans-regular, opensans-semibold, taiga {
@font-face {
font-family: '#{$font-face}';
src: url('../fonts/#{$font-face}.eot?#iefix') format('embedded-opentype'),
url('../fonts/#{$font-face}.woff') format('woff'),
url('../fonts/#{$font-face}.ttf') format('truetype'),
url('../fonts/#{$font-face}.svg#{$font-face}') format('svg');
}
}
// Font Sizes // Font Sizes
%xsmall {font-size: .75rem;} %xsmall {font-size: .75rem;}
%small {font-size: .9rem;} %small {font-size: .9rem;}