Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,15 @@
 # ChangeLog
 
+## v1.7.0
+
+### Changes
+
+- Support Redmine v4.1 [#156](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/156)
+
+### Bug Fixes
+
+gantt chart not work 4.1.0 [#157](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/157)
+
 ## v1.6.1
 
 ### Changes

README.ja.md

@@ -1,6 +1,6 @@
 # minimalflat2
 
-![Redmine](https://img.shields.io/badge/Redmine-4.0-brightgreen.svg)
+![Redmine](https://img.shields.io/badge/Redmine-4.1-brightgreen)
 
 簡素でフラットな外観の Redmine テーマです。
 
@@ -39,13 +39,15 @@
 
 ## 開発
 
-CSS の Transpile (watch) CSS と Web ブラウザーのプレビューを実行できます。
+CSS の Transpile (watch) CSS が実行されます。
 
 1. `git clone https://github.com/akabekobeko/redmine-theme-minimalflat2.git`
 2. `cd redmine-theme-minimalflat2`
 3. `npm i`
 4. `npm start`
 
+停止コマンドは <kbd>Ctrl</kbd> + <kbd>C</kbd> です。
+
 ### docker-compose
 
 実際に Redmine を実行して動作確認する場合は以下を実行してください。

README.md

@@ -1,6 +1,6 @@
 # minimalflat2
 
-![Redmine](https://img.shields.io/badge/Redmine-4.0-brightgreen.svg)
+![Redmine](https://img.shields.io/badge/Redmine-4.1-brightgreen)
 
 Minimal and flat design theme for Redmine.
 
@@ -36,13 +36,15 @@ Minimal and flat design theme for Redmine.
 
 ## Development
 
-Transpile (watch) CSS and preview on web browser.
+The CSS Transpile (watch) CSS is executed.
 
 1. `git clone https://github.com/akabekobeko/redmine-theme-minimalflat2.git`
 2. `cd redmine-theme-minimalflat2`
 3. `npm i`
 4. `npm start`
 
+Stop is <kbd>Ctrl</kbd> + <kbd> C </kbd>.
+
 ### docker-compose
 
 1. `docker-compose up -d`

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 services:
   redmine:
     container_name: redmine
-    image: redmine:4.0.4-passenger
+    image: redmine:4.1.0-passenger
     restart: always
     ports:
       - 8080:3000

package.json

@@ -1,7 +1,7 @@
 {
   "name": "minimalflat2",
   "description": "Minimal and flat design theme for Redmine.",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "author": "akabeko",
   "license": "GPL-2.0",
   "main": "index.js",
@@ -28,7 +28,6 @@
     "build": "npm-run-all -p build:*",
     "watch:css1": "node-sass ./src/scss/App.scss ./src/assets/stylesheets/application.css -w -r --source-map true --output-style expanded",
     "watch:css2": "node-sass ./src/scss/Responsive.scss ./src/assets/stylesheets/responsive.css -w -r --source-map true --output-style expanded",
-    "watch:server": "browser-sync start --server ./ --startPath src/assets -f \"src/assets\"",
     "watch": "npm-run-all -s build:css1 build:css2 -p watch:*",
     "release:clean": "cross-conf-env rimraf ./npm_package_name",
     "release:mkdir": "cross-conf-env mkdirp npm_package_name/stylesheets",
@@ -44,13 +43,12 @@
     "normalize.css": "^8.0.1"
   },
   "devDependencies": {
-    "bestzip": "^2.1.4",
-    "browser-sync": "^2.26.7",
+    "bestzip": "^2.1.5",
     "cpx": "^1.5.0",
     "cross-conf-env": "^1.1.2",
     "mkdirp": "^0.5.1",
-    "node-sass": "^4.12.0",
+    "node-sass": "^4.13.0",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^2.6.3"
+    "rimraf": "^3.0.0"
   }
 }