Skip to content

Commit

Permalink
Update styles for Redmine 4.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mrliptontea committed May 23, 2021
1 parent 95cb578 commit ea28de2
Show file tree
Hide file tree
Showing 15 changed files with 181 additions and 41 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Latest (master):

* Update styles for Redmine 4.2

v2.14.0 (2021-01-27):

* Merged #220: fixed drag & drop behavior.
Expand Down
5 changes: 5 additions & 0 deletions src/sass/components/_badges.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,8 @@ tr.group .count,
border-color: $green;
color: $green;
}

.badge-issues-count {
border-color: $gray-400;
background-color: $gray-100;
}
4 changes: 4 additions & 0 deletions src/sass/components/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ form {

p.buttons {
margin-bottom: $line-height-computed;

a {
line-height: $line-height-base;
}
}


Expand Down
62 changes: 41 additions & 21 deletions src/sass/components/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,32 @@
}

.contextual {
.drdn {
.drdn-items {
padding: 3px;

a,
span {
padding-top: $pagination-padding-vertical;
padding-bottom: $pagination-padding-vertical;
border: 1px solid transparent;
border-radius: $border-radius-small;
color: $pagination-color;

&:hover,
&:focus {
border-color: $pagination-hover-border;
background-color: $pagination-hover-bg;
color: $pagination-hover-color;
text-decoration: none;

&.icon-del {
color: map-get(map-get($icon-color-map, danger), normal);
}
}
}
}

&:not(.journal-actions) > .drdn {
&.expanded {
> .drdn-trigger {
border-color: $pagination-active-border;
Expand All @@ -85,7 +110,7 @@
}
}

&-trigger {
.drdn-trigger {
padding: $btn-padding-vertical $btn-padding-horizontal-small;
border: 1px solid $pagination-border;
border-radius: $border-radius-base;
Expand All @@ -105,25 +130,20 @@
color: $pagination-hover-color;
}
}
}
}

&-items {
padding: 3px;

a,
span {
padding-top: $pagination-padding-vertical;
padding-bottom: $pagination-padding-vertical;
border: 1px solid transparent;
border-radius: $border-radius-small;
color: $pagination-color;

&:hover {
border-color: $pagination-hover-border;
background-color: $pagination-hover-bg;
color: $pagination-hover-color;
text-decoration: none;
}
}
}
.journal-actions {
.drdn-trigger {
color: map-get(map-get($icon-color-map, default), normal);
}

.drdn-trigger:hover,
.drdn.expanded .drdn-trigger {
color: map-get(map-get($icon-color-map, default), hover);
}

.drdn-content {
top: $input-height-base;
}
}
12 changes: 12 additions & 0 deletions src/sass/components/_elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,10 @@ ul.projects {
li {
list-style-type: none;
}

.archived {
color: $gray-600;
}
}

#projects-index ul.projects {
Expand Down Expand Up @@ -513,6 +517,14 @@ ul.projects {
}
}

table.projects {
.name {
a + span.icon {
margin-left: 5px;
}
}
}

