Added modified version of @davidnormo's original font-face PR, release

version 1.0.12
This commit is contained in:
Nick Pack 2014-03-09 21:02:54 +00:00
parent 96ca214f5e
commit 6a54058b6b
7 changed files with 31 additions and 3 deletions

View File

@ -1,4 +1,4 @@
Ribs v1.0.11 Ribs v1.0.12
============= =============
> Ribs is the evolution of Skeleton, the original author seems to have disappeared and/or lost interest in the project, and my colleagues and I use this an awful lot. > Ribs is the evolution of Skeleton, the original author seems to have disappeared and/or lost interest in the project, and my colleagues and I use this an awful lot.
@ -50,6 +50,7 @@ Then following that, from the root dir of this project, run `npm install` which
You should be good to go. You should be good to go.
## Changelog ## Changelog
* Mar 9, 2014 - (v1.0.12) Added modified version of @davidnormo's font-face mixin PR
* Oct 17, 2013 - (v1.0.11) Renamed component.json to bower.json due to deprecation * Oct 17, 2013 - (v1.0.11) Renamed component.json to bower.json due to deprecation
* Oct 15, 2013 - (v1.0.10) Resolved some issues with the grid system (Switched to margins for push/pull and removed tablet specific alpha and omega classes), Added a couple of example files. * Oct 15, 2013 - (v1.0.10) Resolved some issues with the grid system (Switched to margins for push/pull and removed tablet specific alpha and omega classes), Added a couple of example files.
* Oct 15, 2013 - (v1.0.9) Default flag added to variables - Thanks to Ivo Bathke (@ivoba) * Oct 15, 2013 - (v1.0.9) Default flag added to variables - Thanks to Ivo Bathke (@ivoba)

View File

@ -1,6 +1,6 @@
{ {
"name": "Ribs", "name": "Ribs",
"version": "1.0.11", "version": "1.0.12",
"main": "build/css/Ribs.css", "main": "build/css/Ribs.css",
"ignore": [ "ignore": [
"**/.*", "**/.*",

View File

@ -347,6 +347,10 @@ table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; } border-spacing: 0; }
/*
EXAMPLE - Declare Open Sans font-face (Remember to add the font files to $font_path)
@include declare-font-face("Open Sans", "opensans-regular-webfont");
*/
body { body {
background: #fff; background: #fff;
font: 14px/21px "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; font: 14px/21px "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;

View File

@ -2,7 +2,7 @@
"name": "Ribs", "name": "Ribs",
"title": "Ribs", "title": "Ribs",
"description": "The evolution of Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.", "description": "The evolution of Skeleton: A Beautiful Boilerplate for Responsive, Mobile-Friendly Development.",
"version": "1.0.11", "version": "1.0.12",
"homepage": "https://github.com/nickpack/Ribs", "homepage": "https://github.com/nickpack/Ribs",
"author": { "author": {
"name": "Nick Pack", "name": "Nick Pack",

View File

@ -13,6 +13,11 @@
@import "normalize/_normalize"; @import "normalize/_normalize";
@import "_mixins"; @import "_mixins";
/*
EXAMPLE - Declare Open Sans font-face (Remember to add the font files to $font_path)
@include declare-font-face("Open Sans", "opensans-regular-webfont");
*/
// #General body style // #General body style
body { body {
background: #fff; background: #fff;

View File

@ -212,3 +212,19 @@
display: none !important; display: none !important;
visibility: hidden; visibility: hidden;
} }
// @see http://pivotallabs.com/bulletproof-font-face-syntax-with-sass/
// @see http://www.fontspring.com/blog/the-new-bulletproof-font-face-syntax
@mixin declare-font-face($font_family, $font_filename, $font_weight : normal, $font_style :normal, $font_stretch : normal, $font_path: $font_path) {
@font-face {
font-family: '#{$font_family}';
src: url('#{$font_path}#{$font_filename}.eot?#iefix') format('embedded-opentype'),
url('#{$font_path}#{$font_filename}.woff') format('woff'),
url('#{$font_path}#{$font_filename}.ttf') format('truetype'),
url('#{$font_path}#{$font_filename}.svg##{$font_family}') format('svg');
font-weight: $font-weight;
font-style: $font-style;
font-stretch: $font-stretch;
}
}

View File

@ -123,6 +123,8 @@ $paragraph_lead_line_height: $paragraph_lead_font_size * 1.5 !default;
$paragraph_lead_colour: #777 !default; $paragraph_lead_colour: #777 !default;
// #General Text // #General Text
$font_path: "../fonts/";
$em_font_style: italic !default; $em_font_style: italic !default;
$small_font_size: 80% !default; $small_font_size: 80% !default;