Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
akabekobeko committed Jan 11, 2018
2 parents 0d44926 + 6e6e60f commit e2148a8
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# ChangeLog

## v1.3.6

### Changes

* Support Redmine v3.4.4 [#121](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/121)

## v1.3.5

### Changes
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "redmine-theme-minimalflat2",
"description": "Minimal and flat design theme for Redmine.",
"version": "1.3.5",
"version": "1.3.6",
"author": "akabeko",
"license": "GPL-2.0",
"main": "index.js",
Expand Down Expand Up @@ -42,11 +42,11 @@
},
"devDependencies": {
"bestzip": "^1.1.4",
"browser-sync": "^2.18.13",
"browser-sync": "^2.23.3",
"cpx": "^1.5.0",
"cross-conf-env": "^1.1.2",
"mkdirp": "^0.5.1",
"npm-run-all": "^4.1.1",
"npm-run-all": "^4.1.2",
"rimraf": "^2.6.2",
"stylus": "^0.54.5"
},
Expand Down
13 changes: 10 additions & 3 deletions src/stylus/App.styl
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,9 @@ tr.issue.idnt-9 td.subject {
table.issue-report {
table-layout fixed
}
table.issue-report th {
white-space normal
}

tr.entry {
border 1px solid color_gray_light_b
Expand Down Expand Up @@ -2487,17 +2490,17 @@ table.cal td.today {
table.cal td.today p.day-num {
font-weight bold
}
table.cal .starting a, p.cal.legend .starting {
table.cal .starting a.issue, p.cal.legend .starting {
&:before {
icon(icon_arrow_right, color_green)
}
}
table.cal .ending a, p.cal.legend .ending {
table.cal .ending a.issue, p.cal.legend .ending {
&:before {
icon(icon_arrow_left, color_red)
}
}
table.cal .starting.ending a, p.cal.legend .starting.ending {
table.cal .starting.ending a.issue, p.cal.legend .starting.ending {
&:before {
icon(icon_circle, color_blue)
}
Expand Down Expand Up @@ -2982,6 +2985,10 @@ a.close-icon:hover {
text-overflow ellipsis
}

.gantt_subjects .issue-subject img.icon-gravatar {
margin 2px 5px 0px 2px
}

.task {
position absolute
height 8px
Expand Down

0 comments on commit e2148a8

Please sign in to comment.