govuk_tech_docs 1.9.0.pre.rc2 → 2.0.0.pre.test.pre.release.pre.524

data/lib/assets/stylesheets/modules/_page-review.scss

@@ -1,13 +1,14 @@
 .page-expiry--not-expired,
 .page-expiry--default {
-  padding: $gutter-half;
-  margin-top: $gutter;
-  margin-bottom: $gutter;
-  background-color: $govuk-blue;
-  color: $page-colour;
+  @include govuk-font($size: 19);
+  padding: govuk-spacing(3);
+  margin-top: govuk-spacing(6);
+  margin-bottom: govuk-spacing(6);
+  background-color: $govuk-brand-colour;
+  color: govuk-colour("white");
 
-  @include media(tablet) {
-    padding: $gutter;
+  @include govuk-media-query(tablet) {
+    padding: govuk-spacing(6);
   }
 
   a:link,
@@ -16,20 +17,20 @@
   }
 
   a:hover {
-    color: $link-hover-colour;
+    color: $govuk-link-hover-colour;
   }
 
   a:active {
-    color: $link-active-colour;
+    color: $govuk-link-active-colour;
   }
 }
 
 .page-expiry--expired {
   display: none;
 
-  padding: $gutter-half;
-  margin-top: $gutter * 2;
-  background-color: $error-background;
-  border: 1px solid $error-colour;
-  color: $error-colour;
+  padding: govuk-spacing(3);
+  margin-top: govuk-spacing(9);
+  border: govuk-spacing(1) solid $govuk-error-colour;
+  background-color: govuk-colour("white");
+  color: $govuk-text-colour;
 }

data/lib/assets/stylesheets/modules/_search.scss

