Merge pull request #636 from alphagov/print-style-review

Print style review

Gemfile

@@ -36,6 +36,6 @@ gem 'govuk_frontend_toolkit', '~> 4.2.1'
 if ENV['GOVUK_TEMPLATE_DEV']
   gem 'govuk_template', :path => "../govuk_template"
 else
-  gem 'govuk_template', '0.13.0'
+  gem 'govuk_template', '0.14.2'
 end
 gem 'gds-api-adapters', '20.1.1'

Gemfile.lock

@@ -61,7 +61,7 @@ GEM
     govuk_frontend_toolkit (4.2.1)
       rails (>= 3.1.0)
       sass (>= 3.2.0)
-    govuk_template (0.13.0)
+    govuk_template (0.14.2)
       rails (>= 3.1)
     hike (1.2.3)
     http-cookie (1.0.2)
@@ -187,7 +187,7 @@ DEPENDENCIES
   exception_notification
   gds-api-adapters (= 20.1.1)
   govuk_frontend_toolkit (~> 4.2.1)
-  govuk_template (= 0.13.0)
+  govuk_template (= 0.14.2)
   image_optim (= 0.17.1)
   jasmine-rails (~> 0.10.6)
   logstasher (= 0.4.8)

app/assets/stylesheets/guides-print.scss

@@ -7,6 +7,7 @@
 $is-print: true;
 
 // govuk_frontend_toolkit includes
+@import "colours";
 @import "measurements.scss";
 
 @import "styleguide/print";

app/assets/stylesheets/helpers/_core-print.scss

@@ -65,8 +65,8 @@ article {
   h4,
   p,
   ul {
-      orphans: 3;
-      widows: 3;
+    orphans: 3;
+    widows: 3;
   }
 
   h2,
@@ -78,7 +78,7 @@ article {
 
   header h1 {
     @include core-19;
-    border-bottom: 1pt solid rgb(127,127,127);
+    border-bottom: 1pt solid $border-colour;
     padding-top: 7pt;
     padding-bottom: 7pt;
   }
@@ -104,8 +104,7 @@ article {
   ol {
     @include core-14;
     padding-left: 13pt;
-    list-style-image: none;
-    list-style-type: disc;
+    list-style: disc;
   }
 
   li {
@@ -117,22 +116,23 @@ article {
   }
 
   table {
-    border: 1pt solid rgb(125,125,125);
+    border: 1pt solid $border-colour;
     border-collapse: collapse;
     width: 100%;
+    margin: $gutter-half 0;
 
     thead {
       display: table-header-group;
     }
 
     th,
     td {
-      border: 1pt solid rgb(125,125,125);
+      border: 1pt solid $border-colour;
       padding: 0.25em 0.5em;
       text-align: left;
     }
 
-    td:nth-child(n+2) {
+    td:first-child ~ td {
       text-align: right;
     }
 
@@ -149,7 +149,7 @@ article {
   .contact,
   .info-notice,
   .help-notice {
-    border: 1pt solid rgb(125,125,125);
+    border: 1pt solid $border-colour;
     padding: 2pt;
     margin: 14pt 0;
   }
@@ -182,12 +182,6 @@ article {
   }
 }
 
-.print-link,
-.player-container,
-.video-transcript-toggle {
-  display: none;
-}
-
 .modified-date {
   color: rgb(225,225,225);
   @include core-14;
@@ -198,36 +192,16 @@ article {
   }
 }
 
-#global-header {
-  #search, .search-toggle {
-    display: none;
-  }
-}
-
-#global-breadcrumb {
-  display: none;
-}
-
-.done-questions {
-  .start-again {
-    display: none;
-  }
-
-  .question-number {
-    display: none;
-  }
-
-  li.done .undo {
-    display: none;
-  }
-}
-
 /* hide the unnecessary page elements */
 .dont-print,
+#global-header #search,
+#global-header .search-toggle,
+#global-breadcrumb,
 body #global-user-location,
 body .related-positioning,
 header.page-header div h1 span,
 header nav,
+.header-proposition,
 body .actions,
 #local-locator-form,
 #location-loading,
@@ -236,10 +210,17 @@ body .actions,
 .found_location,
 .loading_location,
 .location_error,
+.done-questions .start-again,
+.done-questions .question-number,
+.done-questions li.done .undo,
+.print-link,
+.player-container,
+.video-transcript-toggle
 #global-browser-prompt,
 #user-satisfaction-survey,
 .report-a-problem-toggle,
 .report-a-problem-container,
-.show-all-parts {
+.show-all-parts,
+.return-to-top {
   display: none !important;
 }

app/assets/stylesheets/print.scss

@@ -7,6 +7,7 @@
 $is-print: true;
 
 // govuk_frontend_toolkit includes
+@import "colours";
 @import "typography";
 @import "measurements.scss";