Merge pull request #33 from dxw/feature/5-blockquote-styling

Feature/5 blockquote styling

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [2.5.0] — 2019-12-10
+
+### Changed
+
+- Hidden "Sharing and Comments" heading moved below pagination elements
+- Colour contrast increased for search placeholder text and "Blog" title
+- The "No quotes" option in the "Formats" dropdown in the editor is replaced by a "Highlight" option. This produces the same styles, but using a div to wrap the content rather than a blockquote, as the blockquote use was semantically incorrect.
+
+## Earlier releases
+
+Releases up to and including 2.4.0 predate this changelog.

assets/css/common/type.scss

@@ -64,6 +64,20 @@ blockquote {
 
 }
 
+div.highlight {
+  margin: 0 0 $gutter 0;
+  padding: $gutterHalf;
+  background-color: #e1e8e8;
+
+  p {
+    margin-bottom: $gutterHalf;
+    padding-left: 0;
+    &:last-of-type {
+      margin-bottom: 0;
+    }
+  }
+}
+
 cite {
   color: $greyText;
   font-style: normal;
@@ -190,4 +204,4 @@ ul.children {
 
 ::placeholder {
   color: $placeHolderColour;
-}
+}

lib/tiny_mce.php

@@ -12,13 +12,13 @@ function add_style_button($buttons)
 function init($settings)
 {
     $style_formats = [
-    [
-      'title' => 'No quotes',
-      'block' => 'blockquote',
-      'classes' => 'noquotes',
-      'wrapper' => true
-    ],
-  ];
+        [
+          'title' => 'Highlight',
+          'block' => 'div',
+          'classes' => 'highlight',
+          'wrapper' => true
+        ]
+    ];
 
     $settings['style_formats'] = json_encode($style_formats);
 

style.css

@@ -5,7 +5,7 @@
  * Description: This is the beta theme in use for the blogs hosted at blog.gov.uk.
  * License: GNU General Public License v2.0
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
- * Version: 2.4.0
+ * Version: 2.5.0
  *
  * GOV.UK Blogs theme, Copyright (c) 2013 HM Government (Government Digital Service)
  * This theme is distributed under the terms of the GNU GPL, version 2.