Merge pull request #346 from alphagov/guides-typography-tweaks

Tweaks to Guides to match live
alphagov · May 5, 2017 · c5512b7 · c5512b7
2 parents 439beaa + af9044e
commit c5512b7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/app/assets/stylesheets/views/_guide.scss b/app/assets/stylesheets/views/_guide.scss
@@ -11,4 +11,18 @@
     margin-left: 1.5em;
     padding-left: 0.3em;
   }
+
+  // FIXME: Remove when typography improvements made to
+  //        govspeak component
+  //
+  // Distinguish between part titles (27px) and h2s
+  // within content of part by reducing font-size
+  //
+  // Override h2 sizes to match layout used by alphagov/frontend
+  // https://github.com/alphagov/static/blob/f44470edc4e4159ea37481985c641034741623ac/app/assets/stylesheets/helpers/_text.scss#L38
+  .govuk-govspeak {
+    h2 {
+      @include bold-24;
+    }
+  }
 }
diff --git a/app/views/content_items/_body_with_related_links.html.erb b/app/views/content_items/_body_with_related_links.html.erb
@@ -7,13 +7,15 @@
         title: @content_item.title %>
     <%= render 'govuk_component/govspeak',
         content: @content_item.body,
-        direction: page_text_direction %>
-        <% #https://github.com/alphagov/government-frontend/pull/329#issuecomment-297681738 %>
-      <% if false && @content_item.last_updated %>
-        <p class="last-updated">
-          <%= t 'common.last_updated' %>: <%= @content_item.last_updated %>
-        </p>
-      <% end %>
+        direction: page_text_direction,
+        disable_youtube_expansions: true %>
+
+    <% #https://github.com/alphagov/government-frontend/pull/329#issuecomment-297681738 %>
+    <% if false && @content_item.last_updated %>
+      <p class="last-updated">
+        <%= t 'common.last_updated' %>: <%= @content_item.last_updated %>
+      </p>
+    <% end %>
   </div>
   <%= render 'shared/related_items', content_item: @content_item  %>
 </div>
diff --git a/app/views/content_items/guide.html+print.erb b/app/views/content_items/guide.html+print.erb
@@ -16,7 +16,8 @@
         </h1>
         <%= render 'govuk_component/govspeak',
             content: part['body'],
-            direction: page_text_direction %>
+            direction: page_text_direction,
+            disable_youtube_expansions: true %>
       </section>
     <% end %>
   </div>

diff --git a/app/views/content_items/guide.html.erb b/app/views/content_items/guide.html.erb
@@ -21,7 +21,8 @@
 
       <%= render 'govuk_component/govspeak',
           content: @content_item.current_part_body,
-          direction: page_text_direction %>
+          direction: page_text_direction,
+          disable_youtube_expansions: true %>
 
       <%= render 'govuk_component/previous_and_next_navigation', @content_item.previous_and_next_navigation %>