Merge pull request #227 from mrliptontea/update-for-redmine-four-two-one

Update styles for Redmine 4.2.1

CHANGELOG.md

@@ -1,3 +1,7 @@
+Latest (master):
+
+* Update styles for Redmine 4.2
+
 v2.14.0 (2021-01-27):
 
 * Merged #220: fixed drag & drop behavior.

src/sass/components/_badges.scss

@@ -52,3 +52,8 @@ tr.group .count,
   border-color: $green;
   color: $green;
 }
+
+.badge-issues-count {
+  border-color: $gray-400;
+  background-color: $gray-100;
+}

src/sass/components/_buttons.scss

@@ -176,6 +176,10 @@ form {
 
 p.buttons {
   margin-bottom: $line-height-computed;
+
+  a {
+    line-height: $line-height-base;
+  }
 }
 
 

src/sass/components/_dropdown.scss

@@ -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;
@@ -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;
@@ -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;
   }
 }

src/sass/components/_elements.scss

@@ -461,6 +461,10 @@ ul.projects {
   li {
     list-style-type: none;
   }
+
+  .archived {
+    color: $gray-600;
+  }
 }
 
 #projects-index ul.projects {
@@ -513,6 +517,14 @@ ul.projects {
   }
 }
 
+table.projects {
+  .name {
+    a + span.icon {
+      margin-left: 5px;
+    }
+  }
+}
+
 #custom_field_tracker_ids {
   label {
     margin-right: 10px;

src/sass/components/_gantt.scss

@@ -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

src/sass/components/_icons.scss

@@ -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,
@@ -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");
@@ -191,6 +197,8 @@ $icons-selector: ();
         color: $orange;
       } @else if $class == "icon-heart" {
         color: $pink;
+      } @else if $class == "icon-bookmarked-project" {
+        color: $blue;
       }
     }
 
@@ -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;
   }
 }
 
@@ -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;

src/sass/components/_issue.scss

@@ -297,7 +297,8 @@
   }
 }
 
-div.fileover {
+div.fileover,
+p.custom-field-filedroplistner.fileover {
   background-color: $highlight-bg;
 }
 
@@ -383,6 +384,10 @@ div.thumbnails {
       border-bottom: 0 none;
     }
 
+    td.subject {
+      width: 50%;
+    }
+
     td.checkbox {
       display: none;
     }
@@ -535,14 +540,6 @@ 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;
@@ -550,6 +547,7 @@ div.thumbnails {
 
       &::before {
         content: "";
+        display: none;
       }
     }
   }
@@ -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;
 }
 

src/sass/components/_jquery-ui.scss

@@ -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");
-    }
   }
 }
 

src/sass/components/_jstoolbar.scss

@@ -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;
+    }
+  }
+}

src/sass/components/_list.scss

@@ -108,6 +108,7 @@ table.list {
     &.last_notes,
     &.last_updated_by,
     &.name,
+    &.parent-subject,
     &.priority,
     &.relations,
     &.roles,

src/sass/components/_login.scss

@@ -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;
+}

svg/icon-star.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="red" d="M1728 647q0 22-26 48l-363 354 86 500q1 7 1 20 0 21-10.5 35.5t-30.5 14.5q-19 0-40-12l-449-236-449 236q-22 12-40 12-21 0-31.5-14.5t-10.5-35.5q0-6 2-20l86-500-364-354q-25-27-25-48 0-37 56-46l502-73 225-455q19-41 49-41t49 41l225 455 502 73q56 9 56 46z"/></svg>

svg/icon-tag.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="red" d="M576 448q0-53-37.5-90.5t-90.5-37.5-90.5 37.5-37.5 90.5 37.5 90.5 90.5 37.5 90.5-37.5 37.5-90.5zm1067 576q0 53-37 90l-491 492q-39 37-91 37-53 0-90-37l-715-716q-38-37-64.5-101t-26.5-117v-416q0-52 38-90t90-38h416q53 0 117 26.5t102 64.5l715 714q37 39 37 91z"/></svg>