Add theme maintenance mode

Gruntfile.js

@@ -16,6 +16,7 @@ module.exports = function (grunt) {
             theme: 'moga',
             dev: './',
             out: './../../../out/',
+            maintenanceout: './out/',
             tmp: './../../../tmp/',
             modules: './../../../modules/'
         },
@@ -38,14 +39,11 @@ module.exports = function (grunt) {
             },
             compile: {
                 files: {
-                    '<%= project.out %><%= project.theme %>/src/css/styles.min.css': [
+                    '<%= project.out %><%= project.theme %>/src/css/styles.css': [
                         '<%= project.dev %>/build/scss/style-opt.scss'
                     ],
-                    '<%= project.out %><%= project.theme %>/src/css/styles-all.min.css': [
+                    '<%= project.out %><%= project.theme %>/src/css/styles-all.css': [
                         '<%= project.dev %>/build/scss/style.scss'
-                    ],
-                    '<%= project.out %><%= project.theme %>/src/css/promoslider.min.css': [
-                        '<%= project.dev %>/build/scss/promoslider.scss'
                     ]
                 }
             }
@@ -57,8 +55,8 @@ module.exports = function (grunt) {
             },
             target: {
                 files: {
-                    '<%= project.out %><%= project.theme %>/src/css/styles.min.css': ['<%= project.out %><%= project.theme %>/src/css/styles.min.css'],
-                    '<%= project.out %><%= project.theme %>/src/css/styles-all.min.css': ['<%= project.out %><%= project.theme %>/src/css/styles-all.min.css']
+                    '<%= project.out %><%= project.theme %>/src/css/styles.min.css': ['<%= project.out %><%= project.theme %>/src/css/styles.css'],
+                    '<%= project.out %><%= project.theme %>/src/css/styles-all.min.css': ['<%= project.out %><%= project.theme %>/src/css/styles-all.css']
                 }
             }
         },
@@ -71,43 +69,43 @@ module.exports = function (grunt) {
                 files: {
                     '<%= project.out %><%= project.theme %>/src/js/scripts.min.js': [
                         '<%= project.dev %>node_modules/@popperjs/core/dist/umd/popper-lite.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dom/data.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dom/event-handler.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dom/selector-engine.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dom/manipulator.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/base-component.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/alert.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/button.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/carousel.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/collapse.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dropdown.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/modal.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/tab.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dom/data.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dom/event-handler.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dom/selector-engine.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dom/manipulator.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/base-component.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/alert.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/button.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/carousel.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/collapse.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dropdown.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/modal.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/tab.js',
                         '<%= project.dev %>build/js/main.js'
                     ],
                     '<%= project.out %><%= project.theme %>/src/js/scripts.jq.min.js': [
                         '<%= project.dev %>node_modules/jquery/dist/jquery.slim.js',
                         '<%= project.dev %>node_modules/@popperjs/core/dist/umd/popper-lite.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dom/data.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dom/event-handler.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dom/selector-engine.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dom/manipulator.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/base-component.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/alert.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/button.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/carousel.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/collapse.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/dropdown.js',
-                        '<%= project.dev %>node_modules/bootstrap/js/dist/modal.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dom/data.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dom/event-handler.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dom/selector-engine.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dom/manipulator.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/base-component.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/alert.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/button.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/carousel.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/collapse.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/dropdown.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/src/modal.js',
                         '<%= project.dev %>build/js/main.js'
                     ],
                     '<%= project.out %><%= project.theme %>/src/js/scripts.bs.min.js': [
-                        '<%= project.dev %>node_modules/bootstrap/dist/js/bootstrap.bundle.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/dist/bootstrap.bundle.js',
                         '<%= project.dev %>build/js/main.js'
                     ],
                     '<%= project.out %><%= project.theme %>/src/js/scripts.bs.jq.min.js': [
                         '<%= project.dev %>node_modules/jquery/dist/jquery.slim.js',
-                        '<%= project.dev %>node_modules/bootstrap/dist/js/bootstrap.bundle.js',
+                        '<%= project.dev %>build/vendor/bootstrap/js/dist/bootstrap.bundle.js',
                         '<%= project.dev %>build/js/main.js'
                     ],
                     '<%= project.out %><%= project.theme %>/src/js/variants.min.js': [
@@ -161,7 +159,8 @@ module.exports = function (grunt) {
             icons: {
                 src: '<%= project.dev %>/build/icons/*.svg',
                 dest: '<%= project.out %><%= project.theme %>/src/fonts/',
-                destCss: '<%= project.dev %>/build/scss/',
+                destScss: '<%= project.dev %>/build/scss/',
+                destHtml: '<%= project.out %><%= project.theme %>/src/fonts/',
                 options: {
                     relativeFontPath: '../fonts/',
                     fontPathVariables: true,
@@ -181,8 +180,8 @@ module.exports = function (grunt) {
                     beautify: false,
                     expand: false
                 },
-                src:  '<%= project.out %><%= project.theme %>/src/css/styles.min.css',
-                dest: '<%= project.out %><%= project.theme %>/src/css/styles.min.css'
+                src:  '<%= project.out %><%= project.theme %>/src/css/styles.css',
+                dest: '<%= project.out %><%= project.theme %>/src/css/styles.css'
             }
         },
         /**
@@ -232,27 +231,37 @@ module.exports = function (grunt) {
                     {
                         expand: false,
                         src: [
-                            '<%= project.dev %>node_modules/fontsource-barlow-condensed/files/barlow-condensed-latin-500-normal.woff*',
-                            '<%= project.dev %>node_modules/fontsource-barlow-condensed/files/barlow-condensed-latin-600-normal.woff*',
-                            '<%= project.dev %>node_modules/fontsource-barlow-condensed/files/barlow-condensed-latin-700-normal.woff*',
-                            '<%= project.dev %>node_modules/fontsource-raleway/files/raleway-latin-200-normal.woff*',
-                            '<%= project.dev %>node_modules/fontsource-raleway/files/raleway-latin-400-normal.woff*',
-                            '<%= project.dev %>node_modules/fontsource-raleway/files/raleway-latin-700-normal.woff*'
+                            '<%= project.dev %>/node_modules/@fontsource/barlow-condensed/files/barlow-condensed-latin-500-normal.woff*',
+                            '<%= project.dev %>/node_modules/@fontsource/barlow-condensed/files/barlow-condensed-latin-600-normal.woff*',
+                            '<%= project.dev %>/node_modules/@fontsource/barlow-condensed/files/barlow-condensed-latin-700-normal.woff*',
+                            '<%= project.dev %>/node_modules/@fontsource/raleway/files/raleway-latin-200-normal.woff*',
+                            '<%= project.dev %>/node_modules/@fontsource/raleway/files/raleway-latin-400-normal.woff*',
+                            '<%= project.dev %>/node_modules/@fontsource/raleway/files/raleway-latin-700-normal.woff*'
                         ],
                         flatten: true,
-                        dest: '<%= project.out %><%= project.theme %>src/fonts/'
-                    },
+                        dest: '<%= project.out %><%= project.theme %>/src/fonts/'
+                    }
+                ]
+            },
+            bootstrapvendor: {
+                files: [
                     {
-                        expand: false,
-                        src: 'bootstrap.bundle.min.js',
-                        cwd: '<%= project.dev %>build/js/',
-                        dest: '<%= project.out %><%= project.theme %>src/js/'
+                        expand: true,
+                        src: '**/*',
+                        cwd: '<%= project.dev %>node_modules/bootstrap/js/src/',
+                        dest: '<%= project.dev %>build/vendor/bootstrap/js/src/'
                     },
                     {
                         expand: true,
+                        src: '**/*',
                         cwd: '<%= project.dev %>node_modules/bootstrap/scss/',
-                        src: '**',
                         dest: '<%= project.dev %>build/vendor/bootstrap/'
+                    },
+                    {
+                        expand: true,
+                        src: 'bootstrap.bundle.js',
+                        cwd: '<%= project.dev %>node_modules/bootstrap/dist/js/',
+                        dest: '<%= project.dev %>build/vendor/bootstrap/js/dist/'
                     }
                 ]
             },
@@ -262,15 +271,15 @@ module.exports = function (grunt) {
     /**
      * Load Grunt plugins
      */
-    require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
+    require('matchdep').filterDev('*grunt-*').forEach(grunt.loadNpmTasks);
 
     /**
      * Default task
      * Run `grunt` on the command line
      */
     grunt.registerTask('default', [
         'webfont',
-        'copy',
+        'copy:fonts',
         'sass',
         'cmq',
         'cssmin',
@@ -279,4 +288,19 @@ module.exports = function (grunt) {
         'clean',
         'watch'
     ]);
+    /**
+     * Theme maintenance task
+     * Run `grunt maintenance` on the command line
+     */
+    grunt.registerTask('maintenance', 'Build for theme himself', function () {
+        grunt.config.set('project.out', '<%= project.maintenanceout %>');
+        grunt.task.run('webfont');
+        grunt.task.run('copy:fonts');
+        grunt.task.run('copy:bootstrapvendor');
+        grunt.task.run('sass');
+        grunt.task.run('cmq');
+        grunt.task.run('cssmin');
+        grunt.task.run('concat:js');
+        grunt.task.run('uglify');
+    });
 };

build/scss/style.scss

@@ -57,7 +57,6 @@
 @import "../vendor/bootstrap/utilities/api";
 // scss-docs-end import-stack
 
-
 @import 'icons';
 @import 'webfont';
 

build/vendor/bootstrap/_functions.scss

@@ -37,11 +37,17 @@
   @return red($value), green($value), blue($value);
 }
 
+// stylelint-disable scss/dollar-variable-pattern
 @function rgba-css-var($identifier, $target) {
-  @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  @if $identifier == "body" and $target == "bg" {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-bg-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  } @if $identifier == "body" and $target == "text" {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-color-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  } @else {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  }
 }
 
-// stylelint-disable scss/dollar-variable-pattern
 @function map-loop($map, $func, $args...) {
   $_map: ();
 

build/vendor/bootstrap/_reboot.scss

@@ -27,7 +27,7 @@
 
 :root {
   @if $font-size-root != null {
-    font-size: var(--#{$variable-prefix}-root-font-size);
+    font-size: var(--#{$variable-prefix}root-font-size);
   }
 
   @if $enable-smooth-scroll {

build/vendor/bootstrap/_root.scss

@@ -23,7 +23,8 @@
 
   --#{$variable-prefix}white-rgb: #{to-rgb($white)};
   --#{$variable-prefix}black-rgb: #{to-rgb($black)};
-  --#{$variable-prefix}body-rgb: #{to-rgb($body-color)};
+  --#{$variable-prefix}body-color-rgb: #{to-rgb($body-color)};
+  --#{$variable-prefix}body-bg-rgb: #{to-rgb($body-bg)};
 
   // Fonts
 

build/vendor/bootstrap/_variables.scss

@@ -409,23 +409,33 @@ $body-text-align:           null !default;
 //
 // Extends the default `$theme-colors` maps to help create our utilities.
 
+// Come v6, we'll de-dupe these variables. Until then, for backward compatibility, we keep them to reassign.
 // scss-docs-start utilities-colors
-$utilities-colors: map-merge(
-  $theme-colors-rgb,
+$utilities-colors: $theme-colors-rgb !default;
+// scss-docs-end utilities-colors
+
+// scss-docs-start utilities-text-colors
+$utilities-text: map-merge(
+  $utilities-colors,
   (
     "black": to-rgb($black),
     "white": to-rgb($white),
-    "body":  to-rgb($body-color)
+    "body": to-rgb($body-color)
   )
 ) !default;
-// scss-docs-end utilities-colors
-
-// scss-docs-start utilities-text-colors
-$utilities-text-colors: map-loop($utilities-colors, rgba-css-var, "$key", "text") !default;
+$utilities-text-colors: map-loop($utilities-text, rgba-css-var, "$key", "text") !default;
 // scss-docs-end utilities-text-colors
 
 // scss-docs-start utilities-bg-colors
-$utilities-bg-colors: map-loop($utilities-colors, rgba-css-var, "$key", "bg") !default;
+$utilities-bg: map-merge(
+  $utilities-colors,
+  (
+    "black": to-rgb($black),
+    "white": to-rgb($white),
+    "body": to-rgb($body-bg)
+  )
+) !default;
+$utilities-bg-colors: map-loop($utilities-bg, rgba-css-var, "$key", "bg") !default;
 // scss-docs-end utilities-bg-colors
 
 // Links
@@ -1157,7 +1167,7 @@ $dropdown-divider-margin-y:         $spacer * .5 !default;
 $dropdown-box-shadow:               $box-shadow !default;
 
 $dropdown-link-color:               $gray-900 !default;
-$dropdown-link-hover-color:         shade-color($gray-900, 10%) !default;
+$dropdown-link-hover-color:         shade-color($dropdown-link-color, 10%) !default;
 $dropdown-link-hover-bg:            $gray-200 !default;
 
 $dropdown-link-active-color:        $component-active-color !default;

build/vendor/bootstrap/bootstrap-grid.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.1.0 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -18,6 +18,8 @@ $include-column-box-sizing: true !default;
 
 @import "vendor/rfs";
 
+@import "root";
+
 @import "containers";
 @import "grid";
 

build/vendor/bootstrap/bootstrap-reboot.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
+ * Bootstrap Reboot v5.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -8,8 +8,6 @@
 
 @import "functions";
 @import "variables";
-// Prevent the usage of custom properties since we don't add them to `:root` in reboot
-$font-family-base: $font-family-sans-serif; // stylelint-disable-line scss/dollar-variable-default
-$font-family-code: $font-family-monospace; // stylelint-disable-line scss/dollar-variable-default
 @import "mixins";
+@import "root";
 @import "reboot";

build/vendor/bootstrap/bootstrap-utilities.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Utilities v5.1.0 (https://getbootstrap.com/)
+ * Bootstrap Utilities v5.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)

build/vendor/bootstrap/bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.1.0 (https://getbootstrap.com/)
+ * Bootstrap v5.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)