Merge branch 'release/0.2.7'

This commit is contained in:
Christian Hoffmeister 2014-12-10 15:48:02 +01:00
commit 6698521a8d
5 changed files with 143 additions and 2 deletions

View File

@ -4,7 +4,7 @@ A simple bower package providing the [Roboto](http://www.google.com/fonts/specim
## Installing
Assuming you have [NodeJS](http://nodejs.org/) and [Bower](https://github.com/bower/bower) installed globally just open up a terminal, navigate to your projects root directory and then execute
Assuming you have [NodeJS](http://nodejs.org/) and [Bower](http://bower.io/) installed globally just open up a terminal, navigate to your projects root directory and then execute
```
$ bower install roboto-fontface --save

View File

@ -1,6 +1,6 @@
{
"name": "roboto-fontface-bower",
"version": "0.2.6",
"version": "0.2.7",
"main": [
"./roboto-fontface.css",
"./fonts/Roboto-Black.eot",

View File

@ -10,6 +10,16 @@
font-style: normal;
}
@font-face {
font-family: 'Roboto-Thin';
src: url('fonts/Roboto-Thin.eot');
src: url('fonts/Roboto-Thin.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-Thin.woff2') format('woff2'),
url('fonts/Roboto-Thin.woff') format('woff'),
url('fonts/Roboto-Thin.ttf') format('truetype'),
url('fonts/Roboto-Thin.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-ThinItalic.eot');
@ -22,6 +32,16 @@
font-style: italic;
}
@font-face {
font-family: 'Roboto-ThinItalic';
src: url('fonts/Roboto-ThinItalic.eot');
src: url('fonts/Roboto-ThinItalic.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-ThinItalic.woff2') format('woff2'),
url('fonts/Roboto-ThinItalic.woff') format('woff'),
url('fonts/Roboto-ThinItalic.ttf') format('truetype'),
url('fonts/Roboto-ThinItalic.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Light.eot');
@ -34,6 +54,16 @@
font-style: normal;
}
@font-face {
font-family: 'Roboto-Light';
src: url('fonts/Roboto-Light.eot');
src: url('fonts/Roboto-Light.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-Light.woff2') format('woff2'),
url('fonts/Roboto-Light.woff') format('woff'),
url('fonts/Roboto-Light.ttf') format('truetype'),
url('fonts/Roboto-Light.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-LightItalic.eot');
@ -46,6 +76,16 @@
font-style: italic;
}
@font-face {
font-family: 'Roboto-LightItalic';
src: url('fonts/Roboto-LightItalic.eot');
src: url('fonts/Roboto-LightItalic.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-LightItalic.woff2') format('woff2'),
url('fonts/Roboto-LightItalic.woff') format('woff'),
url('fonts/Roboto-LightItalic.ttf') format('truetype'),
url('fonts/Roboto-LightItalic.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Regular.eot');
@ -58,6 +98,16 @@
font-style: normal;
}
@font-face {
font-family: 'Roboto-Regular';
src: url('fonts/Roboto-Regular.eot');
src: url('fonts/Roboto-Regular.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-Regular.woff2') format('woff2'),
url('fonts/Roboto-Regular.woff') format('woff'),
url('fonts/Roboto-Regular.ttf') format('truetype'),
url('fonts/Roboto-Regular.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-RegularItalic.eot');
@ -70,6 +120,16 @@
font-style: italic;
}
@font-face {
font-family: 'Roboto-RegularItalic';
src: url('fonts/Roboto-RegularItalic.eot');
src: url('fonts/Roboto-RegularItalic.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-RegularItalic.woff2') format('woff2'),
url('fonts/Roboto-RegularItalic.woff') format('woff'),
url('fonts/Roboto-RegularItalic.ttf') format('truetype'),
url('fonts/Roboto-RegularItalic.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Medium.eot');
@ -82,6 +142,16 @@
font-style: normal;
}
@font-face {
font-family: 'Roboto-Medium';
src: url('fonts/Roboto-Medium.eot');
src: url('fonts/Roboto-Medium.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-Medium.woff2') format('woff2'),
url('fonts/Roboto-Medium.woff') format('woff'),
url('fonts/Roboto-Medium.ttf') format('truetype'),
url('fonts/Roboto-Medium.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-MediumItalic.eot');
@ -94,6 +164,16 @@
font-style: italic;
}
@font-face {
font-family: 'Roboto-MediumItalic';
src: url('fonts/Roboto-MediumItalic.eot');
src: url('fonts/Roboto-MediumItalic.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-MediumItalic.woff2') format('woff2'),
url('fonts/Roboto-MediumItalic.woff') format('woff'),
url('fonts/Roboto-MediumItalic.ttf') format('truetype'),
url('fonts/Roboto-MediumItalic.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Bold.eot');
@ -106,6 +186,16 @@
font-style: normal;
}
@font-face {
font-family: 'Roboto-Bold';
src: url('fonts/Roboto-Bold.eot');
src: url('fonts/Roboto-Bold.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-Bold.woff2') format('woff2'),
url('fonts/Roboto-Bold.woff') format('woff'),
url('fonts/Roboto-Bold.ttf') format('truetype'),
url('fonts/Roboto-Bold.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-BoldItalic.eot');
@ -118,6 +208,17 @@
font-style: italic;
}
@font-face {
font-family: 'Roboto-BoldItalic';
src: url('fonts/Roboto-BoldItalic.eot');
src: url('fonts/Roboto-BoldItalic.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-BoldItalic.woff2') format('woff2'),
url('fonts/Roboto-BoldItalic.woff') format('woff'),
url('fonts/Roboto-BoldItalic.ttf') format('truetype'),
url('fonts/Roboto-BoldItalic.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Black.eot');
@ -130,6 +231,16 @@
font-style: normal;
}
@font-face {
font-family: 'Roboto-Black';
src: url('fonts/Roboto-Black.eot');
src: url('fonts/Roboto-Black.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-Black.woff2') format('woff2'),
url('fonts/Roboto-Black.woff') format('woff'),
url('fonts/Roboto-Black.ttf') format('truetype'),
url('fonts/Roboto-Black.svg#Roboto') format('svg');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-BlackItalic.eot');
@ -141,3 +252,13 @@
font-weight: 900;
font-style: italic;
}
@font-face {
font-family: 'Roboto-BlackItalic';
src: url('fonts/Roboto-BlackItalic.eot');
src: url('fonts/Roboto-BlackItalic.eot?#iefix') format('embedded-opentype'),
url('fonts/Roboto-BlackItalic.woff2') format('woff2'),
url('fonts/Roboto-BlackItalic.woff') format('woff'),
url('fonts/Roboto-BlackItalic.ttf') format('truetype'),
url('fonts/Roboto-BlackItalic.svg#Roboto') format('svg');
}

View File

@ -12,6 +12,16 @@
font-weight: @weight;
font-style: @style;
}
@font-face {
font-family: 'Roboto-@{type}';
src: url('@{roboto-font-path}/Roboto-@{type}.eot');
src: url('@{roboto-font-path}/Roboto-@{type}.eot?#iefix') format('embedded-opentype'),
url('@{roboto-font-path}/Roboto-@{type}.woff2') format('woff2'),
url('@{roboto-font-path}/Roboto-@{type}.woff') format('woff'),
url('@{roboto-font-path}/Roboto-@{type}.ttf') format('truetype'),
url('@{roboto-font-path}/Roboto-@{type}.svg#Roboto') format('svg');
}
}
.roboto-font-pair(@type, @weight) {

View File

@ -12,6 +12,16 @@ $roboto-font-path: 'fonts' !default;
font-weight: $weight;
font-style: $style;
}
@font-face {
font-family: 'Roboto-#{$type}';
src: url('#{$roboto-font-path}/Roboto-#{$type}.eot');
src: url('#{$roboto-font-path}/Roboto-#{$type}.eot?#iefix') format('embedded-opentype'),
url('#{$roboto-font-path}/Roboto-#{$type}.woff2') format('woff2'),
url('#{$roboto-font-path}/Roboto-#{$type}.woff') format('woff'),
url('#{$roboto-font-path}/Roboto-#{$type}.ttf') format('truetype'),
url('#{$roboto-font-path}/Roboto-#{$type}.svg#Roboto') format('svg');
}
}
@mixin roboto-font-pair($type, $weight) {