Merge branch 'farend:redmine4.2' into redmine4.2

package.json

@@ -20,22 +20,22 @@
   },
   "homepage": "https://github.com/farend/redmine_theme_farend_bleuclair#readme",
   "devDependencies": {
-    "@babel/core": "^7.14.3",
-    "@babel/preset-env": "^7.14.4",
-    "autoprefixer": "^10.2.6",
+    "@babel/core": "^7.15.0",
+    "@babel/preset-env": "^7.15.0",
+    "autoprefixer": "^10.3.1",
     "babel-loader": "^8.2.2",
-    "css-loader": "^5.2.6",
+    "css-loader": "^6.2.0",
     "file-loader": "^6.2.0",
     "is-svg": ">=4.3.1",
-    "mini-css-extract-plugin": "^1.6.0",
+    "mini-css-extract-plugin": "^2.2.0",
     "node-sass": "^6.0.1",
-    "optimize-css-assets-webpack-plugin": "^6.0.0",
-    "postcss-loader": "^5.3.0",
-    "sass": "^1.34.1",
-    "sass-loader": "^12.0",
+    "optimize-css-assets-webpack-plugin": "^6.0.1",
+    "postcss-loader": "^6.1.1",
+    "sass": "^1.37.5",
+    "sass-loader": "^12.1",
     "url-loader": "^4.1.1",
-    "webpack": "^5.38.1",
-    "webpack-cli": "^4.7.0",
+    "webpack": "^5.50.0",
+    "webpack-cli": "^4.8.0",
     "y18n": ">=5.0.8"
   }
 }

src/styles/components/_icon.scss

@@ -1,4 +1,4 @@
-$overridden-selectors: '.icon-add', '.icon-edit', '.icon-copy', '.icon-del', '.icon-move', '.icon-save', '.icon-download', '.icon-cancel', '.icon-multiple', '.icon-folder', '.open', '.icon-folder', '.icon-package', '.icon-user', '.icon-project', '.icon-projects', '.icon-help', '.icon-attachment', '.icon-history', '.icon-time-entry', '.icon-time', '.icon-time-add', '.icon-stats', '.icon-warning', '.icon-error', '.icon-fav', '.icon-fav-off', '.icon-reload', '.icon-lock', '.icon-locked', '.icon-unlock', '.icon-checked', '.icon-comment', '.icon-comments', '.icon-summary', '.icon-server-authentication', '.icon-issue', '.icon-zoom-in', '.icon-zoom-out', '.icon-passwd', '.icon-arrow-right', '.icon-test', '.icon-sticky', '.icon-email', '.icon-email-disabled', '.icon-email-add', '.icon-ok', '.icon-not-ok', '.icon-link-break', '.icon-list', '.icon-close', '.icon-settings', '.icon-roles', '.icon-issue-edit', '.icon-workflows', '.icon-custom-fields', '.icon-plugins', '.icon-news', '.icon-issue-closed', '.icon-issue-note', '.icon-changeset', '.icon-message', '.icon-reply', '.icon-wiki-page', '.icon-wiki-page', '.icon-document', '.icon-add-bullet', '.icon-shared', '.icon-actions', '.icon-expended', '.icon-collapsed', '.icon-bookmark', '.icon-bookmark-off', '.icon-sort-handle', '.icon-sorted-asc', '.icon-sorted-desc', '.icon-toggle-plus', '.icon-toggle-minus', '.icon-file', '.icon-clear-query', '.icon-import', '.icon-group:not(.name)', '.icon-bookmarked-project', '.icon-copy-link';
+$overridden-selectors: '.icon-add', '.icon-edit', '.icon-copy', '.icon-del', '.icon-move', '.icon-save', '.icon-download', '.icon-cancel', '.icon-multiple', '.icon-folder', '.open', '.icon-folder', '.icon-package', '.icon-user', '.icon-project', '.icon-projects', '.icon-help', '.icon-attachment', '.icon-history', '.icon-time-entry', '.icon-time', '.icon-time-add', '.icon-stats', '.icon-warning', '.icon-error', '.icon-fav', '.icon-fav-off', '.icon-reload', '.icon-lock', '.icon-locked', '.icon-unlock', '.icon-checked', '.icon-comment', '.icon-comments', '.icon-summary', '.icon-server-authentication', '.icon-issue', '.icon-zoom-in', '.icon-zoom-out', '.icon-passwd', '.icon-arrow-right', '.icon-test', '.icon-sticky', '.icon-email', '.icon-email-disabled', '.icon-email-add', '.icon-ok', '.icon-not-ok', '.icon-link-break', '.icon-list', '.icon-close', '.icon-settings', '.icon-roles', '.icon-issue-edit', '.icon-workflows', '.icon-custom-fields', '.icon-plugins', '.icon-news', '.icon-issue-closed', '.icon-issue-note', '.icon-changeset', '.icon-message', '.icon-reply', '.icon-wiki-page', '.icon-wiki-page', '.icon-document', '.icon-add-bullet', '.icon-shared', '.icon-actions', '.icon-expended', '.icon-collapsed', '.icon-bookmark', '.icon-bookmark-off', '.icon-sort-handle', '.icon-sorted-asc', '.icon-sorted-desc', '.icon-toggle-plus', '.icon-toggle-minus', '.icon-file', '.icon-clear-query', '.icon-import', '.icon-group:not(.name):not(.group)', '.icon-bookmarked-project', '.icon-copy-link';
 
 // .atomアイコンは個別に置き換え
 a.atom { background: transparent; padding: 2px 0px 3px 16px; }