#custom_field_tracker_ids {
label {
margin-right: 10px;
Expand Down
5 changes: 5 additions & 0 deletions src/sass/components/_gantt.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ table.gantt-table {
z-index: 2;
}

.last_gantt_selected_column .gantt_selected_column_container,
.gantt_subjects_container .gantt_subjects * {
z-index: 10;
}

.gantt_subjects_column {
.gantt_hdr {
border-left: 1px solid $gray-500 !important; // stylelint-disable-line declaration-no-important
Expand Down
55 changes: 52 additions & 3 deletions src/sass/components/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ $icon-map: (
icon-toggle-minus: $fa-var-minus-square,
icon-clear-query: $fa-var-times,
icon-import: $fa-var-cloud-upload,
icon-bookmarked-project: $fa-var-tag,
icon-copy-link: $fa-var-clipboard,

// Plugin icons
icon-call: $fa-var-phone,
Expand Down Expand Up @@ -179,6 +181,10 @@ a.icon:empty {
display: inline-block;
}

span.icon + span.icon {
margin-left: $padding-small-vertical;
}

$icons-selector: ();
@each $class, $icon in $icon-map {
$icons-selector: append($icons-selector, unquote(".#{$class}"), "comma");
Expand All @@ -191,6 +197,8 @@ $icons-selector: ();
color: $orange;
} @else if $class == "icon-heart" {
color: $pink;
} @else if $class == "icon-bookmarked-project" {
color: $blue;
}
}

Expand Down Expand Up @@ -586,13 +594,48 @@ dt {
}
}

.my-project {
a.project {
$svg-star: inline-svg("icon-star.svg", (path: (fill: $orange)));
$svg-tag: inline-svg("icon-tag.svg", (path: (fill: $blue)));

&.icon {
padding-left: 0;

&::before {
content: "";
display: none;
margin: 0;
}
}

&.my-project,
&.icon-user,
&.icon-bookmarked-project {
padding-right: $icon-width;
background-image: $svg-star;
background-repeat: no-repeat;
background-position: bottom .2em right 0, bottom .2em right $icon-width;
}

&.icon-bookmarked-project {
background-image: $svg-tag;
}

&.icon-user.icon-bookmarked-project {
padding-right: $icon-width * 2;
background-image: $svg-tag, $svg-star;
}
}

span.my-project {
@extend %fa-icon;

&::before {
content: $fa-var-star;
color: $yellow;
font-size: $font-size-small;
width: $icon-width;
margin-right: 0;
color: $orange;
text-align: center;
}
}

Expand Down Expand Up @@ -894,6 +937,12 @@ div.wiki {
> a {
@extend %fa-icon;

&::before {
width: $icon-width;
margin-right: 0;
text-align: center;
}

&:not([class*="icon"]) {
&::before {
content: $fa-var-comment;
Expand Down
25 changes: 16 additions & 9 deletions src/sass/components/_issue.scss
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@
}
}

div.fileover {
div.fileover,
p.custom-field-filedroplistner.fileover {
background-color: $highlight-bg;
}

Expand Down Expand Up @@ -383,6 +384,10 @@ div.thumbnails {
border-bottom: 0 none;
}

td.subject {
width: 50%;
}

td.checkbox {
display: none;
}
Expand Down Expand Up @@ -535,21 +540,14 @@ div.thumbnails {
padding: $bubble-padding-vertical $bubble-padding-horizontal;
font-size: $font-size-list;

a {
opacity: $icon-opacity;

&:hover {
opacity: $icon-hover-opacity;
}
}

> a.journal-link {
padding-left: $issue-attribute-padding-h;
opacity: 1;
color: $gray-700;

&::before {
content: "";
display: none;
}
}
}
Expand Down Expand Up @@ -721,7 +719,16 @@ div.thumbnails {
clear: left;
}

.journal-actions > a,
.journal-actions .drdn-trigger {
margin: -3px 3px;
padding-top: 3px;
padding-bottom: 3px;
}

.journal-link {
margin: -3px -3px -3px 0;
padding: 3px;
float: right;
}

Expand Down
14 changes: 7 additions & 7 deletions src/sass/components/_jquery-ui.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@

a,
button {
&.ui-state-default {
&.ui-button {
border-color: $header-bg;
background: $header-bg;
box-shadow: none;
color: $header-text;

.ui-icon {
background-image: url("../../../stylesheets/jquery/images/ui-icons_ffffff_256x240.png");
}
}

&.ui-state-hover,
&.ui-state-focus {
&.ui-button:hover {
border-color: darken($header-bg, 12%);
background: darken($header-bg, 10%);
}

.ui-icon {
background-image: url("../../../stylesheets/jquery/images/ui-icons_ffffff_256x240.png");
}
}
}

Expand Down
13 changes: 13 additions & 0 deletions src/sass/components/_jstoolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,16 @@ div.jstElements {
&::before { content: $fa-var-question-circle; }
}
}

body {
.table-generator {
td {
border-color: $tab-border;
}

td.selected-cell,
td:hover {
background-color: $brand-primary;
}
}
}
1 change: 1 addition & 0 deletions src/sass/components/_list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ table.list {
&.last_notes,
&.last_updated_by,
&.name,
&.parent-subject,
&.priority,
&.relations,
&.roles,
Expand Down
18 changes: 18 additions & 0 deletions src/sass/components/_login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,21 @@
background-repeat: no-repeat;
background-position: right $input-padding-horizontal center;
}


//
// Two-factor authentication
// --------------------------------------------------

.controller-twofa {
.splitcontentleft {
width: auto;
padding-right: 0;
}
}

ul.twofa_backup_codes {
margin-left: 0;
padding: 0;
list-style-type: none;
}
2 changes: 1 addition & 1 deletion stylesheets/application.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions svg/icon-star.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions svg/icon-tag.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ea28de2

Please sign in to comment.