[TASK] Updated and removed old grunt configuration, fixed sass build …

…and removed old sitemap styling
Yoast · Dec 27, 2022 · 8f8ede5 · 8f8ede5
1 parent 5e8e0c2
commit 8f8ede5
Show file tree

Hide file tree

Showing 11 changed files with 900 additions and 192 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@ Besides the free version of our plugin, we also have a premium version. The free
 - Removed old `linkingSuggestions.js` from `dist`
 - Removed upgrade wizards for old canonical and seo title fields
 - Simplified `.gitattributes`
+- Updated and removed old grunt configuration, fixed sass build
 
 ## 9.0.0-alpha-1 August 16, 2022
 ### Breaking

diff --git a/Resources/Private/SCSS/BackendModule.scss b/Resources/Private/SCSS/BackendModule.scss
@@ -1,6 +1,6 @@
 @import "./Variables";
-@import "../../../node_modules/yoastseo/css/colors";
-@import "../../../node_modules/yoastseo/css/analysis";
+@import "../../../grunt/node_modules/yoastseo/css/colors";
+@import "../../../grunt/node_modules/yoastseo/css/analysis";
 @import "./BackendModule/headings";
 @import "./BackendModule/lists";
 @import "./BackendModule/buttons";
@@ -305,3 +305,14 @@ $gutter: 32px;
 		}
 	}
 }
+
+.sr-only {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	overflow: hidden;
+	clip: rect(0,0,0,0);
+	border: 0;
+}
diff --git a/Resources/Private/SCSS/BackendModule/_lists.scss b/Resources/Private/SCSS/BackendModule/_lists.scss
@@ -6,14 +6,9 @@
 		li {
 			list-style: none !important;
 			position: relative;
-			padding-left: $spacing / 1.2;
+			padding-left: 0;
 
-			&::before {
-				content: '\f00c\0020';
-				position: absolute;
-				left: 0;
-				top: 0;
-				font-family: $font-stack-icon;
+			span {
 				color: $color-green;
 			}
 		}

diff --git a/Resources/Public/CSS/main-sitemap.xsl b/Resources/Public/CSS/main-sitemap.xsl
diff --git a/Resources/Public/CSS/yoast-seo-backend.min.css b/Resources/Public/CSS/yoast-seo-backend.min.css
@@ -90,13 +90,8 @@ li.score:after {
   .yoast-list--usp li {
     list-style: none !important;
     position: relative;
-    padding-left: 1.5833333333rem; }
-    .yoast-list--usp li::before {
-      content: '\f00c\0020';
-      position: absolute;
-      left: 0;
-      top: 0;
-      font-family: "FontAwesome", "Open Sans", Arial, sans-serif;
+    padding-left: 0; }
+    .yoast-list--usp li span {
       color: #77B227; }
 
 .yoast-button {
@@ -427,3 +422,13 @@ li.score:after {
     font-size: 24px;
     -webkit-flex: 0 0 0;
     -ms-flex: 0 0 0; }
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0; }
diff --git a/grunt/Gruntfile.js b/grunt/Gruntfile.js
@@ -12,7 +12,7 @@ module.exports = function(grunt) {
 
     // Load Grunt configurations and tasks
     require( 'load-grunt-config' )(grunt, {
-        configPath: require( 'path' ).join( process.cwd(), 'grunt/config/' ),
+        configPath: require( 'path' ).join( process.cwd(), 'config' ),
         data: project
     });
 };
diff --git a/grunt/config/aliases.yaml b/grunt/config/aliases.yaml
@@ -3,7 +3,6 @@
 # Build everything
 build:
   - 'sass'
-  - 'browserify'
 build:language-files:
   - 'glotpress_download'
   - 'po2json'

diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js
diff --git a/grunt/config/sass.js b/grunt/config/sass.js
@@ -1,11 +1,8 @@
 module.exports = {
     build: {
         files: {
-            'Resources/Public/CSS/yoast-seo.min.css': 'Resources/Private/SCSS/YoastTYPO3.scss',
-            'Resources/Public/CSS/yoast-seo-tca.min.css': 'Resources/Private/SCSS/YoastTCA.scss',
-            'Resources/Public/CSS/yoast-seo-snippet-preview.min.css': 'Resources/Private/SCSS/YoastSnippetPreview.scss',
-            'Resources/Public/CSS/yoast-seo-backend.min.css': 'Resources/Private/SCSS/BackendModule.scss',
-            'Resources/Public/CSS/yoast.min.css': 'Resources/Private/SCSS/Yoast.scss',
+            './../Resources/Public/CSS/yoast-seo-backend.min.css': './../Resources/Private/SCSS/BackendModule.scss',
+            './../Resources/Public/CSS/yoast.min.css': './../Resources/Private/SCSS/Yoast.scss',
         }
     }
 };
diff --git a/grunt/config/watch.js b/grunt/config/watch.js
@@ -2,18 +2,10 @@ module.exports = {
     options: {
         livereload: true
     },
-    js: {
-        files: [
-            'Resources/Public/JavaScript/plugin.js'
-        ],
-        tasks: [
-            'browserify'
-        ]
-    },
     sass: {
-        files: 'Resources/Private/SCSS/YoastTYPO3.scss',
+        files: './../Resources/Private/SCSS/YoastTYPO3.scss',
         tasks: [
             'build:sass'
         ]
     }
-};
+};