Compare commits

...

8 Commits

Author SHA1 Message Date
mrliptontea
15368c666e Version 2.1.1 2019-03-23 00:00:32 +00:00
Grzegorz Rajchman
9f1a1bf3eb Merge pull request #99 from mrliptontea/fix-sidebar-toggler-in-fixed-layout
Fix sidebar toggler in fixed layout
2019-03-22 23:58:38 +00:00
mrliptontea
97502b8372 Fix contextual dropdown padding in mobile view 2019-03-22 23:54:37 +00:00
mrliptontea
aa985c34c6 Merge branch 'v1.x' into fix-sidebar-toggler-in-fixed-layout 2019-03-22 23:48:16 +00:00
mrliptontea
c4f2ccff3f Fix sidebar toggle style with fixed layout enabled 2019-03-22 23:36:10 +00:00
Grzegorz Rajchman
0a44774774 Merge pull request #98 from mrliptontea/backport-v2-fixes-to-v1.x
Backport v2 fixes to v1.x
2019-03-22 23:27:35 +00:00
mrliptontea
ba9ef9be21 Version 1.11.0 2019-03-22 23:23:29 +00:00
mrliptontea
f1df7d1e29 Backport fixes from v2
- Fix #89: RM+ custom menu breaking the layout
- Fix #90: regression in some sidebar layouts
- Fix #93: Agile chart expanding indefinitely when Additional "Go to top" link is enabled
- Fix #94: subtasks indentation
- Fix styling of some flash messages
- Fix horizontal scrollbar appearing when sidebar is on the right
- Fix footer being mispositioned in Agile charts
- Fix positioning of admin menu icons for some plugins
- Improve support for Redmine Tags plugin
- Add separator line between news on the news list
- Improve Redmine 4.0 compatibility
- Update Font Awesome icons to 4.7.0
2019-03-22 23:22:36 +00:00
9 changed files with 72 additions and 39 deletions

View File

@@ -56,6 +56,27 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe
## Changelog ## Changelog
v2.1.1 (2019-03-23):
* Fixed sidebar toggler style when fixed layout is enabled
* Fixed contextual dropdown padding in mobile view
v1.11.0 (2019-03-22):
* Backported fixes from v2:
* Fixed #89: [RM+ custom menu](http://rmplus.pro/en/redmine/plugins/custom_menu) breaking the layout
* Fixed #90: regression in some sidebar layouts
* Fixed #93: Agile chart expanding indefinitely when Additional "Go to top" link is enabled
* Fixed #94: subtasks indentation
* Fixed styling of some flash messages
* Fixed horizontal scrollbar appearing when sidebar is on the right
* Fixed footer being mispositioned in Agile charts
* Fixed positioning of admin menu icons for some plugins
* Improved support for [Redmine Tags](https://www.redmineup.com/pages/plugins/tags) plugin
* Added separator line between news on the news list
* Improved Redmine 4.0 compatibility
* Updated Font Awesome icons to 4.7.0
v2.1.0 (2019-03-22): v2.1.0 (2019-03-22):
* Added CSS grid layout support (off by default because of IE support) * Added CSS grid layout support (off by default because of IE support)

41
package-lock.json generated
View File

@@ -784,12 +784,6 @@
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true "dev": true
}, },
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"glob": { "glob": {
"version": "7.1.3", "version": "7.1.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
@@ -805,9 +799,9 @@
} }
}, },
"js-yaml": { "js-yaml": {
"version": "3.12.1", "version": "3.13.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"argparse": "^1.0.7", "argparse": "^1.0.7",
@@ -1087,9 +1081,9 @@
} }
}, },
"esprima": { "esprima": {
"version": "2.7.3", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
}, },
"esquery": { "esquery": {
"version": "1.0.1", "version": "1.0.1",
@@ -1403,9 +1397,9 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
}, },
"grunt": { "grunt": {
"version": "1.0.3", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz", "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz",
"integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==", "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==",
"requires": { "requires": {
"coffeescript": "~1.10.0", "coffeescript": "~1.10.0",
"dateformat": "~1.0.12", "dateformat": "~1.0.12",
@@ -1418,7 +1412,7 @@
"grunt-legacy-log": "~2.0.0", "grunt-legacy-log": "~2.0.0",
"grunt-legacy-util": "~1.1.1", "grunt-legacy-util": "~1.1.1",
"iconv-lite": "~0.4.13", "iconv-lite": "~0.4.13",
"js-yaml": "~3.5.2", "js-yaml": "~3.13.0",
"minimatch": "~3.0.2", "minimatch": "~3.0.2",
"mkdirp": "~0.5.1", "mkdirp": "~0.5.1",
"nopt": "~3.0.6", "nopt": "~3.0.6",
@@ -1864,12 +1858,12 @@
"dev": true "dev": true
}, },
"js-yaml": { "js-yaml": {
"version": "3.5.5", "version": "3.13.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
"integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
"requires": { "requires": {
"argparse": "^1.0.2", "argparse": "^1.0.7",
"esprima": "^2.6.0" "esprima": "^4.0.0"
} }
}, },
"jsbn": { "jsbn": {
@@ -3171,6 +3165,11 @@
"whet.extend": "~0.9.9" "whet.extend": "~0.9.9"
}, },
"dependencies": { "dependencies": {
"esprima": {
"version": "2.7.3",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
},
"js-yaml": { "js-yaml": {
"version": "3.6.1", "version": "3.6.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz",

View File

@@ -217,7 +217,6 @@ a.collapsible.collapsed,
} }
img.gravatar { img.gravatar {
position: relative;
margin-right: .5em; margin-right: .5em;
} }
} }

View File

@@ -70,16 +70,16 @@
padding-left: $padding-large-horizontal; padding-left: $padding-large-horizontal;
text-align: center; text-align: center;
&::before {
margin-left: 0;
float: none;
}
&.nodata-left { &.nodata-left {
&::before { &::before {
float: left; float: left;
} }
} }
&::before {
margin-left: 0;
float: none;
}
} }
#errorExplanation { #errorExplanation {

