piecss 0.1.6.2 → 0.1.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c64ea9e1c010a19b7869d8edcde69140a778b109
4
- data.tar.gz: 59f6540b170ed197dea325a055d6d98ffcfac158
3
+ metadata.gz: c7d9da6dff55c521f1827264ddfe311c416ce2fc
4
+ data.tar.gz: 87183d8ec305214171fc283347facb23cfb66ed5
5
5
  SHA512:
6
- metadata.gz: dc551e91d874c8da5a13099f252bf2a46e92602f5fe5ee41649adc4f9e318ebccc73d4a0b810dbe8142acc0eadbda8ce48d3a7ca7d913865ff37b1a12507f8bb
7
- data.tar.gz: 6132f47fc1c7d76454321bb66cf4031ccb6cfb1d46f670753e37899e844ec6cb07592f24e2ace33329794beef7a9b8a5992aed55a9cdba1ad2bef506aa40d56a
6
+ metadata.gz: 58416f3d1429f58d5089cbb7965702cfd4f2b2d3b977b8c69204df19a38a14a2c7cdf034b0101693ff2be58cf6483944fe38a81d3a27ea52838a34fb3ffd268c
7
+ data.tar.gz: f0deb73c7872bc8edd5d2c2f8af96c5640ad6de5d0e5f6cb74ec55045f6e5d8874e9c97226df0a7897bf1b56b0629dabb61c71b14118a44c35d7f6b50ee1cfdc
@@ -21,6 +21,7 @@
21
21
  @import "fonts/raleway";
22
22
  @import "fonts/righteous";
23
23
  @import "fonts/roboto";
24
+ @import "fonts/roboto-slab";
24
25
  @import "fonts/varela-round";
25
26
 
26
27
 
@@ -0,0 +1,37 @@
1
+ // Copyright (C) 2014 Babs Gösgens. Licensed under MIT; see LICENSE.txt
2
+
3
+
4
+ // Weight reference:
5
+ // 100 ultra-light
6
+ // 200 light
7
+ // 300 book
8
+ // 400 regular, or normal
9
+ // 500 medium
10
+ // 600 semi-bold
11
+ // 700 bold
12
+ // 800 extra-bold
13
+ // 900 heavy, or ultra-bold
14
+
15
+
16
+ // Roboto
17
+ // Available styles on Google Fonts: 100,300,400,700
18
+ $roboto-slab-fontface: "Roboto Slab";
19
+ $roboto-slab-fallback: sans-serif;
20
+ $roboto-slab-family: ($roboto-slab-fontface, $roboto-slab-fallback);
21
+
22
+ // style, variant, weight, family
23
+ $roboto-slab-ultra-light: normal normal 100 $roboto-slab-family;
24
+ $roboto-slab-ultra-light-italic: normal normal 100 $roboto-slab-family;
25
+ $roboto-slab-book: normal normal 300 $roboto-slab-family;
26
+ $roboto-slab-book-italic: normal normal 300 $roboto-slab-family;
27
+ $roboto-slab-regular: normal normal 400 $roboto-slab-family;
28
+ $roboto-slab-regular-italic: normal normal 400 $roboto-slab-family;
29
+ $roboto-slab-medium: normal normal 400 $roboto-slab-family;
30
+ $roboto-slab-medium-italic: normal normal 400 $roboto-slab-family;
31
+ $roboto-slab-bold: normal normal 700 $roboto-slab-family;
32
+ $roboto-slab-bold-italic: normal normal 700 $roboto-slab-family;
33
+ $roboto-slab-heavy: normal normal 700 $roboto-slab-family;
34
+ $roboto-slab-heavy-italic: normal normal 700 $roboto-slab-family;
35
+
36
+ $roboto-slab-thin: $roboto-slab-ultra-light;
37
+ $roboto-slab-light: $roboto-slab-book;
@@ -32,3 +32,4 @@
32
32
  $roboto-bold-italic : italic normal 700 $roboto-family;
33
33
  $roboto-heavy : normal normal 900 $roboto-family;
34
34
  $roboto-heavy-italic : italic normal 900 $roboto-family;
35
+
@@ -177,22 +177,46 @@
177
177
 
178
178
  // font: font-style font-variant font-weight font-size/line-height font-family;
179
179
 
180
- @mixin font($type, $font-size:$default-font-size, $line-height:$default-line-height)
180
+ @mixin font($arguments...)
181
181
  {
182
- @if unit($unit)==rem {
183
- @include font-size($font-size, 1px);
182
+ $type: null;
183
+ $font-size: null;
184
+ $line-height: null;
185
+
186
+ @each $argument in $arguments {
187
+
188
+ @if type-of($argument)==list {
189
+ $type: $argument;
190
+ } @else {
191
+ @if not($font-size) {
192
+ $font-size: $argument;
193
+ } @elseif not($line-height) {
194
+ $line-height: $argument;
195
+ }
196
+ }
184
197
  }
185
198
 
186
- @if $type {
187
- $font-style : extract-type-style($type);
188
- $font-variant : extract-type-variant($type);
189
- $font-weight : extract-type-weight($type);
190
- $font-family : extract-type-family($type);
199
+ @if not(not($type)) {
191
200
 
192
- font: #{$font-style} #{$font-variant} #{$font-weight} #{$font-size}/#{$line-height} #{$font-family};
193
- }
194
- @else {
195
- font: #{$font-size}/#{$line-height};
201
+ $font-style: extract-type-style($type);
202
+ $font-variant: extract-type-variant($type);
203
+ $font-weight: extract-type-weight($type);
204
+ $font-family: extract-type-family($type);
205
+
206
+ @if $font-size and unit($unit)==rem {
207
+ @include font-size($font-size, 1px);
208
+ }
209
+
210
+ // Build font arguments
211
+ $font: #{$font-style} #{$font-variant} #{$font-weight};
212
+ @if $font-size and $line-height {
213
+ $font: append($font, #{$font-size}/#{$line-height});
214
+ } @elseif $font-size {
215
+ $font: append($font, #{$font-size});
216
+ }
217
+ $font: append($font, #{$font-family});
218
+
219
+ font: #{$font};
196
220
  }
197
221
  }
198
222
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: piecss
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6.2
4
+ version: 0.1.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Babs Gosgens
@@ -70,6 +70,7 @@ files:
70
70
  - sass/piecss/settings/fonts/_pt-sans.scss
71
71
  - sass/piecss/settings/fonts/_raleway.scss
72
72
  - sass/piecss/settings/fonts/_righteous.scss
73
+ - sass/piecss/settings/fonts/_roboto-slab.scss
73
74
  - sass/piecss/settings/fonts/_roboto.scss
74
75
  - sass/piecss/settings/fonts/_sans-serif.scss
75
76
  - sass/piecss/settings/fonts/_serif.scss