govuk_frontend_toolkit 4.3.0 → 4.4.0

data/app/assets/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 4.4.0
+
+- Add helpers partial for functions
+- Add px to em function and documentation
+
 # 4.3.0
 
 - Allow javascript error tracking to be filtered to avoid noise from plugins

data/app/assets/VERSION.txt

@@ -1 +1 @@
-4.3.0
+4.4.0

data/app/assets/docs/functions.md

@@ -0,0 +1,62 @@
+## Functions
+
+* [`_helpers.scss`](#helpers)
+
+### <a id="helpers"></a>Helpers
+
+The pixel-to-em or `pem` function returns an em value.
+
+It sets a Sass variable, $base-font-size, to 16.
+
+A value in em is defined as em = target/context.
+
+#### Usage:
+
+Here the default context is 16 ($base-font-size),
+so there is no need to use a second argument.
+
+```
+
+.govuk-title {
+  margin-top: pem(30);
+}
+
+Compiled css:
+
+.govuk-title {
+  margin-top: 1.875em;
+}
+
+```
+
+The first argument will also accept pixel units.
+
+```
+.govuk-title {
+  margin-top: pem(19px);
+}
+
+Compiled css:
+
+.govuk-title {
+  margin-top: 1.1875em;
+}
+
+```
+
+If the context changes, use the second argument.
+
+```
+.govuk-title {
+  font-size: 48px;
+}
+
+.govuk-title-child {
+  margin-top: pem(15, 48);
+}
+
+Compiled css:
+
+.govuk-title-child {
+  margin-top: 0.3125em;
+}

data/app/assets/stylesheets/_grid_layout.scss

@@ -100,12 +100,12 @@ $site-width: 960px;
 }
 
 
-// OLD depricated grid mixins
+// OLD deprecated grid mixins
 // You should migrate to the mixins above in the future
 
 // Outer block sets a max width
 @mixin outer-block {
-  @warn "The @mixin outer-block is depricated and should be updated to new grid helpers";
+  @warn "The @mixin outer-block is deprecated and should be updated to use new grid helpers";
   margin: 0 auto;
   width: auto;
   max-width: 960 + $gutter*2;
@@ -118,7 +118,7 @@ $site-width: 960px;
 // Inner block sets either margin or padding
 // to align content with header and footer
 @mixin inner-block($margin-or-padding: padding) {
-  @warn "The @mixin inner-block is depricated and should be updated to use new grid helpers";
+  @warn "The @mixin inner-block is deprecated and should be updated to use new grid helpers";
   #{$margin-or-padding}-left: $gutter-half;
   #{$margin-or-padding}-right: $gutter-half;
   @include media(tablet) {

data/app/assets/stylesheets/_helpers.scss

@@ -0,0 +1,16 @@
+// Base font size in pixels
+$base-font-size: 16;
+
+// Convert pixels to em
+@function pem($px, $base: $base-font-size) {
+
+  @if (unitless($px)) {
+    $px: $px * 1px;
+  }
+
+  @if (unitless($base)) {
+    $base: $base * 1px;
+  }
+
+  @return $px / $base * 1em;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/README.md
 - app/assets/VERSION.txt
 - app/assets/docs/analytics.md
+- app/assets/docs/functions.md
 - app/assets/docs/javascript.md
 - app/assets/docs/mixins.md
 - app/assets/images/accordian-arrow-2x.png
@@ -268,6 +269,7 @@ files:
 - app/assets/stylesheets/_device-pixels.scss
 - app/assets/stylesheets/_font_stack.scss
 - app/assets/stylesheets/_grid_layout.scss
+- app/assets/stylesheets/_helpers.scss
 - app/assets/stylesheets/_measurements.scss
 - app/assets/stylesheets/_shims.scss
 - app/assets/stylesheets/_typography.scss
@@ -291,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1001305014484830517
+      hash: -607685694881966234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -300,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1001305014484830517
+      hash: -607685694881966234
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23