Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
akabekobeko committed Apr 22, 2018
2 parents 57fbe2e + 687ba06 commit 66e0925
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 19 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# ChangeLog

## v1.4.0

### Changes

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


## v1.3.6

### Changes
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
"release": "npm-run-all -s release:clean release:mkdir release:copy-* release:css* release:archive"
},
"dependencies": {
"normalize.css": "^7.0.0"
"normalize.css": "^8.0.0"
},
"devDependencies": {
"bestzip": "^1.1.4",
"browser-sync": "^2.23.5",
"browser-sync": "^2.23.7",
"cpx": "^1.5.0",
"cross-conf-env": "^1.1.2",
"mkdirp": "^0.5.1",
"node-sass": "^4.7.2",
"node-sass": "^4.8.3",
"npm-run-all": "^4.1.2",
"rimraf": "^2.6.2"
}
Expand Down
21 changes: 8 additions & 13 deletions src/scss/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -534,11 +534,6 @@ a#toggle-completed-versions {
color: $color_gray;
}

a.toggle-checkboxes:before {
@include iconbase();
@include icon($icon_check, $color_green);
}

/***** Dropdown *****/
.drdn {
position: relative;
Expand Down Expand Up @@ -1440,13 +1435,11 @@ p.footnote {
margin-top: 0;
margin-bottom: 0;
}
.ltr {
direction: ltr !important;
unicode-bidi: bidi-override;
.wiki-class-ltr {
direction:ltr !important;
}
.rtl {
direction: rtl !important;
unicode-bidi: bidi-override;
.wiki-class-rtl {
direction:rtl !important;
}

div.issue div.subject div div {
Expand Down Expand Up @@ -2102,8 +2095,9 @@ div.changeset-changes > ul > li {
padding-left: 0 !important;
}

#preview fieldset {
fieldset.preview {
margin-top: 1em;
min-width: inherit;
background: url(../images/draft.png);
}

Expand Down Expand Up @@ -2902,11 +2896,12 @@ a.wiki-anchor:hover {
text-decoration: none;
}

h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor {
h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor, h4:hover a.wiki-anchor, h5:hover a.wiki-anchor, h6:hover a.wiki-anchor {
display: inline;
color: $color_gray_light_c;
}


div.wiki img {
vertical-align: middle;
max-width: 100%;
Expand Down
6 changes: 3 additions & 3 deletions src/scss/Responsive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -979,19 +979,19 @@
}

/* attachment upload form */
#attachments_fields span {
.attachments_fields span {
position: relative;
clear: both;
margin-bottom: 1em;
white-space: normal;
}
#attachments_fields span a.remove-upload {
.attachments_fields span a.remove-upload {
position: absolute;
top: 0;
right: 0;
}

#attachments_fields input.description {
.attachments_fields input.description {
margin-left: 0;
width: 100%;
} }
Expand Down

0 comments on commit 66e0925

Please sign in to comment.