Merge pull request #24 from eea/develop

Develop

CHANGELOG.md

@@ -4,8 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [0.1.19](https://github.com/eea/volto-forests-theme/compare/0.1.18...0.1.19)
+
+- Prettier fix lint [`12bc882`](https://github.com/eea/volto-forests-theme/commit/12bc882f9cf9bca011bcf94f053c5e19914af678)
+- Fix styles lint [`af7ed16`](https://github.com/eea/volto-forests-theme/commit/af7ed16718d8c5a60c63db61788563d63533c8f7)
+- Add more color sets [`9375225`](https://github.com/eea/volto-forests-theme/commit/9375225921d889c5bd191cf35aaf015b560dfaf0)
+- Refs #142010 - Optimize Volto-addons gitflow pipelines [`d81fb94`](https://github.com/eea/volto-forests-theme/commit/d81fb941ef732c980abdcc4111c8317062f13088)
+
 #### [0.1.18](https://github.com/eea/volto-forests-theme/compare/0.1.17...0.1.18)
 
+> 23 November 2021
+
+- Develop [`#22`](https://github.com/eea/volto-forests-theme/pull/22)
 - Add FISE colors in slate styles [`2921654`](https://github.com/eea/volto-forests-theme/commit/2921654debf224c8ffdaf325f3ca3180ee9dc323)
 - More limits to Lead nav [`0b5a328`](https://github.com/eea/volto-forests-theme/commit/0b5a328ac6b00ff60f2d4fa894d5cf131f5ce6a2)
 
@@ -14,9 +24,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 > 23 November 2021
 
 - More limits to Lead nav [`#21`](https://github.com/eea/volto-forests-theme/pull/21)
-#### [0.1.17](https://github.com/eea/volto-forests-theme/compare/0.1.16...0.1.17)
-
-- More limits to Lead nav [`0b5a328`](https://github.com/eea/volto-forests-theme/commit/0b5a328ac6b00ff60f2d4fa894d5cf131f5ce6a2)
 
 #### [0.1.16](https://github.com/eea/volto-forests-theme/compare/0.1.15...0.1.16)
 

Jenkinsfile

@@ -11,6 +11,13 @@ pipeline {
   stages {
 
     stage('Code') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          not { branch 'master' }
+          not { changelog '.*^Automated release [0-9\\.]+$' }
+        }
+      }
       steps {
         parallel(
 
@@ -36,6 +43,13 @@ pipeline {
     }
 
     stage('Tests') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          not { branch 'master' }
+          not { changelog '.*^Automated release [0-9\\.]+$' }
+        }
+      }
       steps {
         parallel(
 
@@ -75,6 +89,13 @@ pipeline {
     }
 
     stage('Integration tests') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          not { branch 'master' }
+          not { changelog '.*^Automated release [0-9\\.]+$' }
+        }
+      }
       steps {
         parallel(
 
@@ -122,11 +143,13 @@ pipeline {
     }
 
     stage('Report to SonarQube') {
-      // Exclude Pull-Requests
       when {
-        allOf {
           environment name: 'CHANGE_ID', value: ''
-        }
+          anyOf {
+            branch 'master'
+            branch 'develop'
+          }
+          not { changelog '.*^Automated release [0-9\\.]+$' }
       }
       steps {
         node(label: 'swarm') {
@@ -156,8 +179,8 @@ pipeline {
       steps {
         node(label: 'docker') {
           script {
-            if ( env.CHANGE_BRANCH != "develop" &&  !( env.CHANGE_BRANCH.startsWith("hotfix")) ) {
-                error "Pipeline aborted due to PR not made from develop or hotfix branch"
+            if ( env.CHANGE_BRANCH != "develop" ) {
+                error "Pipeline aborted due to PR not made from develop branch"
             }
            withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
             sh '''docker pull eeacms/gitflow'''

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-forests-theme",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "@eeacms/volto-forests-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

src/index.js

@@ -99,7 +99,28 @@ export default function applyConfig(config) {
     { cssClass: 'army-moccasin-text', label: 'Army moccasin text' },
     { cssClass: 'army-khaki-text', label: 'Army khaki text' },
 
-    { cssClass: 'vivid-green-text', label: 'Vivid green text' },
+    //red series
+    { cssClass: 'red-mistyrose-text', label: 'Red mistyrose text' },
+    { cssClass: 'red-darksalmon-text', label: 'Red darksalmon text' },
+    { cssClass: 'red-indian-text', label: 'Red indian text' },
+    { cssClass: 'red-brown-text', label: 'Red brown text' },
+    { cssClass: 'red-dark-text', label: 'Red dark text' },
+
+    //orange set
+    { cssClass: 'orange-mistyrose-text', label: 'Orange mistyrose text' },
+    { cssClass: 'orange-pale-text', label: 'Orange pale text' },
+    { cssClass: 'orange-gold-text', label: 'Orange gold text' },
+    { cssClass: 'orange-text', label: 'Orange text' },
+    { cssClass: 'orange-sienna-text', label: 'Orange sienna text' },
+    { cssClass: 'orange-saddle-text', label: 'Orange saddle text' },
+
+    //black set
+    { cssClass: 'black-text', label: 'Black text' },
+    { cssClass: 'black-dimgray-text', label: 'Black dimgray text' },
+    { cssClass: 'black-gray-text', label: 'Black gray text' },
+    { cssClass: 'black-silver-text', label: 'Black silver text' },
+    { cssClass: 'black-gainsboro-text', label: 'Black gainsboro text' },
+
     { cssClass: 'blue-text', label: 'Blue text' },
     { cssClass: 'red-text', label: 'Red text' },
     { cssClass: 'yellow-text', label: 'Yellow text' },

src/slate-styles.css

@@ -91,3 +91,69 @@
 .grey-text {
   color: #8d8d8d;
 }
+
+/* red set */
+
+.red-mistyrose-text {
+  color: #fce6dc;
+}
+
+.red-darksalmon-text {
+  color: #f39a86;
+}
+
+.red-indian-text {
+  color: #e73d5c;
+}
+
+.red-brown-text {
+  color: #b92f47;
+}
+
+.red-dark-text {
+  color: #8e1206;
+}
+
+/* orange set */
+
+.orange-pale-text {
+  color: #fff6a6;
+}
+
+.orange-gold-text {
+  color: #ffe525;
+}
+
+.orange-text {
+  color: #f7a600;
+}
+
+.orange-sienna-text {
+  color: #b94b19;
+}
+
+.orange-saddle-text {
+  color: #8d4107;
+}
+
+/* black set */
+
+.black-text {
+  color: black;
+}
+
+.black-dimgray-text {
+  color: #6f6f6e;
+}
+
+.black-gray-text {
+  color: #929291;
+}
+
+.black-silver-text {
+  color: #bcbcbc;
+}
+
+.black-gainsboro-text {
+  color: #e3e3e3;
+}