From 5cb8ca8610b6b28aefe9a01b5dcda6a59d724ff3 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Thu, 22 Sep 2016 13:24:28 +0100
Subject: [PATCH] MDL-55071 theme_boost: fixup bootswatch thirdpartylibs

Allow longhand colour codes for asthetics..
---
 .eslintignore                        | 3 ++-
 .stylelintignore                     | 4 ++--
 Gruntfile.js                         | 6 +-----
 theme/boost/scss/preset-default.scss | 7 ++++---
 theme/boost/thirdpartylibs.xml       | 9 ++++++++-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index b6103c132f0..e35675a4625 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -68,8 +68,9 @@ theme/boost/amd/src/tab.js
 theme/boost/amd/src/tooltip.js
 theme/boost/amd/src/util.js
 theme/boost/amd/src/tether.js
-theme/boost/scss/preset-flat.scss
+theme/boost/scss/preset-flatly.scss
 theme/boost/scss/preset-paper.scss
+theme/boost/scss/preset-readable.scss
 theme/bootstrapbase/less/bootstrap/
 theme/bootstrapbase/javascript/html5shiv.js
 theme/bootstrapbase/amd/src/bootstrap.js
\ No newline at end of file
diff --git a/.stylelintignore b/.stylelintignore
index 67fbec76757..9a2dc50d7bd 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,6 +1,5 @@
 # Generated by "grunt ignorefiles"
 theme/bootstrapbase/style/
-theme/boost/scss/preset-*
 node_modules/
 vendor/
 auth/cas/CAS/
@@ -68,8 +67,9 @@ theme/boost/amd/src/tab.js
 theme/boost/amd/src/tooltip.js
 theme/boost/amd/src/util.js
 theme/boost/amd/src/tether.js
-theme/boost/scss/preset-flat.scss
+theme/boost/scss/preset-flatly.scss
 theme/boost/scss/preset-paper.scss
+theme/boost/scss/preset-readable.scss
 theme/bootstrapbase/less/bootstrap/
 theme/bootstrapbase/javascript/html5shiv.js
 theme/bootstrapbase/amd/src/bootstrap.js
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 75a270ccd9f..7f74d61543a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -225,11 +225,7 @@ module.exports = function(grunt) {
       var eslintIgnores = ['# Generated by "grunt ignorefiles"', '*/**/yui/src/*/meta/', '*/**/build/'].concat(thirdPartyPaths);
       grunt.file.write('.eslintignore', eslintIgnores.join('\n'));
       // Generate .stylelintignore.
-      var stylelintIgnores = [
-          '# Generated by "grunt ignorefiles"',
-          'theme/bootstrapbase/style/',
-          'theme/boost/scss/preset-*'
-      ].concat(thirdPartyPaths);
+      var stylelintIgnores = ['# Generated by "grunt ignorefiles"', 'theme/bootstrapbase/style/'].concat(thirdPartyPaths);
       grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
     };
 
diff --git a/theme/boost/scss/preset-default.scss b/theme/boost/scss/preset-default.scss
index e95ece6b1e2..caff7b48ccd 100644
--- a/theme/boost/scss/preset-default.scss
+++ b/theme/boost/scss/preset-default.scss
@@ -1,3 +1,4 @@
+/* stylelint-disable color-hex-length */
 /**
  * Default preset file.
  *
@@ -41,16 +42,16 @@ $table-border-color:            #f4f4f4 !default;
 
 // Dropdowns
 $dropdown-border-color:          #e2e2e2 !default;
-$dropdown-link-color:            rgba(0,0,0,.535) !default;
+$dropdown-link-color:            rgba(0, 0, 0, .535) !default;
 
 // Navbar
-$navbar-light-color:                rgba(0,0,0,.535) !default;
+$navbar-light-color:                rgba(0, 0, 0, .535) !default;
 $navbar-light-hover-color:          $brand-primary !default;
 $navbar-light-active-color:         $brand-primary !default;
 
 // Cards
 $card-border-radius:       0 !default;
-$card-border-color:        rgba(238,238,238,1) !default;
+$card-border-color:        rgba(238, 238, 238, 1) !default;
 
 // Breadcrumbs
 $breadcrumb-bg:                 transparent !default;
diff --git a/theme/boost/thirdpartylibs.xml b/theme/boost/thirdpartylibs.xml
index be7da0b236e..4e021bccd95 100644
--- a/theme/boost/thirdpartylibs.xml
+++ b/theme/boost/thirdpartylibs.xml
@@ -99,7 +99,7 @@
     <licenseversion></licenseversion>
   </library>
   <library>
-    <location>scss/preset-flat.scss</location>
+    <location>scss/preset-flatly.scss</location>
     <name>Flatly Bootswatch</name>
     <license>(MIT)</license>
     <version>3.3.7</version>
@@ -112,4 +112,11 @@
     <version>3.3.7</version>
     <licenseversion></licenseversion>
   </library>
+  <library>
+    <location>scss/preset-readable.scss</location>
+    <name>Readable Bootswatch</name>
+    <license>(MIT)</license>
+    <version>3.3.7</version>
+    <licenseversion></licenseversion>
+  </library>
 </libraries>