Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.5.0
+
+### Changes
+
+* Support Redmine v4.0 [#134](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/134)
+
 ## v1.4.2
 
 ### Bug Fixes

README.ja.md

@@ -1,6 +1,6 @@
 # minimalflat2
 
-![Redmine](https://img.shields.io/badge/Redmine-3.4-brightgreen.svg)
+![Redmine](https://img.shields.io/badge/Redmine-4.0-brightgreen.svg)
 
 簡素でフラットな外観の Redmine テーマです。
 
@@ -51,7 +51,11 @@ CSS の Transpile (watch) CSS と Web ブラウザーのプレビューを実行
 実際に Redmine を実行して動作確認する場合は以下を実行してください。
 
 1. `docker-compose up -d`
-2. Access to http://localhost:8080/ on web browser
+2. Web ブラウザーで http://localhost:8080/ にアクセス
+3. Redmine に管理者としてログイン
+4. 管理画面からテーマとして `minimalflat2` を選択
+
+停止コマンドは `docker-compose stop` です。
 
 ## ライブラリ
 

README.md

@@ -1,6 +1,6 @@
 # minimalflat2
 
-![Redmine](https://img.shields.io/badge/Redmine-3.4-brightgreen.svg)
+![Redmine](https://img.shields.io/badge/Redmine-4.0-brightgreen.svg)
 
 Minimal and flat design theme for Redmine.
 
@@ -47,6 +47,10 @@ Transpile (watch) CSS and preview on web browser.
 
 1. `docker-compose up -d`
 2. Access to http://localhost:8080/ on web browser
+3. Sign in to Redmine as an administrator
+4. Select `mytheme` as the theme from the administration screen.
+
+Stop is `docker-compose stop`.
 
 ## Libraries
 

docker-compose.yml

@@ -1,23 +1,30 @@
 version: "3"
 services:
-  app:
+  redmine:
     container_name: redmine
-    image: sameersbn/redmine
+    image: redmine:4.0-passenger
+    restart: always
+    ports:
+      - 8080:3000
     environment:
-      - DB_HOST=db
-      - DB_NAME=redmine_production
-      - DB_USER=root
-      - DB_PASS=root
-    links:
-      - db
+      TZ: Asia/Tokyo
+      REDMINE_DB_MYSQL: mysql
+      REDMINE_DB_DATABASE: redmine_minimalflat2
+      REDMINE_DB_USERNAME: redmine_minimalflat2
+      REDMINE_DB_PASSWORD: redmine_minimalflat2
+      REDMINE_DB_ENCODING: utf8mb4
     depends_on:
-      - db
-    ports:
-      - 8080:80
+      - mysql
     volumes:
-      - ./src/assets:/home/redmine/redmine/public/themes/minimalflat2/
-  db:
-    image: mysql
+      - ./src/assets:/usr/src/redmine/public/themes/minimalflat2
+  mysql:
+    container_name: mysql
+    image: mysql:5.7
+    restart: always
     environment:
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_DATABASE=redmine_production
+      TZ: Asia/Tokyo
+      MYSQL_ROOT_PASSWORD: P@ssw0rd
+      MYSQL_DATABASE: redmine_minimalflat2
+      MYSQL_USER: redmine_minimalflat2
+      MYSQL_PASSWORD: redmine_minimalflat2
+    command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_bin

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "redmine-theme-minimalflat2",
+  "name": "minimalflat2",
   "description": "Minimal and flat design theme for Redmine.",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "author": "akabeko",
   "license": "GPL-2.0",
   "main": "index.js",
@@ -30,27 +30,27 @@
     "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": "rimraf ./minimalflat2",
-    "release:mkdir": "mkdirp minimalflat2/stylesheets",
-    "release:css1": "node-sass ./src/scss/App.scss ./minimalflat2/stylesheets/application.css -r --output-style compressed",
-    "release:css2": "node-sass ./src/scss/Responsive.scss ./minimalflat2/stylesheets/responsive.css -r --output-style compressed",
-    "release:copy-src": "cpx \"./src/assets/**/*(theme.js|favicon.ico|icon.svg|icon.eot|icon.ttf|icon.woff|!(*.*))\" ./minimalflat2",
-    "release:copy-img": "cpx \"./src/assets/images/*.*\" ./minimalflat2/images",
-    "release:copy-doc": "cpx \"./*(CHANGELOG.md|LICENSE.txt|!(Vagrantfile|*.*))\" ./minimalflat2",
-    "release:archive": "cross-conf-env bestzip minimalflat2-npm_package_version.zip ./minimalflat2",
+    "release:clean": "cross-conf-env rimraf ./npm_package_name",
+    "release:mkdir": "cross-conf-env mkdirp npm_package_name/stylesheets",
+    "release:css1": "cross-conf-env node-sass ./src/scss/App.scss ./npm_package_name/stylesheets/application.css -r --output-style compressed",
+    "release:css2": "cross-conf-env node-sass ./src/scss/Responsive.scss ./npm_package_name/stylesheets/responsive.css -r --output-style compressed",
+    "release:copy-src": "cross-conf-env cpx \"./src/assets/**/*(theme.js|favicon.ico|icon.svg|icon.eot|icon.ttf|icon.woff|!(*.*))\" ./npm_package_name",
+    "release:copy-img": "cross-conf-env cpx \"./src/assets/images/**/*.*\" ./npm_package_name/images",
+    "release:copy-doc": "cross-conf-env cpx \"./*(CHANGELOG.md|LICENSE|!(*.*))\" ./npm_package_name",
+    "release:archive": "cross-conf-env bestzip npm_package_name-npm_package_version.zip ./npm_package_name",
     "release": "npm-run-all -s release:clean release:mkdir release:copy-* release:css* release:archive"
   },
   "dependencies": {
-    "normalize.css": "^8.0.0"
+    "normalize.css": "^8.0.1"
   },
   "devDependencies": {
     "bestzip": "^2.1.2",
     "browser-sync": "^2.26.3",
     "cpx": "^1.5.0",
     "cross-conf-env": "^1.1.2",
     "mkdirp": "^0.5.1",
-    "node-sass": "^4.9.4",
-    "npm-run-all": "^4.1.3",
-    "rimraf": "^2.6.2"
+    "node-sass": "^4.11.0",
+    "npm-run-all": "^4.1.5",
+    "rimraf": "^2.6.3"
   }
 }