- Update to Bootstrap 5.1

- fixed css include
moga-kit · Aug 6, 2021 · 8e220c3 · 8e220c3
1 parent 1e4a80e
commit 8e220c3
Show file tree

Hide file tree

Showing 121 changed files with 922 additions and 11,853 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -230,23 +230,29 @@ module.exports = function (grunt) {
             fonts: {
                 files: [
                     {
-                        expand: true,
+                        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/'
                     },
                     {
-                        expand: true,
+                        expand: false,
                         src: 'bootstrap.bundle.min.js',
-                        cwd: '<%= project.dev %>/build/js/',
-                        dest: '<%= project.out %><%= project.theme %>/src/js/'
+                        cwd: '<%= project.dev %>build/js/',
+                        dest: '<%= project.out %><%= project.theme %>src/js/'
+                    },
+                    {
+                        expand: true,
+                        cwd: '<%= project.dev %>node_modules/bootstrap/scss/',
+                        src: '**',
+                        dest: '<%= project.dev %>build/vendor/bootstrap/'
                     }
                 ]
             },

diff --git a/README.md b/README.md
@@ -0,0 +1,14 @@
+# Moga Theme
+moga is the new bootstrap 5 based OXID Theme
+
+## installation
+Use composer to install theme
+
+```bash
+composer require -n moga-kit/moga-theme:dev-master
+```
+
+or simply clone the repository
+
+## Usage
+For development you will need npm installed https://nodejs.org/ and grunt for the built tasks https://gruntjs.com/
diff --git a/build/scss/vendor/_variables_ORGINAL.scss → build/scss/_variables_ORGINAL.scss b/build/scss/vendor/_variables_ORGINAL.scss → build/scss/_variables_ORGINAL.scss
diff --git a/build/scss/style-opt.scss b/build/scss/style-opt.scss
@@ -1,7 +1,50 @@
 @import 'variables';
 @import 'custom_variables';
 @import 'custom_styles';
-@import 'vendor/bootstrap-opt';
+
+//all bootstrap stuff you may need
+// Configuration
+@import "../vendor/bootstrap/functions";
+@import "../vendor/bootstrap/variables";
+@import "../vendor/bootstrap/mixins";
+@import "../vendor/bootstrap/utilities";
+
+$theme-colors: map-remove($theme-colors, "info", "secondary", "warning");
+$table-variants: map-remove($table-variants, "success", "danger", "info", "dark", "secondary", "warning");
+
+// Layout & components
+@import "../vendor/bootstrap/root";
+@import "../vendor/bootstrap/reboot";
+@import "../vendor/bootstrap/type";
+@import "../vendor/bootstrap/images";
+@import "../vendor/bootstrap/containers";
+@import "../vendor/bootstrap/grid";
+@import "../vendor/bootstrap/tables";
+@import "../vendor/bootstrap/forms";
+@import "../vendor/bootstrap/buttons";
+@import "../vendor/bootstrap/transitions";
+@import "../vendor/bootstrap/dropdown";
+@import "../vendor/bootstrap/button-group";
+@import "../vendor/bootstrap/nav";
+@import "../vendor/bootstrap/navbar";
+@import "../vendor/bootstrap/card";
+@import "../vendor/bootstrap/accordion";
+@import "../vendor/bootstrap/breadcrumb";
+@import "../vendor/bootstrap/pagination";
+@import "../vendor/bootstrap/badge";
+@import "../vendor/bootstrap/alert";
+//@import "../vendor/bootstrap/progress";
+@import "../vendor/bootstrap/list-group";
+@import "../vendor/bootstrap/close";
+//@import "../vendor/bootstrap/toasts";
+@import "../vendor/bootstrap/modal";
+//@import "../vendor/bootstrap/tooltip";
+//@import "../vendor/bootstrap/popover";
+@import "../vendor/bootstrap/carousel";
+//@import "../vendor/bootstrap/spinners";
+//@import "../vendor/bootstrap/offcanvas";
+//@import "../vendor/bootstrap/placeholders";
+
 @import 'icons';
 @import 'webfont';
 

diff --git a/build/scss/style.scss b/build/scss/style.scss
@@ -1,7 +1,63 @@
 @import 'variables';
 @import 'custom_variables';
 @import 'custom_styles';
-@import 'vendor/bootstrap';
+
+//all bootstrap stuff you may need
+/*!
+ * Bootstrap v5.1.0 (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)
+ */
+
+// scss-docs-start import-stack
+// Configuration
+@import "../vendor/bootstrap/functions";
+@import "../vendor/bootstrap/variables";
+@import "../vendor/bootstrap/mixins";
+@import "../vendor/bootstrap/utilities";
+
+// Layout & components
+@import "../vendor/bootstrap/root";
+@import "../vendor/bootstrap/reboot";
+@import "../vendor/bootstrap/type";
+@import "../vendor/bootstrap/images";
+@import "../vendor/bootstrap/containers";
+@import "../vendor/bootstrap/grid";
+@import "../vendor/bootstrap/tables";
+@import "../vendor/bootstrap/forms";
+@import "../vendor/bootstrap/buttons";
+@import "../vendor/bootstrap/transitions";
+@import "../vendor/bootstrap/dropdown";
+@import "../vendor/bootstrap/button-group";
+@import "../vendor/bootstrap/nav";
+@import "../vendor/bootstrap/navbar";
+@import "../vendor/bootstrap/card";
+@import "../vendor/bootstrap/accordion";
+@import "../vendor/bootstrap/breadcrumb";
+@import "../vendor/bootstrap/pagination";
+@import "../vendor/bootstrap/badge";
+@import "../vendor/bootstrap/alert";
+@import "../vendor/bootstrap/progress";
+@import "../vendor/bootstrap/list-group";
+@import "../vendor/bootstrap/close";
+@import "../vendor/bootstrap/toasts";
+@import "../vendor/bootstrap/modal";
+@import "../vendor/bootstrap/tooltip";
+@import "../vendor/bootstrap/popover";
+@import "../vendor/bootstrap/carousel";
+@import "../vendor/bootstrap/spinners";
+@import "../vendor/bootstrap/offcanvas";
+@import "../vendor/bootstrap/placeholders";
+
+// Helpers
+@import "../vendor/bootstrap/helpers";
+
+// Utilities
+@import "../vendor/bootstrap/utilities/api";
+// scss-docs-end import-stack
+
+
 @import 'icons';
 @import 'webfont';
 

diff --git a/build/scss/vendor/_bootstrap.scss b/build/scss/vendor/_bootstrap.scss
@@ -1,53 +1,53 @@
 /*!
- * Bootstrap v5.0.0 (https://getbootstrap.com/)
+ * Bootstrap v5.1.0 (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)
  */
 
 // scss-docs-start import-stack
 // Configuration
-
-@import "../../vendor/bootstrap/scss/functions";
-@import "../../vendor/bootstrap/scss/variables";
-@import "../../vendor/bootstrap/scss/mixins";
-@import "../../vendor/bootstrap/scss/utilities";
+@import "../../vendor/bootstrap/functions";
+@import "../../vendor/bootstrap/variables";
+@import "../../vendor/bootstrap/mixins";
+@import "../../vendor/bootstrap/utilities";
 
 // Layout & components
-@import "../../vendor/bootstrap/scss/root";
-@import "../../vendor/bootstrap/scss/reboot";
-@import "../../vendor/bootstrap/scss/type";
-@import "../../vendor/bootstrap/scss/images";
-@import "../../vendor/bootstrap/scss/containers";
-@import "../../vendor/bootstrap/scss/grid";
-@import "../../vendor/bootstrap/scss/tables";
-@import "../../vendor/bootstrap/scss/forms";
-@import "../../vendor/bootstrap/scss/buttons";
-@import "../../vendor/bootstrap/scss/transitions";
-@import "../../vendor/bootstrap/scss/dropdown";
-@import "../../vendor/bootstrap/scss/button-group";
-@import "../../vendor/bootstrap/scss/nav";
-@import "../../vendor/bootstrap/scss/navbar";
-@import "../../vendor/bootstrap/scss/card";
-@import "../../vendor/bootstrap/scss/accordion";
-@import "../../vendor/bootstrap/scss/breadcrumb";
-@import "../../vendor/bootstrap/scss/pagination";
-@import "../../vendor/bootstrap/scss/badge";
-@import "../../vendor/bootstrap/scss/alert";
-@import "../../vendor/bootstrap/scss/progress";
-@import "../../vendor/bootstrap/scss/list-group";
-@import "../../vendor/bootstrap/scss/close";
-@import "../../vendor/bootstrap/scss/toasts";
-@import "../../vendor/bootstrap/scss/modal";
-@import "../../vendor/bootstrap/scss/tooltip";
-@import "../../vendor/bootstrap/scss/popover";
-@import "../../vendor/bootstrap/scss/carousel";
-@import "../../vendor/bootstrap/scss/spinners";
-@import "../../vendor/bootstrap/scss/offcanvas";
+@import "../../vendor/bootstrap/root";
+@import "../../vendor/bootstrap/reboot";
+@import "../../vendor/bootstrap/type";
+@import "../../vendor/bootstrap/images";
+@import "../../vendor/bootstrap/containers";
+@import "../../vendor/bootstrap/grid";
+@import "../../vendor/bootstrap/tables";
+@import "../../vendor/bootstrap/forms";
+@import "../../vendor/bootstrap/buttons";
+@import "../../vendor/bootstrap/transitions";
+@import "../../vendor/bootstrap/dropdown";
+@import "../../vendor/bootstrap/button-group";
+@import "../../vendor/bootstrap/nav";
+@import "../../vendor/bootstrap/navbar";
+@import "../../vendor/bootstrap/card";
+@import "../../vendor/bootstrap/accordion";
+@import "../../vendor/bootstrap/breadcrumb";
+@import "../../vendor/bootstrap/pagination";
+@import "../../vendor/bootstrap/badge";
+@import "../../vendor/bootstrap/alert";
+@import "../../vendor/bootstrap/progress";
+@import "../../vendor/bootstrap/list-group";
+@import "../../vendor/bootstrap/close";
+@import "../../vendor/bootstrap/toasts";
+@import "../../vendor/bootstrap/modal";
+@import "../../vendor/bootstrap/tooltip";
+@import "../../vendor/bootstrap/popover";
+@import "../../vendor/bootstrap/carousel";
+@import "../../vendor/bootstrap/spinners";
+@import "../../vendor/bootstrap/offcanvas";
+@import "../../vendor/bootstrap/placeholders";
 
 // Helpers
-@import "../../vendor/bootstrap/scss/helpers";
+@import "../../vendor/bootstrap/helpers";
 
 // Utilities
-@import "../../vendor/bootstrap/scss/utilities/api";
+@import "../../vendor/bootstrap/utilities/api";
 // scss-docs-end import-stack
diff --git a/build/vendor/bootstrap/LICENSE b/build/vendor/bootstrap/LICENSE