Skip to content

Commit

Permalink
Merge pull request #99 from mrliptontea/fix-sidebar-toggler-in-fixed-…
Browse files Browse the repository at this point in the history
…layout

Fix sidebar toggler in fixed layout
  • Loading branch information
Grzegorz Rajchman authored Mar 22, 2019
2 parents a916025 + 97502b8 commit 9f1a1bf
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 39 deletions.
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,27 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe

## Changelog

Latest:

* 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):

* Added CSS grid layout support (off by default because of IE support)
Expand Down
41 changes: 20 additions & 21 deletions package-lock.json

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

1 change: 0 additions & 1 deletion src/sass/components/_elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ a.collapsible.collapsed,
}

img.gravatar {
position: relative;
margin-right: .5em;
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/sass/components/_flash.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@
padding-left: $padding-large-horizontal;
text-align: center;

&::before {
margin-left: 0;
float: none;
}

&.nodata-left {
&::before {
float: left;
}
}

&::before {
margin-left: 0;
float: none;
}
}

#errorExplanation {
Expand Down
14 changes: 12 additions & 2 deletions src/sass/components/_issue.scss
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,16 @@
}

div.attachments {
margin: -$issue-padding;
padding: $issue-padding;
margin: 0;
padding: 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 {
Expand Down Expand Up @@ -329,6 +335,10 @@ div.thumbnails {
.issues {
margin: ($line-height-computed / 2) 0 0;

tr {
background-color: transparent;
}

tr:last-child > td {
border-bottom: 0 none;
}
Expand Down
2 changes: 0 additions & 2 deletions src/sass/components/_plugins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@
}



//
// Redmine custom menu
// http://rmplus.pro/en/redmine/plugins/custom_menu
Expand Down Expand Up @@ -319,7 +318,6 @@
}



//
// Redmine CRM People
// http://www.redminecrm.com/projects/people/
Expand Down
2 changes: 1 addition & 1 deletion src/sass/components/_responsive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
border: 0;

.drdn-trigger {
padding: ($btn-padding-vertical * 2) $btn-padding-horizontal;
padding: $btn-padding-vertical $btn-padding-horizontal;
}

.drdn-items {
Expand Down
18 changes: 12 additions & 6 deletions src/sass/javascripts/_sidebar-toggler.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,22 @@

@if $sidebar-position == "left" {
left: 0;
border-left: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
background-image: inline-svg("chevron-left.svg", (path: (fill: $gray-700)));

@if not $fixed-layout {
border-left: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
} @else {
right: 0;
border-right: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-700)));

@if not $fixed-layout {
border-right: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
}

&.sidebar-hidden {
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/application.css

Large diffs are not rendered by default.

0 comments on commit 9f1a1bf

Please sign in to comment.