@@ -1,33 +1,15 @@
-@include screen {
+@include govuk-media-query($media-type: screen) {
   .page-title + .search {
-    margin-top: $gutter;
+    margin-top: govuk-spacing(6);
   }
 
-  .search {
-    @include core-16;
-    margin-bottom: $gutter-half;
-    height: 40px;
-    .search__label {
-      position: absolute;
-      left: -9999em;
-      top: auto;
-      width: 1px;
-      height: 1px;
-      overflow: hidden;
-    }
-    .form-control {
-      @include box-sizing(border-box);
-      @include core-19;
-      width: 100%;
-      padding: 5px 4px 2px;
-      border: 2px solid $text-colour;
-      appearance: none;
-
-      &:focus {
-        outline: 3px solid $focus-colour;
-        outline-offset: 0;
-      }
-    }
+  .js .search__label {
+    position: absolute;
+    left: -9999em;
+    top: auto;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
   }
 }
 
@@ -60,22 +42,39 @@ html.has-search-results-open {
     overflow-x: scroll;
     -webkit-overflow-scrolling: touch;
     -ms-overflow-style: none;
-    @include media(tablet) {
+    @include govuk-media-query(tablet) {
       padding: 22px 20px 0 30px;
       top: 0;
       // The width of the sidebar
       left: 330px;
     }
+
+    a:link, a:visited {
+      text-decoration: none;
+      color: $govuk-link-colour;
+    }
+
+    a:hover {
+      text-decoration: underline;
+
+      &:focus {
+        text-decoration: none;
+      }
+    }
+    a:focus {
+      outline: none;
+      @include govuk-focused-text;
+    }
   }
 .search-results__inner {
   position: relative;
-  background: $white;
-  border-top: 1px solid $grey-2;
+  background: govuk-colour("white");
+  border-top: 1px solid govuk-colour("mid-grey");
   max-width: 40rem;
   padding: 15px;
-  @include media(tablet) {
+  @include govuk-media-query(tablet) {
     padding: 15px 200px 50px 40px;
-    border: 1px solid $grey-2;
+    border: 1px solid govuk-colour("mid-grey");
     &::after {
       content: '';
       position: absolute;
@@ -83,28 +82,40 @@ html.has-search-results-open {
       left: -9px;
       width: 10px;
       height: 20px;
-      background: no-repeat file-url('search-result-caret.svg') center right;
+      background: no-repeat url('/images/search-result-caret.svg') center right;
       background-size: contain;
     }
   }
 }
 .search-results__title {
-  @include bold-27;
-  margin-bottom: $gutter;
+  @include govuk-font($size: 27, $weight: bold);
+  margin-bottom: govuk-spacing(6);
 }
 .search-results__close {
-  @include core-16;
+  @include govuk-font($size: 16);
   position: absolute;
   top: 18px;
   right: 20px;
   appearance: none;
+  -webkit-appearance: none;
   background: none;
   border: 0;
   padding: 0;
+  cursor: pointer;
+
   &:focus {
-    outline: 3px solid $focus-colour;;
-    outline-offset: 0;
+    background-color: $govuk-focus-colour;
+    outline: $govuk-focus-width solid transparent;
+    box-shadow: inset 0 0 0 1px $govuk-focus-colour;
   }
+
+  &:focus:not(:active):not(:hover) {
+    border-color: $govuk-focus-colour;
+    color: $govuk-focus-text-colour;
+    background-color: $govuk-focus-colour;
+    box-shadow: 0 2px 0 $govuk-focus-text-colour;
+  }
+
   &::after {
     content: '';
     display: inline-block;
@@ -112,9 +123,9 @@ html.has-search-results-open {
     padding-left: 8px;
     height: 18px;
     width: 18px;
-    background: no-repeat file-url('govuk-icn-close.png') center right;
-    @include device-pixel-ratio {
-      background-image: file-url('govuk-icn-close@2x.png');
+    background: no-repeat url('/images/govuk-icn-close.png') center right;
+    @include govuk-device-pixel-ratio {
+      background-image: url('/images/govuk-icn-close@2x.png');
     }
     background-size: contain;
   }
@@ -128,7 +139,7 @@ html.has-search-results-open {
   overflow: hidden;
 }
 .search-result {
-  margin-bottom: $gutter;
+  margin-bottom: govuk-spacing(6);
 }
 .search-result mark {
   background-color: transparent;

data/lib/assets/stylesheets/modules/_technical-documentation.scss

@@ -1,137 +1,116 @@
-// Adds combination of margin and padding to headings to make them appear
-// correctly when they're linked to as anchors, and scale them on mobile
-// TODO: Headings are hidden underneath the sticky 'table of contents' on mobile
-// when following a link to them
-
-@mixin heading-offset($tabletTopMargin) {
-  // Scale margins with font size on mobile (16/19ths)
-  $mobileTopMargin: ceil($tabletTopMargin * (16 / 19));
-
-  padding-top: min($mobileTopMargin, $gutter-half);
-  margin-top: max(0, $mobileTopMargin - $gutter-half);
-
-  @include media(tablet) {
-    padding-top: min($tabletTopMargin, $gutter);
-    margin-top: max(0, $tabletTopMargin - $gutter);
-  }
-}
-
 .technical-documentation {
+  @include govuk-font($size: 19);
   // Required for IE11 to render <main> correctly
   display: block;
-  margin: 0 $gutter-half 10px;
+  margin: govuk-spacing(3);
+  font-size: 19px;
   max-width: 40em;
 
   line-height: 1.4;
 
-  color: $text-colour;
+  color:  $govuk-text-colour;
 
-  @include media(tablet) {
+  @include govuk-media-query(tablet) {
     // We add 2 pixels to the gutter here to ensure there's sufficient spacing between
     // an anchor link (see _anchored-heading.scss) on a heading and the left-hand pane.
-    margin: 0 ($gutter + 2px) $gutter;
+    margin: 0 govuk-spacing(6) (govuk-spacing(6) + 2px);
   }
 
   .has-search-results-open & {
     visibility: hidden;
   }
 
-  // Headings
-  h1 {
-    @include bold-48;
-    @include heading-offset($gutter * 2);
-    border-top: 5px solid $text-colour;
+  > h1 {
+    @extend %govuk-heading-xl;
 
     &:first-of-type {
-      @include heading-offset($gutter);
-      border-top: none;
+      padding-top: govuk-spacing(6);
     }
   }
 
-  h2 {
-    @include bold-36;
-    @include heading-offset($gutter * 1.5);
+  > h2 {
+    @extend %govuk-heading-l;
+    padding-top: govuk-spacing(6);
+    margin-top: govuk-spacing(3);
   }
 
-  h3, h4, h5, h6 {
-    @include heading-offset($gutter);
+  > h3 {
+    @extend %govuk-heading-m;
   }
 
-  h3 {
-    @include bold-24;
+  > h4 {
+    @extend %govuk-heading-s;
   }
 
-  h4 {
-    @include bold-19;
+  > p {
+    @extend %govuk-body-m;
   }
 
-  h5 {
-    @include bold-19;
-    color: $secondary-text-colour;
+  > strong,
+  > b {
+    @include govuk-typography-weight-bold;
   }
 
-  h6 {
-    @include core-19;
-    color: $secondary-text-colour;
+  > ul,
+  > ol {
+    @extend %govuk-list;
   }
 
-  // Expand margin when h1 followed directly by paragraph
-  h1 + p {
-    @include media(tablet) {
-      margin-top: $gutter * 1.5;
-    }
+  > ol {
+    @extend %govuk-list--number;
   }
 
-  // Tighten up margins where headings follow each other
-  h1 + h2 {
-    @include heading-offset($gutter);
+  > ul {
+    @extend %govuk-list--bullet;
   }
 
-  h2 + h3, h3 + h4, h4 + h5, h5 + h6 {
-    @include heading-offset(20px);
+  a {
+    @extend %govuk-link;
   }
 
-  p {
-    margin-top: ceil($gutter-half * (16 / 19));
-    margin-bottom: 0;
+  > a {
+    @extend %govuk-body-m;
+  }
 
-    @include media(tablet) {
-      margin-top: $gutter-half;
-    }
+  hr {
+    @extend %govuk-section-break;
+    @extend %govuk-section-break--visible;
+    @extend %govuk-section-break--xl;
   }
 
-  img {
-    max-width: 100%;
-    width: auto;
-    height: auto;
+  table {
+    @include govuk-responsive-margin(6, "bottom");
   }
 
-  ol, ul {
-    margin: $gutter-half 0 0;
-    padding-left: 20px;
+  pre + h2 {
+    padding-top: govuk-spacing(4);
   }
 
-  ol ol, ul ul, ol ul, ul ol {
-    margin-top: 0;
+  pre + h3,
+  pre + h4 {
+    padding-top: govuk-spacing(2);
   }
 
-  li {
-    margin-top: 5px;
+  img {
+    max-width: 100%;
+    width: auto;
+    height: auto;
   }
 
   ol + p, ul + p, .table-container + p {
-    margin-top: ceil($gutter * (16 / 19));
+    margin-top: ceil(govuk-spacing(6) * (16 / 19));
 
-    @include media(tablet) {
-      margin-top: $gutter;
+    @include govuk-media-query(tablet) {
+      margin-top: govuk-spacing(6);
     }
   }
 
   blockquote {
-    background: $grey-4;
-    padding: $gutter-half;
-    margin: $gutter-half;
-    border-left: 5px solid $grey-3;
+    @include govuk-font($size: 19);
+    background: govuk-colour("light-grey");
+    padding: govuk-spacing(3);
+    margin: govuk-spacing(3);
+    border-left: govuk-spacing(2) solid govuk-colour("mid-grey");
   }
 
   pre {
@@ -155,14 +134,14 @@
 
   code {
     background: $code-01;
-    padding: 3px 5px;
+    padding: 3px govuk-spacing(1);
     border-radius: 1px;
 
     font-family: monaco, Consolas, "Lucida Console", monospace;
     font-size: 15px;
     color: $code-0E;
 
-    @include media(tablet) {
+    @include govuk-media-query(tablet) {
       font-size: 16px;
     }
 
@@ -182,7 +161,7 @@
   h1, h2, h3, h4, h5, h6 {
     code {
       font-size: inherit;
-      color: $text-colour;
+      color: $govuk-text-colour;
       background: none;
       padding: 0;
     }
@@ -193,7 +172,7 @@
     max-width: 100%;
     overflow-x: auto;
 
-    margin-top: $gutter-half;
+    margin-top: govuk-spacing(3);
   }
 
   table {
@@ -204,13 +183,13 @@
   }
 
   th, td {
-    padding: $gutter-one-third $gutter-two-thirds $gutter-one-third 0;
+    padding: govuk-spacing(2) govuk-spacing(4) govuk-spacing(2) 0;
 
     background-color: transparent;
-    border-bottom: 1px solid $border-colour;
+    border-bottom: 1px solid $govuk-border-colour;
     border-width: 0 0 1px 0;
 
-    @include core-16;
+    @include govuk-font($size: 16);
     vertical-align: top;
     text-align: left;
   }
@@ -226,16 +205,7 @@
     p+p, p+ul, p+ol,
     ul+p, ul+ol,
     ol+p {
-      margin-top: $gutter-one-third;
+      margin-top: govuk-spacing(2);
     }
   }
-
-  hr {
-    height: 1px;
-    border: none;
-    margin-top: $gutter - 1px;
-    margin-bottom: $gutter;
-    background-color: $border-colour;
-    color: $border-colour;
-  }
 }