Merge branch 'develop'

akabekobeko · Nov 13, 2018 · bd251f2 · bd251f2
2 parents 8028bb7 + cb3ee29
commit bd251f2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.4.2
+
+### Bug Fixes
+
+* Custom fields with long text are centered in the issues table - テキスト系のカスタムフィールドがテーブルで表示すると中央寄せになっている [#137](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/137)
+
 ## v1.4.1
 
 ### Bug Fixes

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "redmine-theme-minimalflat2",
   "description": "Minimal and flat design theme for Redmine.",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "author": "akabeko",
   "license": "GPL-2.0",
   "main": "index.js",

diff --git a/src/assets/issues.html b/src/assets/issues.html
@@ -320,36 +320,38 @@ <h2>Sample</h2>
       <th class="checkbox hide-when-print">
         <input name="check_all" id="check_all" value="" class="toggle-selection" title="Check all/Uncheck all" type="checkbox">
       </th>
-        <th><a title="Sort by &quot;#&quot;" href="projects/sample/issues?sort=id%3Adesc%2Cpriority">#</a></th>
-        <th><a title="Sort by &quot;Tracker&quot;" href="projects/sample/issues?sort=tracker%2Cpriority%2Cid%3Adesc">Tracker</a></th>
-        <th><a title="Sort by &quot;Status&quot;" href="projects/sample/issues?sort=status%2Cpriority%2Cid%3Adesc">Status</a></th>
-        <th><a title="Sort by &quot;Priority&quot;" class="sort asc" href="projects/sample/issues?sort=priority%3Adesc%2Cid%3Adesc">Priority</a></th>
-        <th><a title="Sort by &quot;Subject&quot;" href="projects/sample/issues?sort=subject%2Cpriority%2Cid%3Adesc">Subject</a></th>
-        <th><a title="Sort by &quot;Assignee&quot;" href="projects/sample/issues?sort=assigned_to%2Cpriority%2Cid%3Adesc">Assignee</a></th>
-        <th><a title="Sort by &quot;Updated&quot;" href="projects/sample/issues?sort=updated_on%3Adesc%2Cpriority%2Cid%3Adesc">Updated</a></th>
-        <th><a title="Sort by &quot;% Done&quot;" href="projects/sample/issues?sort=done_ratio%2Cpriority%2Cid%3Adesc">% Done</a></th>
+        <th><a title="Sort by &quot;#&quot;" href="">#</a></th>
+        <th><a title="Sort by &quot;Tracker&quot;" href="">Tracker</a></th>
+        <th><a title="Sort by &quot;Status&quot;" href="">Status</a></th>
+        <th><a title="Sort by &quot;Priority&quot;" class="sort asc" href="">Priority</a></th>
+        <th><a title="Sort by &quot;Subject&quot;" href="">Subject</a></th>
+        <th><a title="Sort by &quot;Assignee&quot;" href="">Assignee</a></th>
+        <th><a title="Sort by &quot;Updated&quot;" href="">Updated</a></th>
+        <th><a title="Sort by &quot;% Done&quot;" href="">% Done</a></th>
+        <th><a title="Sort by &quot;Sample&quot;" href="">CF String</a></th>
+        <th><a title="Sort by &quot;Sample&quot;" href="">CF Text</a></th>
     </tr>
   </thead>
   <tbody>
   <tr id="issue-2" class="hascontextmenu odd issue tracker-1 status-1 priority-1 priority-lowest created-by-me assigned-to-me">
     <td class="checkbox hide-when-print"><input name="ids[]" value="2" type="checkbox"></td>
-    <td class="id"><a href="issues/2">2</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">Low</td><td class="subject"><a href="issues/2">Low</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:37 AM</td><td class="done_ratio"><table class="progress progress-0"><tbody><tr><td style="width: 100%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td>
+    <td class="id"><a href="issues/2">2</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">Low</td><td class="subject"><a href="issues/2">Low</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:37 AM</td><td class="done_ratio"><table class="progress progress-0"><tbody><tr><td style="width: 100%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td><td class="cf_1 string">SampleSample</td><td class="cf_2 text"><p>LongTextLong TextLong TextLong TextLong TextLong Text</p></td>
   </tr>
   <tr id="issue-1" class="hascontextmenu even issue tracker-1 status-1 priority-2 priority-default created-by-me assigned-to-me">
     <td class="checkbox hide-when-print"><input name="ids[]" value="1" type="checkbox"></td>
-    <td class="id"><a href="issues/1">1</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">Normal</td><td class="subject"><a href="issues/1">Normal</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:42 AM</td><td class="done_ratio"><table class="progress progress-30"><tbody><tr><td style="width: 30%;" class="closed" title="30%"></td><td style="width: 70%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td>
+    <td class="id"><a href="issues/1">1</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">Normal</td><td class="subject"><a href="issues/1">Normal</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:42 AM</td><td class="done_ratio"><table class="progress progress-30"><tbody><tr><td style="width: 30%;" class="closed" title="30%"></td><td style="width: 70%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td><td class="cf_1 string">SampleSample</td><td class="cf_2 text"><p>LongTextLong TextLong TextLong TextLong TextLong Text</p></td>
   </tr>
   <tr id="issue-3" class="hascontextmenu odd issue tracker-1 status-1 priority-3 priority-high3 created-by-me assigned-to-me">
     <td class="checkbox hide-when-print"><input name="ids[]" value="3" type="checkbox"></td>
-    <td class="id"><a href="issues/3">3</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">High</td><td class="subject"><a href="issues/3">High</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:40 AM</td><td class="done_ratio"><table class="progress progress-0"><tbody><tr><td style="width: 100%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td>
+    <td class="id"><a href="issues/3">3</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">High</td><td class="subject"><a href="issues/3">High</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:40 AM</td><td class="done_ratio"><table class="progress progress-0"><tbody><tr><td style="width: 100%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td><td class="cf_1 string">SampleSample</td><td class="cf_2 text"><p>LongTextLong TextLong TextLong TextLong TextLong Text</p></td>
   </tr>
   <tr id="issue-4" class="hascontextmenu even issue tracker-1 status-1 priority-4 priority-high2 created-by-me assigned-to-me">
     <td class="checkbox hide-when-print"><input name="ids[]" value="4" type="checkbox"></td>
-    <td class="id"><a href="issues/4">4</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">Urgent</td><td class="subject"><a href="issues/4">Urgent</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:41 AM</td><td class="done_ratio"><table class="progress progress-0"><tbody><tr><td style="width: 100%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td>
+    <td class="id"><a href="issues/4">4</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">Urgent</td><td class="subject"><a href="issues/4">Urgent</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:41 AM</td><td class="done_ratio"><table class="progress progress-0"><tbody><tr><td style="width: 100%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td><td class="cf_1 string">SampleSample</td>
   </tr>
   <tr id="issue-5" class="hascontextmenu odd issue tracker-1 status-1 priority-5 priority-highest created-by-me assigned-to-me">
     <td class="checkbox hide-when-print"><input name="ids[]" value="5" type="checkbox"></td>
-    <td class="id"><a href="issues/5">5</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">Immediate</td><td class="subject"><a href="issues/5">Immediate</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:42 AM</td><td class="done_ratio"><table class="progress progress-0"><tbody><tr><td style="width: 100%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td>
+    <td class="id"><a href="issues/5">5</a></td><td class="tracker">Bug</td><td class="status">New</td><td class="priority">Immediate</td><td class="subject"><a href="issues/5">Immediate</a></td><td class="assigned_to"><a class="user active" href="users/1">Redmine Admin</a></td><td class="updated_on">07/11/2017 05:42 AM</td><td class="done_ratio"><table class="progress progress-0"><tbody><tr><td style="width: 100%;" class="todo"></td></tr></tbody></table><p class="percent"></p></td><td class="cf_1 string">SampleSample</td><td class="cf_2 text"><p>LongTextLong TextLong TextLong TextLong TextLong Text</p></td>
   </tr>
   </tbody>
 </table>

diff --git a/src/scss/App.scss b/src/scss/App.scss
@@ -672,6 +672,10 @@ table.list td.id {
 table.list td.name, table.list td.description, table.list td.subject, table.list td.comments, table.list td.roles, table.list td.attachments {
   text-align: left;
 }
+// Custom Field, Since "string" seems to be for short texts, it should be left justified by "text".
+table.list td[class^='cf_'].text, table.list td[class*=' cf_'].text {
+  text-align: left;
+}
 table.list td.attachments a {
   display: block;
 }