Merge pull request #882 from alphagov/fix-ordered-list-print-styles

Improve print styles
alphagov · Jan 24, 2017 · 2391f1d · 2391f1d
2 parents b4a15d6 + b2ee803
commit 2391f1d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 228 deletions.
diff --git a/app/assets/stylesheets/govuk-component/_component-print.scss b/app/assets/stylesheets/govuk-component/_component-print.scss
@@ -2,6 +2,7 @@
 
 // Components styles
 @import "govspeak-print";
+@import "govspeak-html-publication-print";
 @import "metadata-print";
 @import "related-items-print";
 @import "title-print";
diff --git a/app/assets/stylesheets/govuk-component/_govspeak-html-publication-print.scss b/app/assets/stylesheets/govuk-component/_govspeak-html-publication-print.scss
@@ -0,0 +1,5 @@
+.govuk-govspeak-html-publication {
+  .sticky-element {
+    display: none;
+  }
+}
diff --git a/app/assets/stylesheets/govuk-component/_govspeak-print.scss b/app/assets/stylesheets/govuk-component/_govspeak-print.scss
@@ -45,4 +45,7 @@
     }
   }
 
+  .footnotes {
+    border-top: 1px solid $text-colour;
+  }
 }
diff --git a/app/assets/stylesheets/guides-print.scss b/app/assets/stylesheets/guides-print.scss
@@ -8,11 +8,8 @@ $is-print: true;
 
 // govuk_frontend_toolkit includes
 @import "colours";
-@import "measurements.scss";
-
-@import "styleguide/print";
-@import "styleguide/font-stacks";
-@import "styleguide/typography";
+@import "measurements";
+@import "typography";
 
 // OUTPUT
 // The following files and inline CSS will form the output of print.css

diff --git a/app/assets/stylesheets/helpers/_core-print.scss b/app/assets/stylesheets/helpers/_core-print.scss
@@ -7,7 +7,7 @@ main > header {
   position: relative;
 
   h1 {
-    @include core-24;
+    @include bold-24;
     border-bottom: solid 1pt black;
     padding-bottom: 6pt;
     width: 80%;
@@ -36,7 +36,7 @@ article {
   }
 
   header h1 {
-    @include core-19;
+    @include bold-19;
     border-bottom: 1pt solid $border-colour;
     padding-top: 7pt;
     padding-bottom: 7pt;

diff --git a/app/assets/stylesheets/helpers/_print-base.scss b/app/assets/stylesheets/helpers/_print-base.scss
@@ -34,16 +34,16 @@ h4 {
 }
 
 h2 {
-  @include core-19;
+  @include bold-19;
   padding-top: 7pt;
 }
 
 h3 {
-  @include core-16;
+  @include bold-16;
 }
 
 h4 {
-  @include core-14;
+  @include bold-14;
 }
 
 p {
@@ -54,9 +54,16 @@ ul,
 ol {
   @include core-14;
   padding-left: 13pt;
+}
+
+ul {
   list-style: disc;
 }
 
+ol {
+  list-style: decimal;
+}
+
 li {
   line-height: 1.5;
   p {

diff --git a/app/assets/stylesheets/styleguide/_typography.scss b/app/assets/stylesheets/styleguide/_typography.scss
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,4 +45,7 @@ @@
         }
       }
+      .footnotes {
+        border-top: 1px solid $text-colour;
+      }
     }