Skip to content

Commit

Permalink
Merge pull request #98 from mrliptontea/backport-v2-fixes-to-v1.x
Browse files Browse the repository at this point in the history 
Backport v2 fixes to v1.x
  • Loading branch information
Grzegorz Rajchman authored Mar 22, 2019
2 parents b799919 + ba9ef9b commit 0a44774
Show file tree
Hide file tree
Showing 34 changed files with 3,517 additions and 759 deletions.
16 changes: 16 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,22 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe

## Changelog

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

v1.10.0 (2019-03-12):

* Fixed #86: added support for redmine_hearts plugin
Expand Down
Binary file modified fonts/FontAwesome.otf
View file
Binary file not shown.
Binary file modified fonts/fontawesome-webfont.eot
View file
Binary file not shown.
3,185 changes: 2,668 additions & 517 deletions fonts/fontawesome-webfont.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fonts/fontawesome-webfont.ttf
View file
Binary file not shown.
Binary file modified fonts/fontawesome-webfont.woff
View file
Binary file not shown.
Binary file added fonts/fontawesome-webfont.woff2
View file
Binary file not shown.
36 changes: 15 additions & 21 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {
"autoprefixer": "^9.4.8",
"grunt": "^1.0.3",
"grunt": "^1.0.4",
"grunt-contrib-uglify": "^4.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-postcss": "^0.9.0",
Expand Down
22 changes: 12 additions & 10 deletions src/sass/components/_admin.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
// --------------------------------------------------

#admin-menu {
ul:nth-child(n) {
li {
list-style-type: none;

> a:not(.icon-only) {
padding-left: $sidebar-padding-horizontal + 5px + 20px;
background-repeat: no-repeat;
background-position: $sidebar-padding-horizontal center;
}
}
}

#admin-index > & {
ul {
margin: 0;
Expand All @@ -19,16 +31,6 @@
background-position: 0 center;
}
}

li {
list-style-type: none;

> a:not(.icon-only) {
padding-left: $sidebar-padding-horizontal + 5px + 20px;
background-repeat: no-repeat;
background-position: $sidebar-padding-horizontal center;
}
}
}


Expand Down
19 changes: 19 additions & 0 deletions src/sass/components/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

html {
overflow-y: scroll;
tab-size: 4;
}

body {
Expand Down Expand Up @@ -41,6 +42,19 @@ a {
}
}

// Remove the tapping delay on clickable elements
a,
area,
button,
input,
label,
select,
summary,
textarea,
[tabindex] {
touch-action: manipulation;
}

h1 {
margin: 0;
font-size: 2em; // ~28px
Expand Down Expand Up @@ -127,6 +141,11 @@ hr {
margin-bottom: $line-height-computed;
border: 0;
border-top: 1px solid $hr-border;

li & {
margin-top: $line-height-computed / 2;
margin-bottom: $line-height-computed / 2;
}
}

abbr[title] {
Expand Down
1 change: 1 addition & 0 deletions src/sass/components/_buttons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

input[type="button"],
input[type="submit"],
input[type="reset"],
button {
@include button-size($btn-padding-vertical, $btn-padding-horizontal, $font-size-base, $line-height-base, $border-radius-base);
display: inline-block;
Expand Down
132 changes: 74 additions & 58 deletions src/sass/components/_content.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,22 @@
// --------------------------------------------------

#sidebar {
padding: $padding-side $sidebar-padding-horizontal;
#main & {
padding: $padding-side $sidebar-padding-horizontal;
}

#main.nosidebar & {
margin: 0;
padding: 0;
border: 0 none;

@if $flexbox-layout {
flex: 0 0 auto;
} @else {
width: 0;
float: none;
}
}

@if $flexbox-layout {
flex: 0 0 $sidebar-width-computed;
Expand Down Expand Up @@ -58,19 +73,6 @@
}
}

.nosidebar & {
margin: 0;
padding: 0;
border: 0 none;

@if $flexbox-layout {
flex: 0 0 auto;
} @else {
width: 0;
float: none;
}
}

h3 {
margin-top: $line-height-computed * 1.5;
}
Expand All @@ -81,58 +83,72 @@
}

ul {
margin: 0 0 ($line-height-computed / 2);
padding: 0;

@if $sidebar-position == "left" {
margin-right: -($sidebar-padding-horizontal);
} @else {
margin-left: -($sidebar-padding-horizontal);
}
}

li {
margin: 0;
padding: 0;
list-style-type: none;

> a:not(.icon-only) {
display: block;
padding: $sidebar-padding-vertical $sidebar-padding-horizontal;
border: 1px solid transparent;
&:nth-child(n) {
margin: 0 0 ($line-height-computed / 2);
padding: 0;

@if $sidebar-position == "left" {
border-left-width: 3px;
border-radius: $border-radius-large 0 0 $border-radius-large;
} @else {
border-right-width: 3px;
border-radius: 0 $border-radius-large $border-radius-large 0;
}

&:hover {
background-color: $sidebar-link-hover-bg;
text-decoration: none;
margin-right: -($sidebar-padding-horizontal);
}
}

&.selected {
border-color: $sidebar-link-active-border;
background-color: $sidebar-link-active-bg;
color: $sidebar-link-active-text;

@if $sidebar-position == "left" {
margin-right: -1px;
border-right-color: $body-bg;
border-left-color: $sidebar-link-active-side;
box-shadow: -3px 1px 2px rgba(0, 0, 0, .1);
} @else {
margin-left: -1px;
border-right-color: $sidebar-link-active-side;
border-left-color: $body-bg;
box-shadow: 3px 1px 2px rgba(0, 0, 0, .1);
&:not(.watchers) {
li {
margin: 0;
padding: 0;
list-style-type: none;

> a:not(.icon-only) {
display: block;
padding: $sidebar-padding-vertical $sidebar-padding-horizontal;
border: 1px solid transparent;

@if $sidebar-position == "left" {
border-left-width: 3px;
border-radius: $border-radius-large 0 0 $border-radius-large;
} @else {
border-right-width: 3px;
border-radius: 0 $border-radius-large $border-radius-large 0;
}

&:hover {
background-color: $sidebar-link-hover-bg;
text-decoration: none;
}

&.selected {
border-color: $sidebar-link-active-border;
background-color: $sidebar-link-active-bg;
color: $sidebar-link-active-text;

@if $sidebar-position == "left" {
margin-right: -1px;
border-right-color: $body-bg;
border-left-color: $sidebar-link-active-side;
box-shadow: -3px 1px 2px rgba(0, 0, 0, .1);
} @else {
margin-left: -1px;
border-right-color: $sidebar-link-active-side;
border-left-color: $body-bg;
box-shadow: 3px 1px 2px rgba(0, 0, 0, .1);
}
}
}
}
}
}

// Special treatment for anchor tags directly under sidebar tag
> a {
margin: $sidebar-padding-vertical $sidebar-padding-horizontal;

@if $sidebar-position == "left" {
margin-left: $sidebar-padding-horizontal + 3px;
} @else {
margin-right: $sidebar-padding-horizontal + 3px;
margin-left: 0;
}
}
}

#footer {
Expand Down
Loading

0 comments on commit 0a44774

Please sign in to comment.