@@ -141,7 +141,7 @@ a.atom:before { /* fa-atom */ @include fontAwesome('f143', 'Solid'); }
 
 // autocompleteのinput field内のサーチアイコンをsvgアイコンに置き換え
 input.autocomplete {
-  background: #fff url('../images/search.svg') no-repeat 2px 50%;
+  background: #fff url('images/search.svg') no-repeat 2px 50%;
   background-size: 12px 12px;
   background-position: 5px center;
 }
@@ -177,7 +177,7 @@ input.autocomplete {
 // .members.boxと#admin-menuのアイコンのみはメニューのアイコンと言うことでFont Awesomeに置き換え、
 // それ以外はグループのアバターという扱いでそのままにしておく(Gravatarと同じような扱い)
 // $overridden-selectorsも.icon-group:not(.name)というように.nameがついている要素はiconを置き換えないという扱いにしている
-.members.box .icon-group, #admin-menu .icon-group {
+.members.box h3.icon-group, #admin-menu .icon-group {
   background-image: none;
 
   &:before { /* fa-users */ @include fontAwesome('f0c0', 'Solid'); }

src/styles/components/_inputs.scss

@@ -73,7 +73,7 @@ $checkbox-margin: 7px 2px 7px 0px;
       b {
         display: none;
       }
-      background-image: url('../images/arrow.svg');
+      background-image: url('images/arrow.svg');
       background-size: 10px;
       background-repeat: no-repeat;
       background-position: 0px;
@@ -116,7 +116,7 @@ $checkbox-margin: 7px 2px 7px 0px;
   select {
     height: auto;
     appearance: none;
-    background-image: url('../images/arrow.svg');
+    background-image: url('images/arrow.svg');
     background-size: 10px;
     background-repeat: no-repeat;
     background-position: 95% 50%;
@@ -259,7 +259,7 @@ form .attributes {
   }
 
   input.select2-search__field {
-    background: #fff url('../images/search.svg') no-repeat 2px 50%;
+    background: #fff url('images/search.svg') no-repeat 2px 50%;
     background-size: 12px 12px;
     background-position: 5px;
     padding-left: 20px;

src/styles/components/_issues.scss

@@ -275,4 +275,8 @@ fieldset#filters td.values input {
 
 .jstBlock .wiki-preview {
   border: 1px solid $color-history-border;
+}
+
+.issue-card {
+  background-color: $color-issue-bg;
 }

src/styles/components/_scaffolding.scss

@@ -14,13 +14,13 @@ html[lang="ja"] body {
   font-family: 'Font Awesome 5 Solid';
   font-style: normal;
   font-weight: 900;
-  src: url("../webfonts/fa-solid-900.eot");
-  src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg");
+  src: url("webfonts/fa-solid-900.eot");
+  src: url("webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("webfonts/fa-solid-900.woff2") format("woff2"), url("webfonts/fa-solid-900.woff") format("woff"), url("webfonts/fa-solid-900.ttf") format("truetype"), url("webfonts/fa-solid-900.svg#fontawesome") format("svg");
 }
 @font-face {
   font-family: 'Font Awesome 5 Regular';
   font-style: normal;
   font-weight: 400;
-  src: url("../webfonts/fa-regular-400.eot");
-  src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg");
+  src: url("webfonts/fa-regular-400.eot");
+  src: url("webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("webfonts/fa-regular-400.woff2") format("woff2"), url("webfonts/fa-regular-400.woff") format("woff"), url("webfonts/fa-regular-400.ttf") format("truetype"), url("webfonts/fa-regular-400.svg#fontawesome") format("svg");
 }

src/styles/components/_wiki.scss

@@ -5,5 +5,7 @@ div.wiki {
   ul.toc {
     background-color: $color-issue-bg;
     border: none;
+    padding: 9px;
+    border-radius: 4px;
   }
 }