Test no various versions of Node.js

Fixes #208

.github/workflows/lint.yml

@@ -1,6 +1,11 @@
 name: Run linters
 
-on: push
+on:
+  push:
+    branches:
+      - 'master'
+      - 'v*.*'
+  pull_request:
 
 jobs:
   lint:
@@ -8,24 +13,40 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
-      - name: Use Node.js 10.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: "10.x"
+          node-version: 14.x
 
       - name: Install npm dependencies
         run: npm ci
 
-      - name: Run linters
-        uses: samuelmeuli/lint-action@v1
+      - name: Eslint
+        run: npm run lint:js
+
+      - name: Stylelint
+        run: npm run lint:sass
+
+  build:
+    runs-on: ubuntu-18.04
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
         with:
-          github_token: ${{ secrets.github_token }}
-          eslint: true
-          eslint_dir: "src/javascripts"
-          stylelint: true
-          stylelint_dir: "src/sass"
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install npm dependencies
+        run: npm ci --production
 
       - name: Check build
         run: npm run build

.lintstagedrc.js

@@ -0,0 +1,12 @@
+module.exports = {
+  "src/**/*.js": files => [
+    `eslint "${files.join('" "')}"`,
+    'grunt js',
+    'git add javascripts/'
+  ],
+  "src/**/*.scss": files => [
+    `stylelint "${files.join('" "')}"`,
+    'grunt css',
+    'git add stylesheets/ plugins/'
+  ],
+}

Gruntfile.js

