Merge branch 'develop' into algolia

# Conflicts: # css-compiled/spectre-exp.css # css-compiled/spectre-icons.css # css-compiled/spectre.css # css-compiled/theme.css
getgrav · Oct 5, 2021 · ec435ad · ec435ad
2 parents dd53758 + 211b4c5
commit ec435ad
Show file tree

Hide file tree

Showing 13 changed files with 4,312 additions and 17,765 deletions.
diff --git a/css-compiled/spectre-exp.min.css b/css-compiled/spectre-exp.min.css
diff --git a/css-compiled/spectre.min.css b/css-compiled/spectre.min.css
diff --git a/css-compiled/theme.min.css b/css-compiled/theme.min.css
diff --git a/images/favicon.png b/images/favicon.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,27 +13,27 @@
   "devDependencies": {
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.6",
-    "babel-loader": "^7.1.5",
+    "babel-loader": "^8.2.2",
     "babel-polyfill": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-3": "^6.24.1",
-    "css-loader": "^1.0.0",
-    "eslint": "^5.2.0",
+    "css-loader": "^5.2.6",
+    "eslint": "^7.27.0",
     "eslint-loader": "^2.1.0",
-    "exports-loader": "^0.7.0",
-    "gulp": "^4.0.0",
-    "gulp-autoprefixer": "^6.0.0",
-    "gulp-clean-css": "^3.9.4",
-    "gulp-csscomb": "^3.0.8",
-    "gulp-rename": "^1.3.0",
-    "gulp-sass": "^4.0.1",
-    "gulp-sourcemaps": "^2.6.4",
-    "imports-loader": "^0.8.0",
+    "exports-loader": "^3.0.0",
+    "gulp": "^4.0.2",
+    "gulp-autoprefixer": "^7.0.1",
+    "gulp-clean-css": "^4.3.0",
+    "gulp-csscomb": "^3.1.0",
+    "gulp-rename": "^2.0.0",
+    "gulp-sass": "^4.1.0",
+    "gulp-sourcemaps": "^3.0.0",
+    "imports-loader": "^3.0.0",
     "json-loader": "^0.5.7",
-    "style-loader": "^0.21.0",
-    "uglifyjs-webpack-plugin": "^2.1.1",
-    "webpack": "^4.16.2",
-    "webpack-cli": "^3.1.0"
+    "style-loader": "^2.0.0",
+    "uglifyjs-webpack-plugin": "^2.2.0",
+    "webpack": "^5.38.1",
+    "webpack-cli": "^4.7.0"
   },
   "browserslist": [
     "last 4 Chrome versions",

diff --git a/scss/spectre/_variables.scss b/scss/spectre/_variables.scss
@@ -5,7 +5,7 @@ $version: "0.5.8";
 $rtl: false !default;
 
 // Core colors
-$primary-color: #5755d9 !default;
+$primary-color: #1A73EC !default;
 $primary-color-dark: darken($primary-color, 3%) !default;
 $primary-color-light: lighten($primary-color, 3%) !default;
 $secondary-color: lighten($primary-color, 37.5%) !default;

diff --git a/scss/theme/_offcanvas.scss b/scss/theme/_offcanvas.scss
@@ -256,9 +256,11 @@
     }
 }
 
-/** Defaults (purple) **/
-.off-canvas .learn-sidebar:before {
-    background: linear-gradient(150deg, $wisteria 0, $deep-well 100%);
+/** Default **/
+body.sidebar-purple {
+  .off-canvas .learn-sidebar:before {
+      background: linear-gradient(150deg, #0766E2 0, #A638F5 100%);
+  }
 }
 
 /** Secondary (green) **/

diff --git a/scss/theme/_typography.scss b/scss/theme/_typography.scss
@@ -209,6 +209,10 @@ pre.xdebug-var-dump {
         word-break: break-word;
     }
 
+    .prism-wrapper {
+        overflow: hidden;
+    }
+
     .code-toolbar {
         margin: 0.5rem 0;
         pre[class*="language-"] {

diff --git a/scss/theme/_variables.scss b/scss/theme/_variables.scss
@@ -22,7 +22,7 @@ $silver: #BDC3C7;
 $concrete: #95A5A6;
 $asbestos: #7F8C8D;
 
-$primary-color: #1AA3ED !default;
+$primary-color: #1A73EC !default;
 $secondary-color: #8C44AB !default;
 $dark-color: #454d5d !default;
 $body-font-color: darken($dark-color, 5%) !default;

diff --git a/templates/chapter.html.twig b/templates/chapter.html.twig
@@ -2,7 +2,7 @@
 {% extends 'docs.html.twig' %}
 
 {% block content %}
-    <div id="chapter">
+    <div id="chapter" class="magic-content">
         {{ page.content|raw }}
     </div>
 {% endblock %}
diff --git a/templates/error.html.twig b/templates/error.html.twig
@@ -1,7 +1,7 @@
 {% extends 'partials/base.html.twig' %}
 
 {% block content %}
-	<div id="error">
+	<div id="error" class="magic-content">
 		<div>
 			<h1>{{ 'PLUGIN_ERROR.ERROR'|t }} {{ page.header.http_response_code }}</h1>
 			<p>

diff --git a/templates/partials/page.html.twig b/templates/partials/page.html.twig
@@ -1,4 +1,4 @@
-<div id="body-inner" class="highlightable">
+<div id="body-inner" class="highlightable magic-content">
     <h1>{{ page.title }}</h1>
     <p>
     	{{ page.content|raw }}