Merge pull request #215 from jamal-jackson/feature/add_roboto_font

Add Roboto Font
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-30 11:19:26 -03:00 committed by GitHub
commit 2cdd8df4eb
27 changed files with 141 additions and 30 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,30 +0,0 @@
@font-face {
font-family: 'roboto-regular';
font-style: normal;
font-weight: 400;
src: local('Roboto Regular'),
local('Roboto-Regular'),
url(../roboto-font/Roboto-Regular.ttf) format('truetype'),
url(../roboto-font/Roboto-Regular.woff) format('woff'),
url(../roboto-font/Roboto-Regular.woff2) format('woff2');
}
@font-face {
font-family: 'roboto-bold';
font-style: normal;
font-weight: 700;
src: local('Roboto Bold'),
local('Roboto-Bold'),
url(../roboto-font/Roboto-Bold.ttf) format('truetype'),
url(../roboto-font/Roboto-Bold.woff) format('woff'),
url(../roboto-font/Roboto-Bold.woff2) format('woff2');
}
@font-face {
font-family: 'roboto-italic';
font-style: italic;
font-weight: 400;
src: local('Roboto Italic'),
local('Roboto-Italic'),
url(../roboto-font/Roboto-Italic.ttf) format('truetype'),
url(../roboto-font/Roboto-Italic.woff) format('woff'),
url(../roboto-font/Roboto-Italic.woff2) format('woff2');
}

140
src/sass/fonts.scss Normal file
View File

@ -0,0 +1,140 @@
@font-face {
font-family: 'Roboto-Black';
src: url('../roboto-font/roboto-black-webfont.woff2') format('woff2'),
url('roboto-black-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Black-Italic';
src: url('../roboto-font/roboto-blackitalic-webfont.woff2') format('woff2'),
url('roboto-blackitalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Bold';
src: url('../roboto-font/roboto-bold-webfont.woff2') format('woff2'),
url('roboto-bold-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Bold-Italic';
src: url('../roboto-font/roboto-bolditalic-webfont.woff2') format('woff2'),
url('roboto-bolditalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Italic';
src: url('../roboto-font/roboto-italic-webfont.woff2') format('woff2'),
url('roboto-italic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Light';
src: url('../roboto-font/roboto-light-webfont.woff2') format('woff2'),
url('roboto-light-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Light-Italic';
src: url('../roboto-font/roboto-lightitalic-webfont.woff2') format('woff2'),
url('roboto-lightitalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Medium';
src: url('../roboto-font/roboto-medium-webfont.woff2') format('woff2'),
url('roboto-medium-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Medium-Italic';
src: url('../roboto-font/roboto-mediumitalic-webfont.woff2') format('woff2'),
url('roboto-mediumitalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto';
src: url('../roboto-font/roboto-regular-webfont.woff2') format('woff2'),
url('roboto-regular-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Thin';
src: url('../roboto-font/roboto-thin-webfont.woff2') format('woff2'),
url('roboto-thin-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Thin-Italic';
src: url('../roboto-font/roboto-thinitalic-webfont.woff2') format('woff2'),
url('roboto-thinitalic-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}

View File

@ -983,6 +983,7 @@ input[type=number] {
}
}
@import "fonts";
@import "ionic";
@import "common";
@import "forms";