@@ -4,11 +4,11 @@ module.exports = function (grunt) {
 
     sass: {
       options: {
-        implementation: require('node-sass'),
+        implementation: require('sass'),
         sourceMap: false,
         outputStyle: 'compressed',
         functions: {
-          'inline-svg': require('sass-inline-svg')('./svg', {
+          'inline-svg($path, $selectors: null)': require('@liquid-js/sass-inline-svg')('./svg', {
             optimize: true,
             encodingFormat: 'uri'
           })

README.md

@@ -2,7 +2,7 @@
 
 A free Redmine theme for modern browsers.
 
-![The MIT License](https://img.shields.io/badge/license-MIT-584492.svg) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) [![Build Status](https://img.shields.io/endpoint.svg?url=https://actions-badge.atrox.dev/mrliptontea/PurpleMine2/badge&label=lint&logo=none)](https://actions-badge.atrox.dev/mrliptontea/PurpleMine2/goto) [![Issues](https://img.shields.io/github/issues/mrliptontea/PurpleMine2.svg)](https://github.com/mrliptontea/PurpleMine2/issues)
+![The MIT License](https://img.shields.io/badge/license-MIT-584492.svg) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) ![Run linters](https://github.com/mrliptontea/PurpleMine2/workflows/Run%20linters/badge.svg) [![Issues](https://img.shields.io/github/issues/mrliptontea/PurpleMine2.svg)](https://github.com/mrliptontea/PurpleMine2/issues)
 
 ---
 
@@ -56,6 +56,20 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe
 
 ## Changelog
 
+Latest (master):
+
+* Replaced node-sass with sass.
+* Resolved issues with `inline-svg` function in Node 14.x.
+
+v2.12.1 (2020-08-11):
+
+* Fixed #204 - missing context menu icons in Easy WBS plugin.
+
+v2.12.0 (2020-08-01):
+
+* Fixed #196 and #199: text wrapping in certain column types.
+* Merged #203: fixed pagination overlapping wiki content.
+
 v2.11.0 (2020-05-08):
 
 * Fixed #179: full screen mode issues when using redmine_wysiwyg_editor plugin.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "purplemine",
-  "description": "A free Redmine 2.6+ theme written in SCSS",
+  "description": "A free Redmine 3.0+ theme written in SCSS",
   "keywords": [
     "redmine",
     "theme",
@@ -25,29 +25,36 @@
     "lint": "npm run -S lint:js && npm run -S lint:sass"
   },
   "dependencies": {
-    "autoprefixer": "^9.7.5",
-    "grunt": "^1.1.0",
-    "grunt-contrib-uglify": "^4.0.1",
+    "@liquid-js/sass-inline-svg": "^2.0.0",
+    "autoprefixer": "^9.8.6",
+    "grunt": "^1.3.0",
+    "grunt-contrib-uglify": "^5.0.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-postcss": "^0.9.0",
     "grunt-sass": "^3.1.0",
-    "node-sass": "^4.13.1",
-    "sass-inline-svg": "^1.2.3"
+    "sass": "^1.26.11"
   },
   "devDependencies": {
-    "eslint": "^6.8.0",
+    "eslint": "^7.9.0",
     "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "stylelint": "^10.1.0",
-    "stylelint-order": "^3.1.1",
-    "stylelint-scss": "^3.16.0"
+    "husky": "^4.3.0",
+    "lint-staged": "^10.4.0",
+    "stylelint": "^13.7.2",
+    "stylelint-order": "^4.1.0",
+    "stylelint-scss": "^3.18.0"
   },
   "browserslist": [
     "last 2 versions",
     "> 1%",
     "not dead"
-  ]
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged --relative"
+    }
+  }
 }

plugins/redmine_backlogs/jquery/jquery.multiselect.css

@@ -1 +1 @@
-.ui-multiselect{padding:2px 0 2px 4px;text-align:left}.ui-multiselect span.ui-icon{float:right}.ui-multiselect-single .ui-multiselect-checkboxes input{position:absolute !important;top:auto !important;left:-9999px}.ui-multiselect-single .ui-multiselect-checkboxes label{padding:5px !important}.ui-multiselect-header{margin-bottom:3px;padding:3px}.ui-multiselect-header ul{font-size:.92em}.ui-multiselect-header ul li{padding:0 10px 0 0;float:left}.ui-multiselect-header a{text-decoration:none}.ui-multiselect-header a:hover{text-decoration:underline}.ui-multiselect-header span.ui-icon{float:left}.ui-multiselect-header li.ui-multiselect-close{padding-right:0;float:right;text-align:right}.ui-multiselect-menu{box-shadow:0 5px 8px -2px rgba(0,0,0,0.25),0 1px 2px rgba(0,0,0,0.3);display:none;position:absolute;z-index:10000;padding:3px;text-align:left}.ui-multiselect-checkboxes{position:relative;padding-right:2px;overflow-y:scroll}.ui-multiselect-checkboxes input[type="checkbox"]{top:0;margin:3px 0 0 -20px;float:left}.ui-multiselect-checkboxes label{display:block;padding:3px 1px;padding-left:26px;border:1px solid transparent;cursor:default;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ui-multiselect-checkboxes label input{position:relative;top:1px}.ui-multiselect-checkboxes li{clear:both;font-size:.92em}.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label{margin-bottom:2px;border-bottom:1px solid #dadce7;font-weight:600;text-align:center}.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label a{display:block;margin:1px 0;padding:3px;text-decoration:none}* html .ui-multiselect-checkboxes label{border:0 none}
+.ui-multiselect{padding:2px 0 2px 4px;text-align:left}.ui-multiselect span.ui-icon{float:right}.ui-multiselect-single .ui-multiselect-checkboxes input{position:absolute !important;top:auto !important;left:-9999px}.ui-multiselect-single .ui-multiselect-checkboxes label{padding:5px !important}.ui-multiselect-header{margin-bottom:3px;padding:3px}.ui-multiselect-header ul{font-size:.92em}.ui-multiselect-header ul li{padding:0 10px 0 0;float:left}.ui-multiselect-header a{text-decoration:none}.ui-multiselect-header a:hover{text-decoration:underline}.ui-multiselect-header span.ui-icon{float:left}.ui-multiselect-header li.ui-multiselect-close{padding-right:0;float:right;text-align:right}.ui-multiselect-menu{box-shadow:0 5px 8px -2px rgba(0,0,0,.25),0 1px 2px rgba(0,0,0,.3);display:none;position:absolute;z-index:10000;padding:3px;text-align:left}.ui-multiselect-checkboxes{position:relative;padding-right:2px;overflow-y:scroll}.ui-multiselect-checkboxes input[type=checkbox]{top:0;margin:3px 0 0 -20px;float:left}.ui-multiselect-checkboxes label{display:block;padding:3px 1px;padding-left:26px;border:1px solid transparent;cursor:default;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ui-multiselect-checkboxes label input{position:relative;top:1px}.ui-multiselect-checkboxes li{clear:both;font-size:.92em}.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label{margin-bottom:2px;border-bottom:1px solid #dadce6;font-weight:600;text-align:center}.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label a{display:block;margin:1px 0;padding:3px;text-decoration:none}* html .ui-multiselect-checkboxes label{border:0 none}

plugins/redmine_backlogs/jquery/jquery.qtip.css

@@ -1 +1 @@
-.qtip{position:absolute;top:-31000px;left:-31000px;width:auto;max-width:500px;outline:none}.ui-tooltip-content{box-shadow:0 5px 8px -2px rgba(0,0,0,0.25),0 1px 2px rgba(0,0,0,0.3);position:relative;padding:10px;overflow:hidden;border:1px solid #d1d3e0;background-color:#fff;color:#3e425a;font-size:.92em;text-align:left;word-wrap:break-word}.ui-tooltip-tip{position:absolute;z-index:10;margin:0 auto;overflow:hidden;border:0 none;border-color:#d1d3e0;background:transparent;background-color:#fff}
+.qtip{position:absolute;top:-31000px;left:-31000px;width:auto;max-width:500px;outline:none}.ui-tooltip-content{box-shadow:0 5px 8px -2px rgba(0,0,0,.25),0 1px 2px rgba(0,0,0,.3);position:relative;padding:10px;overflow:hidden;border:1px solid #d1d3e0;background-color:#fff;color:#3e4359;font-size:.92em;text-align:left;word-wrap:break-word}.ui-tooltip-tip{position:absolute;z-index:10;margin:0 auto;overflow:hidden;border:0 none;border-color:#d1d3e0;background:transparent;background-color:#fff}

plugins/redmine_backlogs/statistics.css

@@ -1 +1 @@
-table th,table td{padding:5px 8px}.ui-widget{margin-bottom:20px}.score{display:inline-block;width:1.5em;font-size:large;text-align:center}.score_0{background-color:#f00}.score_1{background-color:#ff5300}.score_2{background-color:#ff8100}.score_3{background-color:#ffa100}.score_4{background-color:#fb0}.score_5{background-color:#ffd300}.score_6{background-color:#ffec00}.score_7{background-color:#e9fb00}.score_8{background-color:#b1f100}.score_9{background-color:#74e600}.score_10{background-color:#0c0}
+table th,table td{padding:5px 8px}.ui-widget{margin-bottom:20px}.score{display:inline-block;width:1.5em;font-size:large;text-align:center}.score_0{background-color:red}.score_1{background-color:#ff5300}.score_2{background-color:#ff8100}.score_3{background-color:#ffa100}.score_4{background-color:#fb0}.score_5{background-color:#ffd300}.score_6{background-color:#ffec00}.score_7{background-color:#e9fb00}.score_8{background-color:#b1f100}.score_9{background-color:#74e600}.score_10{background-color:#0c0}

src/sass/_variables.scss

@@ -823,8 +823,8 @@ $agile-issue-card-default-color-map: (
     link: shade(adjust-color($green, $hue: -45deg), 700),
   ),
   bk-yellow: (
-    border: scale-color($yellow, $hue: 2deg),
-    background: scale-color($yellow, $hue: 2deg, $saturation: 75%, $lightness: 80%),
+    border: adjust-color($yellow, $hue: 2deg),
+    background: scale-color(adjust-color($yellow, $hue: 2deg), $saturation: 75%, $lightness: 80%),
     link: shade($yellow, 700),
   ),
   bk-orange: (

src/sass/components/_context-menu.scss

@@ -29,7 +29,7 @@
       }
     }
 
-    a {
+    a:not(.easy-mindmup__icon) {
       @extend %fa-icon;
       padding: 3px 10px 3px 20px;
       border-radius: $border-radius-small;

src/sass/components/_elements.scss

@@ -124,6 +124,11 @@ img {
     position: absolute;
     max-width: 100%;
     max-height: 100%;
+
+    &.wiki {
+      position: static;
+      padding-bottom: $line-height-computed;
+    }
   }
 }
 

src/sass/components/_list.scss

@@ -193,10 +193,15 @@ tr.issue {
   text-align: center;
   white-space: nowrap;
 
+  .category,
+  .enumeration,
+  .list,
+  .parent-subject,
+  .parent,
+  .relations,
   .string,
-  .text,
   .subject,
-  .category {
+  .text {
     white-space: normal;
   }
 
@@ -303,6 +308,11 @@ td.center {
   text-align: center;
 }
 
+td.assigned_to,
+td.last_updated_by {
+  white-space: normal;
+}
+
 .issue-report {
   table-layout: fixed;
 }