manual merge to use text-based header on print pages

alphagov · Jan 31, 2014 · 5099cc9 · 5099cc9
2 parents 7628c9e + fcbd985
commit 5099cc9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,7 @@ end
 gem 'plek', '1.7.0'
 gem 'jasmine', '1.1.2'
 
-gem 'govuk_frontend_toolkit', '0.36.0'
+gem 'govuk_frontend_toolkit', '0.39.0'
 if ENV['GOVUK_TEMPLATE_DEV']
   gem 'govuk_template', :path => "../govuk_template"
 else

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -59,7 +59,7 @@ GEM
       null_logger
       plek
       rest-client (~> 1.6.3)
-    govuk_frontend_toolkit (0.36.0)
+    govuk_frontend_toolkit (0.39.0)
       rails (>= 3.1.0)
       sass (>= 3.2.0)
     govuk_template (0.4.0)
@@ -180,7 +180,7 @@ DEPENDENCIES
   capybara (= 2.1.0)
   exception_notification
   gds-api-adapters (= 7.18.0)
-  govuk_frontend_toolkit (= 0.36.0)
+  govuk_frontend_toolkit (= 0.39.0)
   govuk_template (= 0.4.0)
   jasmine (= 1.1.2)
   logstasher (= 0.4.1)

diff --git a/app/assets/stylesheets/core-print.scss b/app/assets/stylesheets/core-print.scss
@@ -1,5 +1,20 @@
 /* Global print stylesheet */
 
+#logo {
+  @include core-48;
+  font-size: 28pt;
+  font-weight: bold;
+  text-rendering: optimizeLegibility;
+
+  img {
+    width: 46px;
+    height: 40px;
+    padding-right: 6px;
+    display: block;
+    float: left;
+  }
+}
+
 main > header {
   position: relative;
 

diff --git a/app/views/root/print.html.erb b/app/views/root/print.html.erb
@@ -2,12 +2,15 @@
 <html lang="en">
 <head>
   <meta charset="utf-8" />
+  <meta name="robots" content="noindex, nofollow">
 
   <%= stylesheet_link_tag 'guides-print', media: 'all' %>
 </head>
 <body>
   <header role="banner" class="group" id="global-header">
-    <div id="logo"><img src="<%= asset_path 'gov.uk_logotype-2x.png' %>" alt="GOV.UK"></div>
+    <div id="logo">
+      <img src="<%= asset_path 'gov.uk_logotype_crown_invert.png' %>" alt=""> GOV.UK
+    </div>
   </header>
 
   <div id="wrapper">