Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,12 @@
 # ChangeLog
 
+## v1.4.1
+
+### Bug Fixes
+
+* A project name overlaps with the switch button while mobile site [#131](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/131)
+* Attachment font size and layout [#135](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/135)
+
 ## v1.4.0
 
 ### Changes

README.ja.md

@@ -37,6 +37,22 @@
 3. Redmine 上部のメニューから**管理** - **設定** - **表示**を表示
 4. **テーマ**欄から **minimalflat2** を選択して設定を保存
 
+## 開発
+
+CSS の Transpile (watch) CSS と Web ブラウザーのプレビューを実行できます。
+
+1. `git clone https://github.com/akabekobeko/redmine-theme-minimalflat2.git`
+2. `cd redmine-theme-minimalflat2`
+3. `npm i`
+4. `npm start`
+
+### docker-compose
+
+実際に Redmine を実行して動作確認する場合は以下を実行してください。
+
+1. `docker-compose up -d`
+2. Access to http://localhost:8080/ on web browser
+
 ## ライブラリ
 
 |Library|Author|License|

README.md

@@ -34,6 +34,20 @@ Minimal and flat design theme for Redmine.
 3. Open Redmine page, and go to **Administration > Settings > Display**
 4. Enable the **minimalflat2** from **Theme**, and **save** settings
 
+## Development
+
+Transpile (watch) CSS and preview on web browser.
+
+1. `git clone https://github.com/akabekobeko/redmine-theme-minimalflat2.git`
+2. `cd redmine-theme-minimalflat2`
+3. `npm i`
+4. `npm start`
+
+### docker-compose
+
+1. `docker-compose up -d`
+2. Access to http://localhost:8080/ on web browser
+
 ## Libraries
 
 |Library|Author|License|

package.json

@@ -1,7 +1,7 @@
 {
   "name": "redmine-theme-minimalflat2",
   "description": "Minimal and flat design theme for Redmine.",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "author": "akabeko",
   "license": "GPL-2.0",
   "main": "index.js",
@@ -28,8 +28,8 @@
     "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",
-    "watch": "npm-run-all -p watch:*",
+    "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",
@@ -44,13 +44,13 @@
     "normalize.css": "^8.0.0"
   },
   "devDependencies": {
-    "bestzip": "^1.1.4",
-    "browser-sync": "^2.23.7",
+    "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.8.3",
-    "npm-run-all": "^4.1.2",
+    "node-sass": "^4.9.4",
+    "npm-run-all": "^4.1.3",
     "rimraf": "^2.6.2"
   }
 }

src/assets/issue.html

@@ -193,6 +193,37 @@ <h2>Bug #1</h2>
 </div>
 
 
+<div class="attachments">
+  <div class="contextual">
+    <a title="Edit attached files" class="icon-only icon-edit" href="/redmine/attachments/issues/3998/edit">Edit attached files</a>
+  </div>
+  <table>
+  <tbody><tr>
+    <td>
+      <a class="icon icon-attachment" href="">TheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDog.txt (TheQuickBrownFoxJumpsOverTheLazyDog)</a>    <span class="size">(144 KB)</span>
+      <a class="icon-only icon-download" title="Download" href="">TheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDog.txt (TheQuickBrownFoxJumpsOverTheLazyDog)</a>  </td>
+    <td>TheQuickBrownFoxJumpsOverTheLazyDog</td>
+    <td>
+        <span class="author">akabeko, 2018/02/04 10:55</span>
+    </td>
+    <td>
+        <a data-confirm="Are you sure?" class="delete icon-only icon-del" title="Delete" rel="nofollow" data-method="delete" href="/redmine/attachments/2169">Delete</a>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <a class="icon icon-attachment" href="">TheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDog.txt (TheQuickBrownFoxJumpsOverTheLazyDog)</a>    <span class="size">(144 KB)</span>
+      <a class="icon-only icon-download" title="Download" href="">TheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDogTheQuickBrownFoxJumpsOverTheLazyDog.txt (TheQuickBrownFoxJumpsOverTheLazyDog)</a>  </td>
+    <td>TheQuickBrownFoxJumpsOverTheLazyDog</td>
+    <td>
+        <span class="author">akabeko, 2018/02/04 10:55</span>
+    </td>
+    <td>
+        <a data-confirm="Are you sure?" class="delete icon-only icon-del" title="Delete" rel="nofollow" data-method="delete" href="/redmine/attachments/2170">Delete</a>
+    </td>
+  </tr>
+  </tbody></table>
+  </div>
 
 
 

src/scss/App.scss

@@ -2231,6 +2231,14 @@ div.attachments img {
 div.attachments span.author {
   color: $color_gray;
 }
+div.attachments table {
+  // Release the float of `.contextual` and adjust the position of edit icon.
+  clear: both;
+}
+div.attachments td {
+  // Fix a problem of non line break
+  word-break: break-all;
+}
 
 div.thumbnails {
   margin: .6em;

src/scss/Responsive.scss

@@ -146,7 +146,7 @@
     display: block;
     width: 100%;
     color: $color_white;
-    padding: .3em;
+    padding: .3em .3em .3em 1.5em;
     background: none;
     height: 50px;
     line-height: 40px;