Skip to content

Commit

Permalink
compatibility with Redmine 3.2.0 layout, fixes mrliptontea#21
Browse files Browse the repository at this point in the history
  • Loading branch information
mrliptontea committed Dec 14, 2015
1 parent 3b95b93 commit a931c63
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 18 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Latest (master):
* Fixed #19: missing text wrapping for long text custom fields
* Fixed #20: applied Font Awesome font-family for icons in Time Tracker overview
* Fixed duplicated pencil icon for Description in issue form in Redmine 3.1.2+
* Fixed #21: added styling for compatibility with layout changes in Redmine 3.2.0

v1.7.2 (2015-10-12):

Expand Down
2 changes: 1 addition & 1 deletion plugins/redmine_backlogs/global.css

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

2 changes: 1 addition & 1 deletion plugins/redmine_backlogs/jquery/jquery-ui.css

Large diffs are not rendered by default.

21 changes: 16 additions & 5 deletions src/sass/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -621,15 +621,26 @@ fieldset#filters {
min-width: 130px;
}
}
}

&.add-filter {
padding-top: $table-condensed-cell-padding * 2;
text-align: right;
vertical-align: top;
}
.add-filter {
text-align: right;
}

td.add-filter {
padding-top: $table-condensed-cell-padding * 2;
vertical-align: top;
}

div.add-filter {
padding-top: $table-condensed-cell-padding;
}
}

#filters-table {
float: left;
}


/**
* Reset label style for trackers selector in custom field editor
Expand Down
56 changes: 50 additions & 6 deletions src/sass/components/_issue.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
float: left;
}

table img.gravatar {
.assigned-to img.gravatar {
position: relative;
top: -3px;
margin-right: 5px;
Expand Down Expand Up @@ -128,7 +128,8 @@
}

@if $color-status {
.attributes td.status {
.attributes td.status,
.attribute.status .value {
display: inline-block;
width: auto;
min-width: 1em;
Expand All @@ -143,13 +144,56 @@
text-transform: uppercase;
}

&.status-1 .attributes td.status {
background-color: $brand-info;
&.status-1 {
.attributes td.status,
.attribute.status .value {
background-color: $brand-info;
}
}

&.closed {
.attributes td.status,
.attribute.status .value {
background-color: $brand-danger;
}
}
}

.splitcontentleft {
@media screen and (min-width: $screen-lg-min) {
width: auto;
}
}

.attribute {
@extend %clearfix;

.label,
.value {
padding: $issue-attribute-padding-v $issue-attribute-padding-h $issue-attribute-padding-v 0;
}

&.closed .attributes td.status {
background-color: $brand-danger;
.label {
width: 25%;
float: left;

@media screen and (min-width: $screen-lg-min) {
width: 14em;
}
}

.value {
color: $gray-darkest;

@media screen and (min-width: $screen-lg-min) {
width: auto;
min-width: 14em + 16em;
}
}
}

table.progress {
width: 80px;
}

div.attachments {
Expand Down
26 changes: 22 additions & 4 deletions src/sass/components/_pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,34 @@
// Pagination (multiple pages)
// --------------------------------------------------
.pagination {
.previous,
.next,
.page {
.pages {
display: inline-block;
margin: 0;
padding: 0;
}

li {
display: inline-block;
margin-right: .3em;
list-style: none;
}

li > a,
li > span,
> .previous,
> .next,
> .page {
display: inline-block;
padding: $pagination-padding-vertical $pagination-padding-horizontal;
border: 1px solid $pagination-border;
border-radius: $border-radius-base;
background-color: $pagination-bg;
color: $pagination-color;
text-decoration: none;
white-space: nowrap;
}

a {
&:hover,
&:focus {
border-color: $pagination-hover-border;
Expand All @@ -21,7 +38,8 @@
}
}

.page.current {
.page.current,
.current > span {
border-color: $pagination-active-border;
background-color: $pagination-active-bg;
color: $pagination-active-color;
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/application.css

Large diffs are not rendered by default.

0 comments on commit a931c63

Please sign in to comment.