Merge branch 'MDL-55928-master' of git://github.com/jleyva/moodle

diff --git a/.eslintignore b/.eslintignore
index 576c8c4..e35675a 100644 (file)
--- a/.eslintignore
+++ b/.eslintignore
@@ -17,7 +17,6 @@ lib/bennu/
 lib/evalmath/
 lib/lessphp/
 lib/phpexcel/
-lib/pear/Net/
 lib/google/
 lib/htmlpurifier/
 lib/jabber/
@@ -47,10 +46,31 @@ lib/amd/src/loglevel.js
 lib/mustache/
 lib/amd/src/mustache.js
 lib/graphlib.php
+lib/php-css-parser/
+lib/rtlcss/
+lib/scssphp/
 lib/spout/
 lib/amd/src/chartjs-lazy.js
+lib/maxmind/GeoIp2/
+lib/maxmind/MaxMind/
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
+theme/boost/scss/bootstrap/
+theme/boost/amd/src/alert.js
+theme/boost/amd/src/button.js
+theme/boost/amd/src/carousel.js
+theme/boost/amd/src/collapse.js
+theme/boost/amd/src/dropdown.js
+theme/boost/amd/src/modal.js
+theme/boost/amd/src/popover.js
+theme/boost/amd/src/scrollspy.js
+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-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 c73d41a..9a2dc50 100644 (file)
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -16,7 +16,6 @@ lib/bennu/
 lib/evalmath/
 lib/lessphp/
 lib/phpexcel/
-lib/pear/Net/
 lib/google/
 lib/htmlpurifier/
 lib/jabber/
@@ -46,10 +45,31 @@ lib/amd/src/loglevel.js
 lib/mustache/
 lib/amd/src/mustache.js
 lib/graphlib.php
+lib/php-css-parser/
+lib/rtlcss/
+lib/scssphp/
 lib/spout/
 lib/amd/src/chartjs-lazy.js
+lib/maxmind/GeoIp2/
+lib/maxmind/MaxMind/
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
+theme/boost/scss/bootstrap/
+theme/boost/amd/src/alert.js
+theme/boost/amd/src/button.js
+theme/boost/amd/src/carousel.js
+theme/boost/amd/src/collapse.js
+theme/boost/amd/src/dropdown.js
+theme/boost/amd/src/modal.js
+theme/boost/amd/src/popover.js
+theme/boost/amd/src/scrollspy.js
+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-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/.stylelintrc b/.stylelintrc
index 2b4b9f8..409123a 100644 (file)
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,11 +1,11 @@
 {
     "rules": {
         "at-rule-empty-line-before": [ "always",
-          {"except": [ "blockless-group", "first-nested" ], ignore: ["after-comment"]}
+          {"except": [ "blockless-group"], ignore: ["after-comment", "all-nested"]}
         ],
         "at-rule-name-case": "lower",
         "at-rule-name-space-after": "always-single-line",
-        "at-rule-no-unknown": true,
+        "at-rule-no-unknown": null, # Enabled for non-scss in grunt.
         "at-rule-semicolon-newline-after": "always",
         "block-closing-brace-newline-after": "always",
         "block-closing-brace-newline-before": "always-multi-line",
@@ -57,7 +57,7 @@
         "media-query-list-comma-newline-after": "always-multi-line",
         "media-query-list-comma-space-after": "always-single-line",
         "media-query-list-comma-space-before": "never",
-        "no-browser-hacks": [true, { "severity": "warning" }],
+        "no-browser-hacks": null, # Enabled for non-scss in grunt.
         "no-empty-source": true,
         "no-eol-whitespace": true,
         "no-extra-semicolons": [true, { "severity": "warning" }],
@@ -81,13 +81,12 @@
         "selector-root-no-composition": true,
         "selector-type-case": "lower",
         "selector-type-no-unknown": true,
-        "shorthand-property-no-redundant-values": [null, { "severity": "warning" }],
         "string-no-newline": true,
         "time-no-imperceptible": true,
-        "unit-blacklist": ["pt", "rem"],
+        "unit-blacklist": ["pt"],
         "unit-case": "lower",
         "unit-no-unknown": true,
-        "value-keyword-case": ["lower", {"ignoreKeywords": ["/@/"]}],
+        "value-keyword-case": ["lower", {"ignoreKeywords": ["/(@|$)/"]}],
         "value-list-comma-newline-after": "always-multi-line",
         "value-list-comma-space-after": "always-single-line",
         "value-list-comma-space-before": "never",

diff --git a/Gruntfile.js b/Gruntfile.js
index 5e547eb..8fc47df 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -30,7 +30,15 @@ module.exports = function(grunt) {
         cwd = process.env.PWD || process.cwd(),
         async = require('async'),
         DOMParser = require('xmldom').DOMParser,
-        xpath = require('xpath');
+        xpath = require('xpath'),
+        semver = require('semver');
+
+    // Verify the node version is new enough.
+    var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
+    var actual = semver.valid(process.version);
+    if (!semver.satisfies(actual, expected)) {
+        grunt.fail.fatal('Node version too old. Require ' + expected + ', version installed: ' + actual);
+    }
 
     // Windows users can't run grunt in a subdirectory, so allow them to set
     // the root by passing --root=path/to/dir.
@@ -143,7 +151,7 @@ module.exports = function(grunt) {
                     "theme/bootstrapbase/style/editor.css": "theme/bootstrapbase/less/editor.less",
                 },
                 options: {
-                    compress: true
+                    compress: false // We must not compress to keep the comments.
                 }
            }
         },
@@ -176,19 +184,29 @@ module.exports = function(grunt) {
                     syntax: 'less',
                     configOverrides: {
                         rules: {
-                            // TODO: MDL-55165 -Enable these rules once we make output-changing changes to less.
-                            "declaration-block-no-ignored-properties": null,
-                            "value-keyword-case": null,
-                            "declaration-block-no-duplicate-properties": null,
-                            "declaration-block-no-shorthand-property-overrides": null,
-                            "selector-type-no-unknown": null,
-                            "length-zero-no-unit": null,
-                            "color-hex-case": null,
-                            "color-hex-length": null
+                            // These rules have to be disabled in .stylelintrc for scss compat.
+                            "at-rule-no-unknown": true,
+                            "no-browser-hacks": [true, {"severity": "warning"}]
                         }
                     }
                 },
                 src: ['theme/**/*.less']
+            },
+            scss: {
+                options: {syntax: 'scss'},
+                src: ['*/**/*.scss']
+            },
+            css: {
+                src: ['*/**/*.css'],
+                options: {
+                    configOverrides: {
+                        rules: {
+                            // These rules have to be disabled in .stylelintrc for scss compat.
+                            "at-rule-no-unknown": true,
+           &nbs