forever_style_guide 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28048dbcaa8d7fa4a572210179e6fdf15b63f77f
-  data.tar.gz: e70b2d8fe9d5691c055819d4f7a54b011c15de70
+  metadata.gz: 7b1adc4d5aeb7c20c849d861d3a043b3af2b8f72
+  data.tar.gz: 21175bdea31f615adf97f00ca2838ad62c354ce0
 SHA512:
-  metadata.gz: d3605908f5bf2d2d4aaba2c2050ccd90cca545c991e8f430a5fe6a8b32041b254f83646e2405c0d1c6f1ffe743bbd002e564ed7660af71144f910fd913b62ee5
-  data.tar.gz: 53f916ce94fc2b091e6ae3f7f1b039ca9c44c0a447716133b61e7f8165846a9301e766b52eb81fa54cafcf4902a88a87ccf8a8468ca7050635823e306635f283
+  metadata.gz: 1f05cc41d3830f31e83c1ae670e6cc0e094f3e160c2f1ddedad67b3b49e510cf3db165aa9196909ea4dc8f8cf4932747e209ccef5f3e13620cbedf2aed1fd64f
+  data.tar.gz: f63158d0b97749ba66b09c923932d2b6f42abdfd66220370562e7257dbcee97136473d040acfbeea27d5aa24d9451fa4334dd58319f0c960ba89bf8c8a7cc805

data/app/assets/stylesheets/forever_style_guide/base/_typography.scss

@@ -1,5 +1,5 @@
 * {
-  font-family: 'proxima_nova-regular';
+  font-family: $font-face-regular;
 }
 
 /* Headers */

data/app/assets/stylesheets/forever_style_guide/globals/_fonts.scss

@@ -18,18 +18,24 @@
 @include fontFace('proxima_nova-semibold', 'ProximaNova-Sbold-webfont');
 @include fontFace('proxima_nova-bold', 'ProximaNova-Bold-webfont');
 @include fontFace('proxima_nova-regular_italic', 'ProximaNova-RegIt-webfont');
-@include fontFace('proxima_nova-regular_bold_italic', 'ProximaNova-BoldIt-webfont');
+@include fontFace('proxima_nova-bold_italic', 'ProximaNova-BoldIt-webfont');
 
 /* =font faces
    ---------------------------------------------------------------------------- */
-$font-face-light:           'proxima_nova-light', Helvetica, Arial, sans-serif;
-$font-face-regular:         'proxima_nova-regular', Helvetica, Arial, sans-serif;
-$font-face-semibold:        'proxima_nova-semibold', Helvetica, Arial, sans-serif;
-$font-face-bold:            'proxima_nova-bold', Helvetica, Arial, sans-serif;
-$font-face-regular_italic:  'proxima_nova-regular_italic', Helvetica, Arial, sans-serif;
-$font-face-bold_italic:     'proxima_nova-bold_italic', Helvetica, Arial, sans-serif;
+$font-face-light:           faceify('light', ('proxima_nova-light', Helvetica, Arial, sans-serif)) !default;
+$font-face-regular:         faceify('regular', ('proxima_nova-regular', Helvetica, Arial, sans-serif)) !default;
+$font-face-semibold:        faceify('semibold', ('proxima_nova-semibold', Helvetica, Arial, sans-serif)) !default;
+$font-face-bold:            faceify('bold', ('proxima_nova-bold', Helvetica, Arial, sans-serif)) !default;
+$font-face-regular_italic:  faceify('italic', ('proxima_nova-regular_italic', Helvetica, Arial, sans-serif)) !default;
+$font-face-bold_italic:     faceify('bold_italic', ('proxima_nova-bold_italic', Helvetica, Arial, sans-serif)) !default;
 
-$font-face-gotham:          'Gotham A', 'Gotham B', Helvetica, Arial, sans-serif;
+$font-face-gotham:          faceify('gotham', ('Gotham A', 'Gotham B', Helvetica, Arial, sans-serif)) !default;
+
+@each $id, $font-face in $font-faces {
+  .font-face-#{$id} {
+    font-family: #{$font-face};
+  }
+}
 
 /* =font sizes
    ---------------------------------------------------------------------------- */
@@ -44,10 +50,10 @@ $font-size-700: fontify('700', 48px) !default;
 $font-size-800: fontify('800', 64px) !default;
 
 /* !global to override bootstrap's $font-size-large and $font-size-small */
-$font-size-large: fontify('lg', $font-size-400) !global;
+$font-size-large:   fontify('lg', $font-size-400) !global;
 $font-size-default: fontify('default', $font-size-300) !default;
-$font-size-small: fontify('sm', $font-size-100) !global;
-$font-size-xsmall: fontify('xs', $font-size-000) !default;
+$font-size-small:   fontify('sm', $font-size-100) !global;
+$font-size-xsmall:  fontify('xs', $font-size-000) !default;
 
 @each $id, $font-size in $font-sizes {
   .font-size-#{$id} {
@@ -67,9 +73,9 @@ $font-weight-700: weightify('700', 700) !default;
 $font-weight-800: weightify('800', 800) !default;
 $font-weight-900: weightify('900', 900) !default;
 
-$font-weight-normal: weightify('normal', normal) !default;
-$font-weight-bold: weightify('bold', bold) !default;
-$font-weight-bolder: weightify('bolder', bolder) !default;
+$font-weight-normal:  weightify('normal', normal) !default;
+$font-weight-bold:    weightify('bold', bold) !default;
+$font-weight-bolder:  weightify('bolder', bolder) !default;
 $font-weight-lighter: weightify('lighter', lighter) !default;
 $font-weight-initial: weightify('initial', initial) !default;
 $font-weight-inherit: weightify('inherit', inherit) !default;

data/app/assets/stylesheets/forever_style_guide/modules/_modal.scss

@@ -148,4 +148,10 @@ $modal-xl-screen-lg-width: 1170px;
   @media (min-width: $screen-lg){
     width: $modal-xl-screen-lg-width;
   }
+
+  &.modal-dialog {
+    @media (min-width: $screen-md-min) {
+      margin-top: $header-height + 5; // prefer to have more vertical real estate available for large modals
+    }
+  }
 }

data/app/assets/stylesheets/forever_style_guide/utils/_font-utils.scss

@@ -1,6 +1,12 @@
+$font-faces: () !default;
 $font-sizes: () !default;
 $font-weights: () !default;
 
+@function faceify($id, $font-face) {
+  $font-faces: map-merge($font-faces, ($id: $font-face)) !global;
+  @return $font-face;
+}
+
 @function fontify($id, $font-size) {
   $font-sizes: map-merge($font-sizes, ($id: $font-size)) !global;
   @return $font-size;

data/lib/forever_style_guide/version.rb

@@ -1,3 +1,3 @@
 module ForeverStyleGuide
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forever_style_guide
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Nicholas McClay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails