Merge branch 'develop'

akabekobeko · Jul 17, 2019 · 7f42507 · 7f42507
2 parents 389c777 + e91c527
commit 7f42507
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ responsive.css
 *.zip
 package-lock.json
 !.gitignore
+!.prettierignore
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+*.scss
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # ChangeLog
 
+## v1.6.1
+
+### Changes
+
+- Support Redmine v4.0.4 [#153](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/153)
+
+### Bug Fixes
+
+- Issue links on Gantt are not clickable with Redmine v4.0.4 [#152](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/152)
+
 ## v1.6.0
 
 ### Changes

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   redmine:
     container_name: redmine
-    image: redmine:4.0.3-passenger
+    image: redmine:4.0.4-passenger
     restart: always
     ports:
       - 8080:3000

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "minimalflat2",
   "description": "Minimal and flat design theme for Redmine.",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "author": "akabeko",
   "license": "GPL-2.0",
   "main": "index.js",
@@ -44,8 +44,8 @@
     "normalize.css": "^8.0.1"
   },
   "devDependencies": {
-    "bestzip": "^2.1.2",
-    "browser-sync": "^2.26.5",
+    "bestzip": "^2.1.4",
+    "browser-sync": "^2.26.7",
     "cpx": "^1.5.0",
     "cross-conf-env": "^1.1.2",
     "mkdirp": "^0.5.1",

diff --git a/src/scss/App.scss b/src/scss/App.scss
@@ -3142,12 +3142,17 @@ a.close-icon:hover {
   font-size: .8em;
 }
 
+.gantt_subjects_column + td {
+  padding: 0;
+}
+
 .gantt_hdr.nwday {
   background-color: $color_gray_light_b;
 }
-
 .gantt_subjects {
   font-size: .8em;
+  position: relative;
+  z-index: 1;
 }
 .gantt_subjects div {
   line-height: 16px;