govuk_admin_template 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.1
+
+* Fix rendering of media queries in <= IE8
+* Add short date and time formats
+
 # 1.0.0
 
 * Create padding and margin mixins, remove silent classes

data/README.md

@@ -11,11 +11,19 @@ This gem provides (via a Rails engine):
 * [CSS helpers and SASS variables](CSS.md) for the admin theme
 * GOV.UK user friendly date formats
 
+[Apps using this gem](https://github.com/search?q=govuk_admin_template+path%3AGemfile&type=Code&ref=advsearch&l=) include:
+* [Transition](https://github.com/alphagov/transition)
+* [Maslow](https://github.com/alphagov/maslow)
+* [Support](https://github.com/alphagov/support)
+* [Travel advice publisher](https://github.com/alphagov/travel-advice-publisher)
+* [Specialist publisher](https://github.com/alphagov/specialist-publisher)
+* [Search admin](https://github.com/alphagov/search-admin)
+
 ## Usage
 
 Firstly, include the gem in your Gemfile, pinned to the appropriate version and run ```bundle```:
 ```ruby
-gem 'govuk-admin-template', '0.0.1'
+gem 'govuk_admin_template', '1.0.0'
 ```
 
 At the top of `application.scss` include the styles (this provides all the mixins and variables from the gem as well as from bootstrap — [bootstrap mixins](https://github.com/twbs/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/_mixins.scss)):
@@ -80,7 +88,7 @@ Example navbar_items:
 
 ### Date formats
 
-The [gem includes](lib/govuk_admin_template/engine.rb) `:govuk_date` date and time formats which match the [recommended style](https://www.gov.uk/design-principles/style-guide/style-points#style-dates-and-times).
+The [gem includes](lib/govuk_admin_template/engine.rb) date and time formats which match the [recommended style](https://www.gov.uk/design-principles/style-guide/style-points#style-dates-and-times).
 
 ```ruby
 # 1 January 2013
@@ -88,6 +96,15 @@ date.to_s(:govuk_date)
 
 # 1:15pm, 1 January 2013
 time.to_s(:govuk_date)
+
+# 1 Jan 2013
+date.to_s(:govuk_date_short)
+
+# 1:15pm, 1 Jan 2013
+time.to_s(:govuk_date_short)
+
+# 1:15pm
+time.to_s(:govuk_time)
 ```
 
 ### Environment indicators

data/app/views/govuk_admin_template/style_guide/index.html.erb

@@ -54,7 +54,7 @@
 <h2>Dates</h2>
 <div class="row">
   <p class="col-md-6 lead">
-    The gem includes <code>:govuk_date</code> date and time formats which match the <a href="https://www.gov.uk/design-principles/style-guide/style-points#style-dates-and-times">recommended style</a>.
+    The gem includes date and time formats which match the <a href="https://www.gov.uk/design-principles/style-guide/style-points#style-dates-and-times">recommended style</a>.
   </p>
   <section class="col-md-6">
     <h2 class="remove-top-margin">Default</h2>
@@ -64,8 +64,17 @@
     </blockquote>
 
     <h2>Friendly</h2>
-    <blockquote><%= halloween.to_s(:govuk_date) %><br />
-      <%= halloween.to_time.to_s(:govuk_date) %>
+    <blockquote>
+      <dl class="remove-bottom-margin">
+        <dt class="add-label-margin"><code>:govuk_date</code></dt>
+        <dd><%= halloween.to_s(:govuk_date) %><br />
+          <%= halloween.to_time.to_s(:govuk_date) %></dd>
+        <dt class="add-top-margin add-label-margin"><code>:govuk_date_short</code></dt>
+        <dd><%= halloween.to_s(:govuk_date_short) %><br />
+          <%= halloween.to_time.to_s(:govuk_date_short) %></dd>
+        <dt class="add-top-margin add-label-margin"><code>:govuk_time</code></dt>
+        <dd><%= halloween.to_time.to_s(:govuk_time) %></dd>
+      </dl>
     </blockquote>
   </section>
 </div>

data/app/views/layouts/govuk_admin_template.html.erb

@@ -11,10 +11,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script>(function(d){d.className=d.className.replace(/^no-js\b/,'js');}(document.documentElement));</script>
-    <% # HTML5 and bootstrap shims, for <= IE8 support of HTML5 elements %>
-    <!--[if lte IE 8]>
-      <%= javascript_include_tag "lte-ie8" %>
-    <![endif]-->
     <% # jQuery and Bootstrap %>
     <%= javascript_include_tag "govuk-admin-template" %>
     <% if content_for?(:favicon) %>
@@ -25,6 +21,14 @@
       %>
     <% end %>
     <%= yield :head %>
+    <%
+      # HTML5 and bootstrap shims, for <= IE8 support of HTML5 elements
+      # respond.js must come after CSS (from :head) and media queries so
+      # that rules and styles can be correctly calculated.
+    %>
+    <!--[if lte IE 8]>
+      <%= javascript_include_tag "lte-ie8" %>
+    <![endif]-->
   </head>
   <body<% if environment_style %> class="environment-<%= environment_style %>"<% end %>>
     <header class="

data/lib/govuk_admin_template/engine.rb

@@ -13,8 +13,17 @@ module GovukAdminTemplate
       # 1 January 2013
       Date::DATE_FORMATS[:govuk_date] = '%-e %B %Y'
 
+      # 1 Jan 2013
+      Date::DATE_FORMATS[:govuk_date_short] = '%-e %b %Y'
+
       # 1:15pm, 1 January 2013
       Time::DATE_FORMATS[:govuk_date] = '%-I:%M%P, %-e %B %Y'
+
+      # 1:15pm, 1 Jan 2013
+      Time::DATE_FORMATS[:govuk_date_short] = '%-I:%M%P, %-e %b %Y'
+
+      # 1:15pm
+      Time::DATE_FORMATS[:govuk_time] = '%-I:%M%P'
     end
   end
 end

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3974653869644842015
+      hash: 3493522119861089579
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3974653869644842015
+      hash: 3493522119861089579
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23