View File

@@ -246,10 +246,16 @@
} }
div.attachments { div.attachments {
margin: -$issue-padding; margin: 0;
padding: $issue-padding; padding: 0;
border-top: 0; border-top: 0;
} }
div.description + div.attachments {
margin: $issue-padding (-$issue-padding) (-$issue-padding);
padding: $issue-padding;
border-top: 1px solid $issue-border;
}
} }
div.fileover { div.fileover {
@@ -329,6 +335,10 @@ div.thumbnails {
.issues { .issues {
margin: ($line-height-computed / 2) 0 0; margin: ($line-height-computed / 2) 0 0;
tr {
background-color: transparent;
}
tr:last-child > td { tr:last-child > td {
border-bottom: 0 none; border-bottom: 0 none;
} }

View File

@@ -258,7 +258,6 @@
} }
// //
// Redmine custom menu // Redmine custom menu
// http://rmplus.pro/en/redmine/plugins/custom_menu // http://rmplus.pro/en/redmine/plugins/custom_menu
@@ -319,7 +318,6 @@
} }
// //
// Redmine CRM People // Redmine CRM People
// http://www.redminecrm.com/projects/people/ // http://www.redminecrm.com/projects/people/

View File

@@ -233,7 +233,7 @@
border: 0; border: 0;
.drdn-trigger { .drdn-trigger {
padding: ($btn-padding-vertical * 2) $btn-padding-horizontal; padding: $btn-padding-vertical $btn-padding-horizontal;
} }
.drdn-items { .drdn-items {

View File

@@ -54,16 +54,22 @@
@if $sidebar-position == "left" { @if $sidebar-position == "left" {
left: 0; left: 0;
background-image: inline-svg("chevron-left.svg", (path: (fill: $gray-700)));
@if not $fixed-layout {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
background-image: inline-svg("chevron-left.svg", (path: (fill: $gray-700))); }
} @else { } @else {
right: 0; right: 0;
background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-700)));
@if not $fixed-layout {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-700))); }
} }
&.sidebar-hidden { &.sidebar-hidden {

File diff suppressed because one or more lines are too long