Merge branch 'main' into spinner-during-login-logout-process

.gitlab-ci.yml

@@ -35,7 +35,7 @@ test:php:
           - report.json
 
 build:
-  image: node:12
+  image: node:14
   stage: build
   before_script:
     - npm config set cache cache/npm/ --global

Build/Assets/Images/Template/typo3_nomargins.svg

@@ -3,12 +3,12 @@
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 303.05 84.17" style="enable-background:new 0 0 303.05 84.17;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#f49800;}
+	.st0{fill:#ff8700;}
 </style>
 <g>
 	<g>
 		<polygon points="99.94,28.37 113.57,28.37 113.57,83.56 121.26,83.56 121.26,28.37 134.88,28.37 134.88,21.65 99.94,21.65 		"/>
-		<polygon points="158.9,46.67 147.23,21.65 138.74,21.65 154.57,54.81 154.57,83.56 162.53,83.56 162.53,54.81 178.63,21.65 
+		<polygon points="158.9,46.67 147.23,21.65 138.74,21.65 154.57,54.81 154.57,83.56 162.53,83.56 162.53,54.81 178.63,21.65
 			170.57,21.65 		"/>
 		<path d="M247.43,21.03c-14.59,0-18.48,10.08-18.48,30.87c0,21.66,3.89,32.27,18.48,32.27c14.59,0,18.48-10.61,18.48-32.27
 			C265.91,31.11,262.02,21.03,247.43,21.03z M247.43,77.72c-7.95,0-10.61-6.38-10.61-25.38c0-19.46,2.66-24.86,10.61-24.86

Build/Assets/JavaScript/main.js

@@ -72,7 +72,7 @@ $(function () {
     window.cookieconsent.initialise({
       "palette": {
         "popup": {
-          "background": "#f49700"
+          "background": "#ff8700"
         },
         "button": {
           "background": "#ffffff",

Build/Assets/Scss/base/_colors.scss

@@ -3,9 +3,9 @@
 // Brand and Key Colors
 //
 // Colors:
-// $key-color: #f49700
-// $stage-orange-dark: #e18d00
-// $stage-orange-light: #f7a831
+// $key-color: #ff8700
+// $stage-orange-dark: #eb7c00
+// $stage-orange-light: #f49700
 // $dark-grey: #515151
 // $mid-grey: #8c8c8c
 // $light-grey: #b9b9b9
@@ -22,9 +22,9 @@
 //
 // Styleguide 1.1
 
-$key-color: #f49700;
-$stage-orange-dark: #e18d00;
-$stage-orange-light: #f7a831;
+$key-color: #ff8700;
+$stage-orange-dark: #eb7c00;
+$stage-orange-light: #f49700;
 
 $dark-grey: #515151;
 $mid-grey: #8c8c8c;

Build/Assets/Scss/components/_membership-popup.scss

@@ -35,7 +35,7 @@
 
     .modal-header {
         padding: 20px 20px 0;
-        background: #f49700;
+        background: #ff8700;
 
         h4 {
             text-align: center;

Build/Assets/Scss/layout/_typo3-universe.scss

@@ -36,7 +36,7 @@ typo3-universe {
         --universe-button-color: #212121;
         --universe-button-hover-background: #e2e2e2;
         --universe-button-hover-color: #212121;
-        --universe-caret-color: #f49700;
+        --universe-caret-color: #ff8700;
         --universe-maxwidth: 1170px;
     }
 }

Build/Assets/Scss/utilities/_gradient.scss

@@ -26,9 +26,9 @@
 }
 
 @mixin web-key-color-gradient() {
-    background-image: -webkit-linear-gradient(135deg, #f49700 15%, #e18d00 85%);
-    background-image: -o-linear-gradient(135deg, #f49700 15%, #e18d00 85%);
-    background-image: linear-gradient(135deg, #f49700 15%, #e18d00 85%);
+    background-image: -webkit-linear-gradient(135deg, #ff8700 15%, #eb7c00 85%);
+    background-image: -o-linear-gradient(135deg, #ff8700 15%, #eb7c00 85%);
+    background-image: linear-gradient(135deg, #ff8700 15%, #eb7c00 85%);
 }
 
 @mixin web-blue-color-gradient() {

Build/package.json

@@ -7,13 +7,13 @@
     "@fancyapps/fancybox": "3.2.5",
     "@fortawesome/fontawesome-free": "5.5.0",
     "baguettebox.js": "1.9.1",
-    "bootstrap": "4.4.1",
+    "bootstrap": "^4.6.0",
     "bootstrap4-notify": "4.0.3",
     "cookieconsent": "3.1.0",
     "datatables.net-bs4": "1.10.19",
-    "gravatar": "1.6.0",
+    "gravatar": "^1.8.1",
     "h5bp-print-styles": "4.3.2",
-    "jquery": "3.4.1",
+    "jquery": "^3.5.1",
     "jquery-typeahead": "2.10.4",
     "popper.js": "1.14.4",
     "slick-carousel": "1.8.1",
@@ -24,15 +24,15 @@
     "babel-core": "^6.26.3",
     "babel-preset-es2015": "^6.24.1",
     "babelify": "^8.0.0",
-    "browser-sync": "^2.26.7",
-    "browserify": "^16.2.3",
+    "browser-sync": "^2.26.14",
+    "browserify": "^16.5.2",
     "gulp": "^4.0.0",
     "gulp-autoprefixer": "^4.1.0",
     "gulp-babel": "^7.0.0",
     "gulp-clean-css": "^3.9.2",
     "gulp-cssnano": "^2.1.2",
     "gulp-eslint": "^4.0.1",
-    "gulp-file-include": "^2.0.1",
+    "gulp-file-include": "^2.3.0",
     "gulp-plumber": "^1.2.0",
     "gulp-rename": "^1.2.2",
     "gulp-sass": "^4.0.2",
@@ -41,9 +41,9 @@
     "gulp-stylelint": "^6.0.0",
     "gulp-uglify": "^3.0.0",
     "kss": "^3.0.0-beta.23",
+    "node-sass": "^4.13.1",
     "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0",
-    "node-sass": "^4.13.1"
+    "vinyl-source-stream": "^2.0.0"
   },
   "config": {
     "path": {