Merge tag 'v0.5.0' into develop
Version 0.5.0
This commit is contained in:
commit
121643336e
22
README.md
22
README.md
@ -20,21 +20,19 @@ $ bower install roboto-fontface --save
|
||||
There're several files in the `css/` subdirectory. Import them in your project
|
||||
to have access to "Roboto" font face:
|
||||
|
||||
* `roboto-fontface.css` - whole font family compiled to CSS
|
||||
* `sass/roboto-fontface.scss` - whole font family in SCSS
|
||||
* `less/roboto-fontface.less` - whole font family in LESS
|
||||
* `css/roboto/roboto-fontface.css` - whole font family compiled to CSS
|
||||
* `css/roboto/sass/roboto-fontface.scss` - whole font family in SCSS
|
||||
* `css/roboto/less/roboto-fontface.less` - whole font family in LESS
|
||||
|
||||
* `css/roboto-condensed/roboto-condensed-fontface.css` - whole font family compiled to CSS
|
||||
* `css/roboto-condensed/sass/roboto-condensed-fontface.scss` - whole font family in SCSS
|
||||
* `css/roboto-condensed/less/roboto-condensed-fontface.less` - whole font family in LESS
|
||||
|
||||
Importing whole family may be unnecessary and lead to huge build, so if you are
|
||||
using SCSS or LESS, you can import only individual weights by importing one
|
||||
of the following files:
|
||||
using SCSS or LESS, you can import only individual weights by importing for example:
|
||||
|
||||
* `roboto-fontface-(thin|light|regular|medium|bold|black).scss`
|
||||
* `roboto-fontface-(thin|light|regular|medium|bold|black).less`
|
||||
|
||||
Their italic variants can be imported by adding `-italic` suffix:
|
||||
|
||||
* `roboto-fontface-(thin|light|regular|medium|bold|black)-italic.scss`
|
||||
* `roboto-fontface-(thin|light|regular|medium|bold|black)-italic.less`
|
||||
* `css/roboto/sass/roboto-fontface-black.scss`
|
||||
* `css/roboto/sass/roboto-fontface-black-italic.scss`
|
||||
|
||||
## Hinting
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "roboto-fontface",
|
||||
"description": "A simple package providing the Roboto fontface.",
|
||||
"version": "0.4.5",
|
||||
"version": "0.5.0",
|
||||
"main": [
|
||||
"./css/roboto/roboto-fontface.css",
|
||||
"./css/roboto-condensed/roboto-condensed-fontface.css",
|
||||
@ -15,4 +15,4 @@
|
||||
"test",
|
||||
"tests"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
@roboto-font-path: '../../../fonts';
|
||||
|
||||
.roboto-font(@variant, @type, @weight, @style) {
|
||||
|
||||
|
||||
@font-full-path: '@{roboto-font-path}/@{variant}/@{variant}';
|
||||
|
||||
|
||||
@font-face {
|
||||
font-family: '@{variant}';
|
||||
src: url('@{font-full-path}-@{type}.eot');
|
||||
|
@ -1,9 +1,9 @@
|
||||
$roboto-font-path: '../../../fonts' !default;
|
||||
|
||||
@mixin roboto-font($variant, $type, $weight, $style) {
|
||||
|
||||
|
||||
$font-full-path: '#{$roboto-font-path}/#{$variant}/#{$variant}';
|
||||
|
||||
|
||||
@font-face {
|
||||
font-family: '#{$variant}';
|
||||
src: url('#{$font-full-path}-#{$type}.eot');
|
||||
|
@ -1,6 +1,6 @@
|
||||
@import "roboto-condensed-fontface-regular";
|
||||
@import "roboto-condensed-fontface-regular-italic";
|
||||
@import "roboto-condensed-fontface-light";
|
||||
@import "roboto-condensed-fontface-light-italic";
|
||||
@import "roboto-condensed-fontface-light-italic";
|
||||
@import "roboto-condensed-fontface-bold";
|
||||
@import "roboto-condensed-fontface-bold-italic";
|
||||
@import "roboto-condensed-fontface-bold-italic";
|
||||
|
@ -80,4 +80,4 @@
|
||||
font-family: "Roboto-Condensed-BoldItalic";
|
||||
src: url("../../fonts/Roboto-Condensed/Roboto-Condensed/Roboto-Condensed-BoldItalic.eot");
|
||||
src: local("Roboto-Condensed BoldItalic"), local("Roboto-Condensed-BoldItalic"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.svg#Roboto-Condensed") format("svg");
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
@import "roboto-condensed-fontface-regular";
|
||||
@import "roboto-condensed-fontface-regular-italic";
|
||||
@import "roboto-condensed-fontface-light";
|
||||
@import "roboto-condensed-fontface-light-italic";
|
||||
@import "roboto-condensed-fontface-light-italic";
|
||||
@import "roboto-condensed-fontface-bold";
|
||||
@import "roboto-condensed-fontface-bold-italic";
|
||||
|
@ -1,12 +1,12 @@
|
||||
@import "roboto-fontface-regular";
|
||||
@import "roboto-fontface-regular-italic";
|
||||
@import "roboto-fontface-light";
|
||||
@import "roboto-fontface-light-italic";
|
||||
@import "roboto-fontface-light-italic";
|
||||
@import "roboto-fontface-thin";
|
||||
@import "roboto-fontface-thin-italic";
|
||||
@import "roboto-fontface-thin-italic";
|
||||
@import "roboto-fontface-medium";
|
||||
@import "roboto-fontface-medium-italic";
|
||||
@import "roboto-fontface-medium-italic";
|
||||
@import "roboto-fontface-bold";
|
||||
@import "roboto-fontface-bold-italic";
|
||||
@import "roboto-fontface-black";
|
||||
@import "roboto-fontface-black-italic";
|
||||
@import "roboto-fontface-black-italic";
|
||||
|
@ -164,4 +164,4 @@
|
||||
font-family: 'Roboto-BlackItalic';
|
||||
src: url('../../fonts/roboto/Roboto-BlackItalic.eot');
|
||||
src: local('Roboto BlackItalic'), local('Roboto-BlackItalic'), url('../../fonts/roboto/Roboto-BlackItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-BlackItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-BlackItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-BlackItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-BlackItalic.svg#Roboto') format('svg');
|
||||
}
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
@import "roboto-fontface-regular";
|
||||
@import "roboto-fontface-regular-italic";
|
||||
@import "roboto-fontface-light";
|
||||
@import "roboto-fontface-light-italic";
|
||||
@import "roboto-fontface-light-italic";
|
||||
@import "roboto-fontface-thin";
|
||||
@import "roboto-fontface-thin-italic";
|
||||
@import "roboto-fontface-thin-italic";
|
||||
@import "roboto-fontface-medium";
|
||||
@import "roboto-fontface-medium-italic";
|
||||
@import "roboto-fontface-medium-italic";
|
||||
@import "roboto-fontface-bold";
|
||||
@import "roboto-fontface-bold-italic";
|
||||
@import "roboto-fontface-black";
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "roboto-fontface",
|
||||
"version": "0.4.5",
|
||||
"version": "0.5.0",
|
||||
"description": "A simple package providing the Roboto fontface.",
|
||||
"main": "css/roboto/roboto-fontface.css",
|
||||
"scripts": {
|
||||
@ -25,4 +25,4 @@
|
||||
"less": "2.6.0",
|
||||
"node-sass": "3.4.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
40
test.html
40
test.html
@ -9,7 +9,7 @@
|
||||
body {
|
||||
background: #F2F2F2;
|
||||
}
|
||||
|
||||
|
||||
.test-header {
|
||||
text-align: center;
|
||||
font-family: 'Roboto-Black';
|
||||
@ -17,79 +17,79 @@
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
|
||||
.test-header h1 {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
|
||||
section {
|
||||
padding: 2% 10%;
|
||||
margin: 0 auto;
|
||||
}
|
||||
/*Roboto*/
|
||||
|
||||
|
||||
.roboto {
|
||||
font-family: 'Roboto';
|
||||
}
|
||||
|
||||
|
||||
.roboto-italic {
|
||||
font-family: 'Roboto-RegularItalic';
|
||||
}
|
||||
|
||||
|
||||
.roboto-light {
|
||||
font-family: 'Roboto-Light';
|
||||
}
|
||||
|
||||
|
||||
.roboto-light-italic {
|
||||
font-family: 'Roboto-LightItalic';
|
||||
}
|
||||
|
||||
|
||||
.roboto-bold {
|
||||
font-family: 'Roboto-Bold';
|
||||
}
|
||||
|
||||
|
||||
.roboto-bold-italic {
|
||||
font-family: 'Roboto-BoldItalic';
|
||||
}
|
||||
|
||||
|
||||
.roboto-medium {
|
||||
font-family: 'Roboto-Medium';
|
||||
}
|
||||
|
||||
|
||||
.roboto-medium-italic {
|
||||
font-family: 'Roboto-MediumItalic';
|
||||
}
|
||||
|
||||
|
||||
.roboto-thin {
|
||||
font-family: 'Roboto-Thin';
|
||||
}
|
||||
|
||||
|
||||
.roboto-thin-italic {
|
||||
font-family: 'Roboto-ThinItalic';
|
||||
}
|
||||
/*Roboto Condensed*/
|
||||
|
||||
|
||||
.roboto-condensed {
|
||||
font-family: 'Roboto-Condensed';
|
||||
}
|
||||
|
||||
|
||||
.roboto-condensed-italic {
|
||||
font-family: 'Roboto-Condensed-RegularItalic';
|
||||
}
|
||||
|
||||
|
||||
.roboto-condensed-light {
|
||||
font-family: 'Roboto-Condensed-Light';
|
||||
}
|
||||
|
||||
|
||||
.roboto-condensed-light-italic {
|
||||
font-family: 'Roboto-Condensed-LightItalic';
|
||||
}
|
||||
|
||||
|
||||
.roboto-condensed-bold {
|
||||
font-family: 'Roboto-Condensed-Bold';
|
||||
}
|
||||
|
||||
|
||||
.roboto-condensed-bold-italic {
|
||||
font-family: 'Roboto-Condensed-BoldItalic';
|
||||
}
|
||||
@ -234,4 +234,4 @@
|
||||
</body>
|
||||
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
Loading…
Reference in New Issue
Block a user