Release v2.10.2

Merge pull request #176 from mrliptontea/fix-175-target-note-edit
Fix target note cannot be edited
2020-04-09 15:37:37 +01:00 · 2020-04-09 09:21:58 +01:00 · 2020-04-09 09:20:38 +01:00 · 2020-04-06 18:53:33 +01:00 · 2020-04-06 18:52:50 +01:00 · 2020-04-06 18:49:52 +01:00
37 changed files with 1923 additions and 1391 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+  "extends": "standard",
+  "globals": {
+    "$": "readonly",
+    "localStorage": "readonly",
+  },
+  "ignorePatterns": [
+    "/javascripts/",
+  ],
+};
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,31 @@
+name: Run linters
+
+on: push
+
+jobs:
+  lint:
+    runs-on: ubuntu-18.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Use Node.js 10.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: "10.x"
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Run linters
+        uses: samuelmeuli/lint-action@v1
+        with:
+          github_token: ${{ secrets.github_token }}
+          eslint: true
+          eslint_dir: "src/javascripts"
+          stylelint: true
+          stylelint_dir: "src/sass"
+
+      - name: Check build
+        run: npm run build
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +0,0 @@
-dist: xenial
-language: node_js
-node_js:
-  - 10
-cache:
-  directories:
-    - node_modules
-install:
-  - npm install
-script:
-  - npm run lint --silent
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 A free Redmine theme for modern browsers.

-![The MIT License](https://img.shields.io/badge/license-MIT-584492.svg) [![Build Status](https://travis-ci.com/mrliptontea/PurpleMine2.svg?branch=master)](https://travis-ci.com/mrliptontea/PurpleMine2) [![Issues](https://img.shields.io/github/issues/mrliptontea/PurpleMine2.svg)](https://github.com/mrliptontea/PurpleMine2/issues) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+![The MIT License](https://img.shields.io/badge/license-MIT-584492.svg) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) [![Build Status](https://img.shields.io/endpoint.svg?url=https://actions-badge.atrox.dev/mrliptontea/PurpleMine2/badge&label=lint&logo=none)](https://actions-badge.atrox.dev/mrliptontea/PurpleMine2/goto) [![Issues](https://img.shields.io/github/issues/mrliptontea/PurpleMine2.svg)](https://github.com/mrliptontea/PurpleMine2/issues)

 ---

@@ -56,10 +56,51 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe

 ## Changelog

+v2.10.2 (2020-04-09):
+
+* Fixed #175: couldn't edit note when it's URL target.
+* Improved styling of some inline edit forms.
+
+v2.10.1 (2020-04-06):
+
+* Fixed #160: highlight color in jQuery UI menu, most notably in checklist plugin.
+
+v2.10.0 (2020-04-05):
+
+* Fixed #172 Collapsed/expended icons for completed versions.
+* Fixed #171 "Display" label in Gantt option.
+* Fixed #170 radio buttons in projects options.
+* Fixed #169 styles in the spent time tab.
+* Fixed #164: apply responsive overrides more generally
+* Fixed #159: wrapping long text in issue attributes.
+* Fixed #150: styling for query totals and expander in Agile plugin.
+* Fixed #148: full screen view for Dashboard plugin.
+* Fixed a "timeline" positioning in issue notes/changes.
+* Changed lightness of shades 50 and 950.
+* Changed loader styles.
+* Changed rouge syntax highlighter color scheme.
+
+v2.9.1 (2020-02-22):
+
+* Merged fix #155: $.load function removed from jQuery.
+* Fixed badge positioning in roadmap screen.
+
+v2.9.0 (2020-01-30):
+
+* Fixed #141: improved styling for issue edit form.
+* Fixed #142: TOC assumes `left` by default, also added new variables to control how it looks.
+* Fixed #143: `$main-menu-bg-hover` is now being used.
+* Resolved #144: added `$main-menu-bg-active` variable.
+* Resolved #145: added `$table-list-header-bg` variable.
+* Fixed #147: corrected forum edit attached files icon.
+* Fixed #153: improved styling for `label.block`.
+* Added styling for clear query button.
+* Improved responsive sidebar menu layout.
+
 v2.8.0 (2019-08-13):

 * Resolved #132: fixed spacing for headers on roadmap pages.
-* Merged fix #136: broken layout with large image attachment
+* Merged fix #136: broken layout with large image attachment.

 v2.7.0 (2019-06-13):

--- a/javascripts/theme.js
+++ b/javascripts/theme.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "PurpleMine2",
+  "name": "purplemine",
  "description": "A free Redmine 2.6+ theme written in SCSS",
  "keywords": [
    "redmine",
@@ -20,34 +20,30 @@
  "scripts": {
    "build": "grunt",
    "watch": "grunt watch",
-    "lint:js": "standard",
+    "lint:js": "eslint src/javascripts/",
    "lint:sass": "stylelint src/sass/**/*.scss",
    "lint": "npm run -S lint:js && npm run -S lint:sass"
  },
  "dependencies": {
-    "autoprefixer": "^9.6.1",
-    "grunt": "^1.0.4",
+    "autoprefixer": "^9.7.5",
+    "grunt": "^1.1.0",
    "grunt-contrib-uglify": "^4.0.1",
    "grunt-contrib-watch": "^1.1.0",
    "grunt-postcss": "^0.9.0",
-    "grunt-sass": "^3.0.2",
-    "node-sass": "^4.12.0",
-    "sass-inline-svg": "^1.2.0"
+    "grunt-sass": "^3.1.0",
+    "node-sass": "^4.13.1",
+    "sass-inline-svg": "^1.2.3"
  },
  "devDependencies": {
-    "standard": "^13.1.0",
+    "eslint": "^6.8.0",
+    "eslint-config-standard": "^14.1.1",
+    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
    "stylelint": "^10.1.0",
-    "stylelint-order": "^3.0.1",
-    "stylelint-scss": "^3.9.3"
-  },
-  "standard": {
-    "globals": [
-      "$",
-      "localStorage"
-    ],
-    "ignore": [
-      "/javascripts"
-    ]
+    "stylelint-order": "^3.1.1",
+    "stylelint-scss": "^3.16.0"
  },
  "browserslist": [
    "last 2 versions",
--- a/plugins/redmine_backlogs/global.css
+++ b/plugins/redmine_backlogs/global.css
--- a/plugins/redmine_backlogs/jquery/jquery-ui.css
+++ b/plugins/redmine_backlogs/jquery/jquery-ui.css
--- a/plugins/redmine_backlogs/master_backlog.css
+++ b/plugins/redmine_backlogs/master_backlog.css
--- a/plugins/redmine_backlogs/taskboard.css
+++ b/plugins/redmine_backlogs/taskboard.css
--- a/screenshots/calendar.png
+++ b/screenshots/calendar.png
--- a/screenshots/issue-page.png
+++ b/screenshots/issue-page.png
--- a/screenshots/issues.png
+++ b/screenshots/issues.png
--- a/screenshots/new-issue.png
+++ b/screenshots/new-issue.png
--- a/screenshots/redmine-backlogs.png
+++ b/screenshots/redmine-backlogs.png
--- a/src/javascripts/modules/HistoryTabs.js
+++ b/src/javascripts/modules/HistoryTabs.js
@@ -55,7 +55,7 @@ PurpleMine.HistoryTabs = (function () {

    this._ = translations[this.lang]

-    if (this.$history.length > 0) {
+    if (this.$history.length > 0 && $('#history > h3').length > 0) {
      buildTabs()
      markFirstOfTypes()
    }
--- a/src/javascripts/modules/SidebarToggler.js
+++ b/src/javascripts/modules/SidebarToggler.js
@@ -44,7 +44,7 @@ PurpleMine.SidebarToggler = (function () {

    // Fix issue with context menu position
    if (this.$main.css('position') === 'relative') {
-      $(window).load(function () {
+      $(window).on('load', function () {
        $('#context-menu').appendTo('#wrapper3')
      })
    }
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -43,7 +43,7 @@ $black:                         #000 !default;
 $gray:                          hsl(hue($indigo), 20%, 85%) !default;

 $shade-map: (
-  50:                           90%,
+  50:                           87.5%,
  100:                          80%,
  200:                          65%,
  300:                          40%,
@@ -53,7 +53,7 @@ $shade-map: (
  700:                          40%,
  800:                          65%,
  900:                          80%,
-  950:                          90%
+  950:                          87.5%
 ) !default;

@function shade($color, $shade: 500) {
@@ -166,6 +166,12 @@ $wiki-font-size:                16px !default;
 $wiki-line-height:              1.6 !default;
 $wiki-preview-bg:               $body-bg !default;

+$toc-bg:                        shade($yellow, 50) !default;
+$toc-border:                    mix($yellow, $gray-500, 25%) !default;
+$toc-text:                      $text-color !default;
+$toc-link:                      shade($yellow, 800) !default;
+$toc-link-hover:                shade($yellow, 900) !default;
+$toc-shadow:                    0 1px 3px rgba($black, .07) !default;
 $toc-active-link:               darken($link-color, 10%) !default;
 $toc-active-link-hover:         shade($toc-active-link, 700) !default;
 $toc-active-border:             $link-color !default;
@@ -215,6 +221,7 @@ $collapsible-max-height:        10000px !default;
 $table-cell-padding:            8px !default;
 $table-condensed-cell-padding:  5px !default;

+$table-list-header-bg:          $body-bg !default;
 $table-list-header-border:      0 0 2px !default;
 $table-list-item-border:        0 !default;
 $table-list-color-odd-rows:     true !default;
@@ -505,6 +512,7 @@ $logo-space:                    floor($header-padding-vertical / 2) !default;

 $main-menu-bg:                  $gray-100 !default;
 $main-menu-bg-hover:            $gray-100 !default;
+$main-menu-bg-active:           transparent !default;
 $main-menu-link:                $gray-900 !default;
 $main-menu-link-active:         $black !default;
 $main-menu-border:              $gray-400 !default;
@@ -604,7 +612,7 @@ $progress-bar-info-bg:          $brand-info !default;
 $panel-body-padding-vertical:   15px !default;
 $panel-body-padding-horizontal: 15px !default;
 $panel-body-padding:            $panel-body-padding-vertical $panel-body-padding-horizontal !default;
-$panel-color:                   $gray-900 !default;
+$panel-color:                   $text-color !default;
 $panel-bg:                      $gray-50 !default;
 $panel-border:                  $gray-400 !default;
 $panel-border-radius:           $border-radius-base !default;
@@ -640,10 +648,15 @@ $issue-attribute-padding-h:     5px !default;
 //== Speech "bubbles"
 //

+$bubble-bg:                     $issue-bg !default;
+$bubble-border:                 $issue-border !default;
+$bubble-text:                   $issue-text !default;
 $bubble-gravatar-size:          24px !default;
 $bubble-gravatar-space:         12px !default;
 $bubble-padding-vertical:       8px !default;
-$bubble-padding-horizontal:     15px !default;
+$bubble-padding-horizontal:     12px !default;
+$bubble-target-border:          saturate($brand-primary, 25%) !default;
+$bubble-target-shadow-alpha:    .2 !default;


 //== Badges
--- a/src/sass/components/_admin.scss
+++ b/src/sass/components/_admin.scss
@@ -61,6 +61,13 @@ table.permissions {
 //== Workflows
 //

+.controller-workflows {
+  table.list,
+  fieldset.collapsible {
+    margin-bottom: $line-height-computed;
+  }
+}
+
 table.transitions {
  td.enabled {
    background: $state-success;
--- a/src/sass/components/_base.scss
+++ b/src/sass/components/_base.scss
@@ -110,6 +110,16 @@ table {
  p {
    margin: 0;
  }
+
+  form {
+    p {
+      margin-bottom: ($line-height-computed / 2);
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
 }

 ul,
--- a/src/sass/components/_buttons.scss
+++ b/src/sass/components/_buttons.scss
@@ -144,6 +144,21 @@ p.buttons,
 }


+//== Submit + cancel
+//
+
+#issue-form,
+.journal,
+.edit_news,
+.edit_content,
+.edit_time_entry,
+.edit_membership {
+  input[type="submit"] + a {
+    margin-left: ceil($btn-padding-horizontal-small / 2);
+  }
+}
+
+
 //== Action buttons group
 //

@@ -187,6 +202,10 @@ p.buttons {
    min-width: 130px;
  }

+  label + & {
+    margin-left: $padding-side;
+  }
+
  @at-root span#{&} {
    > span {
      display: inline-block;
--- a/src/sass/components/_content.scss
+++ b/src/sass/components/_content.scss
@@ -161,6 +161,27 @@
      }
    }

+    &.queries {
+      > li {
+        position: relative;
+
+        > a.query {
+          padding-right: $sidebar-padding-horizontal * 1.5;
+        }
+
+        > a.icon-only {
+          position: absolute;
+          top: $sidebar-padding-vertical;
+          right: $sidebar-padding-horizontal / 2;
+          line-height: $line-height-computed;
+
+          &::before {
+            line-height: inherit;
+          }
+        }
+      }
+    }
+
    &.pages-hierarchy {
      .pages-hierarchy {
        margin-left: $sidebar-padding-horizontal + 3px;
--- a/src/sass/components/_elements.scss
+++ b/src/sass/components/_elements.scss
@@ -7,27 +7,29 @@
 //

 a.collapsible,
+a.collapsible.icon,
 .collapsible > legend {
  color: $link-color;
  cursor: pointer;
  user-select: none;

-  &:hover {
+  &:hover,
+  &:focus {
    color: $link-hover-color;
+    text-decoration: none;
  }

  &::before {
-    content: "";
-    display: inline-block;
+    @include fa-icon;
+    content: $fa-var-chevron-down;
    position: relative;
-    top: -1px;
-    width: 0;
-    height: 0;
+    top: -.1em;
+    width: 1em;
+    height: 1em;
    margin-right: 3px;
    transform: rotate(0);
-    border-top: 6px solid;
-    border-right: 4px solid transparent;
-    border-left: 4px solid transparent;
+    color: $gray-600;
+    font-size: 12px;
    vertical-align: middle;

    @if $collapsible-animation-time > 0 {
@@ -37,6 +39,7 @@ a.collapsible,
 }

 a.collapsible.collapsed,
+a.collapsible.icon-collapsed,
 .collapsible.collapsed > legend {
  &::before {
    transform: rotate(-90deg);
@@ -127,6 +130,7 @@ img {
 //

 .autoscroll {
+  position: relative;
  margin-bottom: $line-height-computed;
  overflow-x: auto;
 }
@@ -608,6 +612,14 @@ div#roadmap {
    }
  }

+  header {
+    display: block;
+
+    > h3 {
+      display: inline-block;
+    }
+  }
+
  header > h3,
  h3.version {
    margin-bottom: 0;
@@ -660,16 +672,22 @@ div#version-summary {
 //== Ajax indicator
 //

+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
 #ajax-indicator {
  @include nice-shadow(3);
  position: fixed;
  z-index: 100;
  top: 50%;
  left: 50%;
+  box-sizing: border-box;
  width: 200px;
-  margin: (($line-height-computed + $padding-large-vertical * 2 + 1px * 2) / -2) ((200px + $padding-large-horizontal * 2 + 1px * 2) / -2);
+  margin: (($padding-large-vertical * 2 + 1px * 2 + $line-height-computed) / -2) (200px / -2);
  padding: $padding-large-vertical $padding-large-horizontal;
  border: 1px solid $highlight-border;
+  border-radius: $border-radius-base;
  opacity: .9;
  background-color: $highlight-bg;
  color: $highlight-text;
@@ -677,11 +695,21 @@ div#version-summary {
  text-align: center;

  span {
-    padding-left: 26px;
-    background-image: url("../../../images/loading.gif");
-    background-repeat: no-repeat;
-    background-position: 0% 40%;
-    vertical-align: bottom;
+    line-height: $line-height-computed;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      box-sizing: border-box;
+      width: $line-height-computed;
+      height: $line-height-computed;
+      margin-right: $line-height-computed / 2;
+      animation: spin 1s linear infinite;
+      border: 3px solid rgba($highlight-text, .3);
+      border-radius: 50%;
+      border-top-color: $highlight-text;
+      vertical-align: bottom;
+    }
  }
 }

@@ -745,15 +773,14 @@ div.table-list.boards {
  }

  .message {
-    border: 1px solid $gray-400;
+    border: 1px solid $bubble-border;
    border-radius: $panel-border-radius;
-    background: $gray-100;
+    background: $bubble-bg;

    > h4,
    > p {
      margin-bottom: 0;
      padding: $bubble-padding-vertical $bubble-padding-horizontal;
-      border-bottom: 1px solid mix($gray-400, $gray-100, 50%);
      color: $gray-700;
      font-size: $font-size-list;

@@ -767,7 +794,8 @@ div.table-list.boards {
    }

    .wiki {
-      padding: $bubble-padding-horizontal;
+      padding: $panel-body-padding;
+      border-top: 1px solid $bubble-border;
      border-radius: 0 0 $panel-border-radius $panel-border-radius;
      background: $body-bg;
    }
@@ -775,13 +803,17 @@ div.table-list.boards {
    .contextual {
      position: relative;
      z-index: 1;
-      margin-top: $padding-small-vertical;
-      margin-right: $bubble-padding-vertical;
+      padding: ($bubble-padding-vertical - 1px) $bubble-padding-vertical 0 0;

      a {
-        margin-left: ceil($bubble-padding-vertical / 2);
+        display: inline-block;
      }
    }
+
+    .attachments {
+      padding: $bubble-padding-horizontal;
+      border-top-color: $bubble-border;
+    }
  }

  .reply {
@@ -814,12 +846,12 @@ div.table-list.boards {
          margin-top: 1px;
          margin-left: 2px;
          border-width: 6px;
-          border-right-color: $panel-bg;
+          border-right-color: $bubble-bg;
        }

        &::before {
          border-width: 7px;
-          border-right-color: $panel-border;
+          border-right-color: $bubble-border;
        }
      }

@@ -934,6 +966,7 @@ div.table-list.boards {
  background: $body-bg;
  color: $panel-color;
  font-family: $font-family-monospace;
+  white-space: pre-wrap;
 }

 .diff_out {
--- a/src/sass/components/_forms.scss
+++ b/src/sass/components/_forms.scss
@@ -26,6 +26,8 @@ form {
    }
  }

+  span.field label,
+  span.field ~ label,
  .box label {
    line-height: $line-height-base;

@@ -121,7 +123,7 @@ input[type="search"] {

 input[type="radio"],
 input[type="checkbox"] {
-  margin: 4px 1px 0 0;
+  margin: 4px 3px 0 5px;
  margin-top: 1px \9; // IE8-9
  line-height: normal;
  vertical-align: top;
@@ -264,6 +266,7 @@ em.info {
  color: $gray-700;
  font-size: $font-size-small;
  font-style: normal;
+  line-height: $line-height-base;
 }


@@ -307,6 +310,11 @@ em.info {
      display: block;
      padding-top: $input-padding-vertical + 1px;
      line-height: $line-height-base;
+
+      > input[type="checkbox"],
+      > input[type="radio"] {
+        margin-left: 0;
+      }
    }
  }

@@ -350,6 +358,12 @@ em.info {
      float: none;
      text-align: left;
      cursor: pointer;
+
+      > input[type="checkbox"],
+      > input[type="radio"] {
+        margin-left: -$check-input-gutter;
+        float: left;
+      }
    }

    &.inline {
@@ -363,11 +377,13 @@ em.info {
    > input[type="checkbox"],
    > input[type="radio"] {
      margin-top: $check-input-margin-vertical;
+      margin-left: 0;
    }

    ~ input[type="checkbox"],
    ~ input[type="radio"] {
      margin-top: $check-input-margin-btn-v;
+      margin-left: 0;
    }
  }
 }
@@ -381,14 +397,25 @@ label.inline {
  &:last-child {
    margin-right: 0;
  }
-}

-label.inline,
-label.block {
  > input {
    margin-left: -$check-input-gutter;
    float: left;
  }
+
+  input + & {
+    padding-left: 0;
+  }
+}
+
+label.block {
+  display: block;
+  width: auto;
+
+  > input {
+    margin-right: 3px;
+    margin-left: 3px;
+  }
 }


--- a/src/sass/components/_icons.scss
+++ b/src/sass/components/_icons.scss
@@ -161,6 +161,8 @@ table.list .buttons > a::before {
 .icon-sorted-desc::before           { content: $fa-var-sort-amount-desc; }
 .icon-toggle-plus::before           { content: $fa-var-plus-square; }
 .icon-toggle-minus::before          { content: $fa-var-minus-square; }
+.icon-clear-query::before           { content: $fa-var-times; }
+.icon-import::before                { content: $fa-var-cloud-upload; }

 //== Checkbox toggler
 //
@@ -264,6 +266,10 @@ a.icon-del {
  }
 }

+.icon-zoom-in + .icon-zoom-out {
+  margin-left: 5px;
+}
+

 //== Administration menu sections
 //
@@ -610,36 +616,42 @@ em.info.error {
  }
 }

-.message .contextual {
-  a {
-    @extend %fa-icon;
-    opacity: .7;
+.message {
+  .contextual {
+    a {
+      @extend %fa-icon;
+      opacity: .7;

-    &:hover,
-    &:focus {
-      opacity: 1;
-    }
+      &:hover,
+      &:focus {
+        opacity: 1;
+      }

-    &:nth-child(1) {
-      &::before {
-        content: $fa-var-comment;
+      img {
+        display: none;
      }
    }
+  }

-    &:nth-child(2) {
-      &::before {
-        content: $fa-var-pencil;
+  > .contextual {
+    a {
+      &:nth-child(1) {
+        &::before {
+          content: $fa-var-comment;
+        }
      }
-    }

-    &:nth-child(3) {
-      &::before {
-        content: $fa-var-trash;
+      &:nth-child(2) {
+        &::before {
+          content: $fa-var-pencil;
+        }
      }
-    }

-    img {
-      display: none;
+      &:nth-child(3) {
+        &::before {
+          content: $fa-var-trash;
+        }
+      }
    }
  }
 }
--- a/src/sass/components/_issue.scss
+++ b/src/sass/components/_issue.scss
@@ -88,7 +88,8 @@
      margin-bottom: $line-height-computed;
    }

-    > hr {
+    > hr,
+    .attribute > hr {
      @if $clean-issues {
        margin: $issue-padding 0;
      } @else {
@@ -126,7 +127,42 @@
    }
  }

-  .attributes {
+  @if $color-status {
+    .attributes td.status,
+    .attributes .attribute.status .value {
+      display: inline-block;
+      width: auto;
+      min-width: 1em;
+      margin-top: $issue-attribute-padding-v;
+      padding: 1px $table-cell-padding;
+      border-radius: $border-radius-base;
+      background-color: $status-default-bg;
+      color: $status-default-color;
+      font-size: $font-size-small;
+      font-weight: $font-weight-bold;
+      text-align: center;
+      text-transform: uppercase;
+    }
+
+    @each $status, $status-colors in $status-colors-map {
+      &.#{$status} {
+        .attributes td.status,
+        .attributes .attribute.status .value {
+          background-color: map-get($status-colors, background);
+          color: map-get($status-colors, color);
+        }
+      }
+    }
+  }
+
+  @if $priority-icon {
+    .attributes td.priority,
+    .attribute.priority .value {
+      @include priority-icon-base;
+    }
+  }
+
+  table.attributes {
    width: 100%;

    th,
@@ -148,71 +184,70 @@
    }

    @media screen and (min-width: $screen-md-min) {
-      > tbody > tr {
-        > th,
-        > td {
-          width: 25%;
-        }
-      }
-    }
-
-    @media screen and (min-width: $screen-lg-min) {
-      width: auto;
-
      > tbody > tr {
        > th {
-          width: 14em;
+          width: $label-width;
        }

        > td {
+          min-width: $label-width;
+        }
+      }
+    }
+  }
+
+  div.attributes {
+    @if $css-grid-layout {
+      display: grid;
+      grid-gap: 0 $padding-side;
+      grid-template-columns: auto;
+
+      @media screen and (min-width: $screen-lg-min) {
+        grid-template-columns: repeat(2, minmax(auto, max-content));
+
+        .attribute .value {
+          min-width: $label-width;
+        }
+      }
+
+      .splitcontent {
+        display: contents;
+
+        &::after {
+          content: none;
+        }
+      }
+
+      .splitcontentleft {
+        width: auto;
+        padding-right: 0;
+        padding-left: 0;
+        float: none;
+      }
+    } @else {
+      @media screen and (min-width: $screen-lg-min) {
+        .splitcontentleft {
          width: auto;
-          min-width: 16em;
+        }
+
+        .attribute .value {
+          min-width: $label-width;
        }
      }
    }
  }

-  @if $color-status {
-    .attributes td.status,
-    .attribute.status .value {
-      display: inline-block;
-      width: auto;
-      min-width: 1em;
-      margin-top: $issue-attribute-padding-v;
-      padding: 1px $table-cell-padding;
-      border-radius: $border-radius-base;
-      background-color: $status-default-bg;
-      color: $status-default-color;
-      font-size: $font-size-small;
-      font-weight: $font-weight-bold;
-      text-align: center;
-      text-transform: uppercase;
-    }
+  .splitcontent {
+    .attribute {
+      padding-left: $label-width;

-    @each $status, $status-colors in $status-colors-map {
-      &.#{$status} {
-        .attributes td.status,
-        .attribute.status .value {
-          background-color: map-get($status-colors, background);
-          color: map-get($status-colors, color);
-        }
+      .label {
+        width: $label-width;
+        margin-left: -$label-width;
      }
    }
  }

-  @if $priority-icon {
-    .attributes td.priority,
-    .attribute.priority .value {
-      @include priority-icon-base;
-    }
-  }
-
-  .splitcontentleft {
-    @media screen and (min-width: $screen-lg-min) {
-      width: auto;
-    }
-  }
-
  .attribute {
    @extend %clearfix;

@@ -222,21 +257,20 @@
    }

    .label {
-      width: 25%;
+      box-sizing: border-box;
      float: left;
      color: $gray-700;
-
-      @media screen and (min-width: $screen-lg-min) {
-        width: 14em;
-      }
    }

    .value {
      color: $gray-950;

-      @media screen and (min-width: $screen-lg-min) {
-        width: auto;
-        min-width: 14em + 16em;
+      &:empty::after {
+        content: "-";
+      }
+
+      *:last-child {
+        margin-bottom: 0;
      }
    }
  }
@@ -256,13 +290,18 @@
    padding: $issue-padding;
    border-top: 1px solid $issue-border;
  }
+
+  // Restore margin below buttons in reverse chronological mode
+  + div[style] + .contextual {
+    margin-bottom: $line-height-computed;
+  }
 }

 div.fileover {
  background-color: $highlight-bg;
 }

-div.attachments {
+div.attachments:not(.box) {
  padding: $line-height-computed 0;
  border-top: 1px solid $issue-border;

@@ -323,6 +362,7 @@ div.thumbnails {
    top: 0;
    margin: 3px;
    border-radius: $border-radius-base - 1;
+    vertical-align: middle;
  }
 }

@@ -354,10 +394,27 @@ div.thumbnails {
    td.buttons {
      width: 3em;
      vertical-align: middle;
+
+      a:not(:first-child) {
+        margin-left: 2px;
+      }
    }
  }
 }

+#trackers_description {
+  display: none;
+
+  dt {
+    margin: 0 0 ($line-height-computed / 4);
+  }
+
+  dd {
+    margin-right: 0;
+    margin-left: 0;
+  }
+}
+
 #new-relation-form {
  text-align: right;

@@ -370,9 +427,13 @@ div.thumbnails {
  }
 }

-#history {
-  overflow: auto;
+#update > form {
+  margin-bottom: $line-height-computed;
+  padding-bottom: $line-height-computed;
+  border-bottom: 1px solid $issue-border;
+}

+#history {
  > .tabs {
    margin-bottom: $line-height-computed + 2px * 2;
  }
@@ -404,64 +465,87 @@ div.thumbnails {

 .journal {
  position: relative;
-  margin-bottom: $line-height-computed + 2px * 2;
+  margin-bottom: $line-height-computed;
+  border: 1px solid $bubble-border;
+  border-radius: $panel-border-radius;

  @if $use-gravatars {
    margin-left: $bubble-gravatar-size + $bubble-gravatar-space;
  }

-  &::before {
-    content: "";
-    display: block;
-    position: absolute;
-    z-index: -1;
-    top: -($line-height-computed + 2px);
-    left: 22px;
-    width: 4px;
-    height: $line-height-computed;
-    background-color: darken($body-bg, 5%);
-  }
+  &.changeset {
+    h4 + p {
+      margin-bottom: 0;
+      padding-bottom: $bubble-padding-vertical;
+      background-color: $bubble-bg;
+      font-size: $font-size-list;

-  .tabs + &::before {
-    display: none;
+      > a:first-child {
+        font-family: $font-family-monospace;
+        font-weight: $font-weight-bold;
+      }
+    }
  }

  > div {
-    border: 1px solid $issue-border;
-    border-radius: $panel-border-radius;
-
    &:target {
-      border-color: darken($issue-border, 25%);
+      $border: $bubble-target-border;
+      $shadow: rgba($bubble-target-border, $bubble-target-shadow-alpha);
+      position: relative;
+      margin-top: -($responsive-header-height + 4px);
+      padding-top: ($responsive-header-height + 4px);
+
+      &::before {
+        content: "";
+        display: block;
+        position: absolute;
+        top: ($responsive-header-height + 4px);
+        right: 0;
+        bottom: 0;
+        left: 0;
+        border-radius: $panel-border-radius - 1px;
+        box-shadow: 0 0 0 1px $border, 0 0 0 4px $shadow;
+        pointer-events: none;
+      }

      @if $use-gravatars {
-        h4::before {
-          border-right-color: darken($issue-border, 25%);
+        > h4::before {
+          border-right-color: $border;
+          filter: drop-shadow(-4px 0 0 $shadow);
+        }
+      }
+
+      @media screen and (min-width: $redmine-responsive-min) {
+        margin-top: -$line-height-computed;
+        padding-top: $line-height-computed;
+
+        &::before {
+          top: $line-height-computed;
        }
      }
    }
  }

  // For Redmine 4.0+
-  > div > .contextual {
+  > div > .contextual,
+  > .contextual {
    position: relative;
    z-index: 1;
    margin: 0;
    padding: $bubble-padding-vertical $bubble-padding-horizontal;
    font-size: $font-size-list;

-    > .journal-actions {
-      padding-right: $issue-attribute-padding-h;
+    a {
+      opacity: $icon-opacity;

-      > a {
-        opacity: $icon-opacity;
-
-        &:hover {
-          opacity: $icon-hover-opacity;
-        }
+      &:hover {
+        opacity: $icon-hover-opacity;
      }
    }

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

      &::before {
@@ -470,13 +554,15 @@ div.thumbnails {
    }
  }

-  > div > h4 {
+  > div > h4,
+  > h4 {
    margin: 0;
    padding: $bubble-padding-vertical $bubble-padding-horizontal;
    border-radius: $panel-border-radius $panel-border-radius 0 0;
-    background-color: $issue-bg;
+    background-color: $bubble-bg;
    color: $gray-700;
    font-size: $font-size-list;
+    font-weight: $font-weight-normal;

    a {
      color: $gray-900;
@@ -492,7 +578,8 @@ div.thumbnails {
  }

  @if $use-gravatars {
-    > div > h4 {
+    > div > h4,
+    > h4 {
      position: relative;

      &::before,
@@ -514,12 +601,12 @@ div.thumbnails {
        margin-top: 1px;
        margin-left: 2px;
        border-width: 6px;
-        border-right-color: $issue-bg;
+        border-right-color: $bubble-bg;
      }

      &::before {
        border-width: 7px;
-        border-right-color: $issue-border;
+        border-right-color: $bubble-border;
      }

      > .gravatar {
@@ -531,35 +618,27 @@ div.thumbnails {
    }
  }

+  > p {
+    padding-right: $bubble-padding-horizontal;
+    padding-left: $bubble-padding-horizontal;
+
+    &:empty {
+      margin-bottom: 0;
+    }
+  }
+
+  form,
+  .wiki,
+  .details {
+    border-top: 1px solid $bubble-border;
+  }
+
  .details {
    margin: 0;
    padding: $bubble-padding-vertical 0;
-    padding-left: $bubble-padding-horizontal * 2.5;
-    list-style: none;
-    border-top: 1px solid mix($body-bg, $issue-border, 50%);
+    padding-left: $bubble-padding-horizontal + 20px;
    font-size: $font-size-list;

-    li {
-      position: relative;
-      margin-bottom: $bubble-padding-vertical / 2;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      &::before {
-        content: "";
-        display: block;
-        position: absolute;
-        top: 5px;
-        left: -($bubble-padding-horizontal + 6px / 2);
-        width: 6px;
-        height: 6px;
-        border-radius: 50%;
-        background-color: $gray-600;
-      }
-    }
-
    img {
      margin: 0 0 -3px 4px;
    }
@@ -574,15 +653,13 @@ div.thumbnails {
    }
  }

-  .wiki,
-  form {
+  .wiki {
    padding: $issue-padding;
-    border-top: 1px solid $issue-border;
  }

  form {
-    padding-top: 5px;
-    background-color: $gray-100;
+    padding: $bubble-padding-vertical $bubble-padding-horizontal $bubble-padding-horizontal;
+    background-color: $bubble-bg;

    > p {
      margin-bottom: $issue-padding;
@@ -592,6 +669,12 @@ div.thumbnails {
      }
    }

+    > label {
+      display: inline-block;
+      margin-bottom: $line-height-computed / 2;
+      line-height: $line-height-base;
+    }
+
    > .wiki {
      margin: 0 (-$issue-padding) (-$issue-padding);
      padding: 0;
@@ -626,12 +709,10 @@ div.thumbnails {
 }

 .private-notes {
-  > div {
-    border-left-color: $brand-warning;
+  border-left-color: $brand-warning;

-    h4::before {
-      border-right-color: $brand-warning;
-    }
+  > div > h4::before {
+    border-right-color: $brand-warning;
  }
 }

@@ -659,22 +740,29 @@ span.private {

  @media screen and (min-width: $screen-md-min) {
    width: 45%;
-    margin-left: $padding-side;
    float: right;
+
+    + #history {
+      margin-right: 45%;
+      padding-right: $padding-side;
+    }
  }

  @media screen and (min-width: $screen-lg-min) {
    width: 33%;
-    min-width: 28em;
+
+    + #history {
+      margin-right: 33%;
+    }
  }

  div.changeset {
    margin-top: $line-height-computed / 2 + 2px * 2;
    padding: 0;
    overflow: hidden;
-    border: 1px solid $issue-border;
+    border: 1px solid $bubble-border;
    border-radius: $panel-border-radius;
-    background-color: $issue-bg;
+    background-color: $bubble-bg;
    font-size: $font-size-list;

    &:first-of-type {
@@ -687,7 +775,7 @@ span.private {
      padding: $padding-base-vertical $padding-base-horizontal;
      color: $gray-700;

-      > a {
+      > a:first-child {
        font-family: $font-family-monospace;
        font-weight: $font-weight-bold;
      }
@@ -707,7 +795,7 @@ span.private {

    > .wiki {
      padding: $padding-base-vertical $padding-base-horizontal;
-      border-top: 1px solid mix($body-bg, $issue-border, 50%);
+      border-top: 1px solid $bubble-border;
      background-color: $body-bg;
    }
  }
--- a/src/sass/components/_jquery-ui.scss
+++ b/src/sass/components/_jquery-ui.scss
@@ -138,6 +138,23 @@
  @include nice-shadow(2);
  padding: 3px;
  border-radius: $panel-border-radius;
+
+  .ui-menu-item {
+    &.ui-state-focus,
+    &.ui-state-active {
+      border-color: $pagination-hover-border;
+      background-color: $pagination-hover-bg;
+      color: $pagination-hover-color;
+
+      a {
+        color: $pagination-hover-color;
+      }
+
+      .ui-icon {
+        background-image: url("../../../stylesheets/jquery/images/ui-icons_222222_256x240.png");
+      }
+    }
+  }
 }

 .ui-menu-item {
@@ -298,3 +315,9 @@ img.ui-datepicker-trigger {
    }
  }
 }
+
+.ui-tooltip {
+  @include nice-shadow(1);
+  padding: $padding-small-vertical $padding-small-horizontal;
+  border: 0 none;
+}
--- a/src/sass/components/_list.scss
+++ b/src/sass/components/_list.scss
@@ -25,10 +25,16 @@ table.list {
    padding: $table-cell-padding;
    border: 2px solid $table-border-color;
    border-width: $table-list-header-border;
-    background-color: $body-bg;
+    background-color: $table-list-header-bg;
    color: $gray-700;
    vertical-align: bottom;

+    @if $table-list-header-bg == $body-bg {
+      @at-root .box & {
+        background-color: $panel-bg;
+      }
+    }
+
    a {
      color: $gray-900;
    }
@@ -80,6 +86,10 @@ table.list {
      padding-right: $table-cell-padding;
      padding-left: $table-cell-padding;

+      &:first-child {
+        padding-right: 0;
+      }
+
      input {
        margin: 2px 0 0;
      }
@@ -255,7 +265,7 @@ tr.issue {
 }

 tr {
-  span.expander {
+  span.expander:not(.icon) {
    margin-left: 0;
    padding-left: 8px;
    background-image: inline-svg("plus.svg", (path: (fill: $btn-default-icon-color)));
@@ -265,7 +275,7 @@ tr {
    user-select: none;
  }

-  &.open span.expander {
+  &.open span.expander:not(.icon) {
    background-image: inline-svg("minus.svg", (path: (fill: $btn-default-icon-color)));
  }
 }
@@ -682,6 +692,15 @@ table.list.enumerations {
 //

 .query-totals {
+  #content & {
+    margin-top: 0;
+
+    @media screen and (min-width: $redmine-responsive-min) {
+      margin-top: -($line-height-computed * 2 + $btn-padding-vertical);
+      text-align: right;
+    }
+  }
+
  > span {
    margin-right: $padding-base-horizontal;

--- a/src/sass/components/_login.scss
+++ b/src/sass/components/_login.scss
@@ -33,6 +33,11 @@
    margin-bottom: $panel-body-padding-vertical;
  }

+  #login-submit {
+    padding-top: $padding-base-vertical;
+    padding-bottom: $padding-base-vertical;
+  }
+
  table {
    margin: auto;
    table-layout: fixed;
--- a/src/sass/components/_plugins.scss
+++ b/src/sass/components/_plugins.scss
@@ -300,6 +300,12 @@
  }
 }

+#checklist-menu.ui-menu {
+  a {
+    padding: 2px 0 2px 24px;
+  }
+}
+

 //
 // Redmine custom menu
--- a/src/sass/components/_responsive.scss
+++ b/src/sass/components/_responsive.scss
@@ -1,9 +1,10 @@
+.hidden,
 .mobile-show {
  display: none;
 }

 // stylelint-disable selector-max-compound-selectors
-.theme-Purplemine2 {
+body {
  @media screen and (max-width: $redmine-responsive-max) {
    .flyout-menu + div {
      #header {
@@ -78,6 +79,15 @@
      }
    }

+    #content {
+      overflow: auto;
+    }
+
+    #ajax-indicator {
+      left: 50%;
+      width: 200px;
+    }
+
    .mobile-toggle-button {
      width: $responsive-header-height;
      height: $responsive-header-height;
@@ -113,6 +123,43 @@
        }
      }

+      &__sidebar {
+        p {
+          padding-left: $padding-large-horizontal;
+        }
+      }
+
+      ul {
+        li:nth-child(n) {
+          a {
+            height: auto;
+            padding: $padding-large-vertical $padding-large-horizontal;
+            line-height: $line-height-base;
+          }
+        }
+
+        &.queries {
+          li {
+            display: flex;
+
+            a {
+              flex: 1 1 auto;
+            }
+
+            .icon-only {
+              flex: 0 0 40px;
+              padding-right: 0;
+              padding-left: 0;
+              text-align: center;
+
+              &::before {
+                line-height: inherit;
+              }
+            }
+          }
+        }
+      }
+
      a {
        &,
        &:hover,
@@ -131,11 +178,48 @@
        }
      }

-      h3 {
+      h3,
+      h4 {
+        height: auto;
+        margin: 0;
+        padding: $padding-base-vertical $padding-base-horizontal;
        border-top: 1px solid $flyout-menu-header-border;
        border-bottom: 1px solid $flyout-menu-header-border;
        background-color: $flyout-menu-header-bg;
        color: $flyout-menu-header-text;
+        line-height: $line-height-base;
+
+        + p {
+          margin-top: $padding-large-vertical;
+        }
+      }
+
+      h4 {
+        padding: 0 $padding-base-horizontal;
+      }
+
+      form {
+        padding-left: 0;
+
+        > ul {
+          margin-left: 0;
+
+          li:nth-child(n) {
+            padding-left: $padding-large-horizontal;
+            line-height: inherit;
+
+            label {
+              a {
+                display: block;
+                padding: $padding-base-vertical $padding-base-horizontal;
+              }
+            }
+          }
+
+          + p {
+            margin-top: $padding-large-vertical;
+          }
+        }
      }

      #admin-menu {
@@ -333,7 +417,7 @@
      }
    }

-    #issue-changesets {
+    div#issue-changesets {
      div.changeset {
        padding: 0;
      }
--- a/src/sass/components/_rouge.scss
+++ b/src/sass/components/_rouge.scss
@@ -1,9 +1,5 @@
-//
-// Syntax highlight - Rouge
-// --------------------------------------------------
-
 .syntaxhl {
-  background: #fafafa;
+  color: #24292e;

  .hll {
    background-color: #ffc;
@@ -11,92 +7,59 @@

  // Comment
  .c {
-    color: #888;
-  }
-
-  // Error
-  .err {
-    background-color: #faa;
-    color: #f00;
+    color: #6a737d;
  }

  // Keyword
  .k {
-    color: #080;
-    font-weight: bold;
-  }
-
-  // Operator
-  .o {
-    color: #333;
+    color: #d73a49;
  }

  // Comment.Hashbang
  .ch {
-    color: #888;
+    color: #6a737d;
  }

  // Comment.Multiline
  .cm {
-    color: #888;
+    color: #6a737d;
  }

  // Comment.Preproc
  .cp {
-    color: #579;
+    color: #d73a49;
  }

  // Comment.PreprocFile
  .cpf {
-    color: #888;
+    color: #032f62;
  }

  // Comment.Single
  .c1 {
-    color: #888;
+    color: #6a737d;
  }

  // Comment.Special
  .cs {
-    color: #c00;
-    font-weight: bold;
+    color: #6a737d;
  }

  // Generic.Deleted
  .gd {
-    color: #a00000;
-  }
-
-  // Generic.Emph
-  .ge {
-    font-style: italic;
-  }
-
-  // Generic.Error
-  .gr {
-    color: #f00;
+    background-color: #ffeef0;
+    color: #b31d28;
  }

  // Generic.Heading
  .gh {
-    color: #000080;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Generic.Inserted
  .gi {
-    color: #00a000;
-  }
-
-  // Generic.Output
-  .go {
-    color: #888;
-  }
-
-  // Generic.Prompt
-  .gp {
-    color: #c65d09;
-    font-weight: bold;
+    background-color: #f0fff4;
+    color: #22863a;
  }

  // Generic.Strong
@@ -106,7 +69,7 @@

  // Generic.Subheading
  .gu {
-    color: #800080;
+    color: #6f42c1;
    font-weight: bold;
  }

@@ -117,123 +80,112 @@

  // Keyword.Constant
  .kc {
-    color: #080;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Keyword.Declaration
  .kd {
-    color: #080;
-    font-weight: bold;
+    color: #d73a49;
  }

  // Keyword.Namespace
  .kn {
-    color: #080;
-    font-weight: bold;
+    color: #d73a49;
  }

  // Keyword.Pseudo
  .kp {
-    color: #038;
-    font-weight: bold;
+    color: #d73a49;
  }

  // Keyword.Reserved
  .kr {
-    color: #080;
-    font-weight: bold;
+    color: #d73a49;
  }

  // Keyword.Type
  .kt {
-    color: #339;
-    font-weight: bold;
+    color: #d73a49;
  }

  // Literal.Number
  .m {
-    color: #60e;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Literal.String
  .s {
-    background-color: #fff0f0;
+    color: #032f62;
  }

  // Name.Attribute
  .na {
-    color: #00c;
+    color: #005cc5;
  }

  // Name.Builtin
  .nb {
-    color: #007020;
+    color: #005cc5;
  }

  // Name.Class
  .nc {
-    color: #b06;
-    font-weight: bold;
+    color: #6f42c1;
  }

  // Name.Constant
  .no {
-    color: #036;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Name.Decorator
  .nd {
-    color: #555;
-    font-weight: bold;
+    color: #6f42c1;
  }

  // Name.Entity
  .ni {
-    color: #800;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Name.Exception
  .ne {
-    color: #f00;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Name.Function
  .nf {
-    color: #06b;
-    font-weight: bold;
+    color: #6f42c1;
  }

  // Name.Label
  .nl {
-    color: #970;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Name.Namespace
  .nn {
-    color: #0e84b5;
-    font-weight: bold;
+    color: #6f42c1;
  }

  // Name.Tag
  .nt {
-    color: #070;
+    color: #22863a;
  }

  // Name.Variable
  .nv {
-    color: #963;
+    color: #24292e;
+  }
+
+  // Operator
+  .o {
+    color: #d73a49;
  }

  // Operator.Word
  .ow {
-    color: #000;
-    font-weight: bold;
+    color: #d73a49;
  }

  // Text.Whitespace
@@ -243,138 +195,126 @@

  // Literal.Number.Bin
  .mb {
-    color: #60e;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Literal.Number.Float
  .mf {
-    color: #60e;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Literal.Number.Hex
  .mh {
-    color: #058;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Literal.Number.Integer
  .mi {
-    color: #00d;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Literal.Number.Oct
  .mo {
-    color: #40e;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Literal.String.Affix
  .sa {
-    background-color: #fff0f0;
+    color: #d73a49;
  }

  // Literal.String.Backtick
  .sb {
-    background-color: #fff0f0;
+    color: #032f62;
  }

  // Literal.String.Char
  .sc {
-    color: #04d;
+    color: #032f62;
  }

  // Literal.String.Delimiter
  .dl {
-    background-color: #fff0f0;
+    color: #d73a49;
  }

  // Literal.String.Doc
  .sd {
-    color: #d42;
+    color: #032f62;
  }

  // Literal.String.Double
  .s2 {
-    background-color: #fff0f0;
+    color: #032f62;
  }

  // Literal.String.Escape
  .se {
-    background-color: #fff0f0;
-    color: #666;
-    font-weight: bold;
+    color: #032f62;
  }

  // Literal.String.Heredoc
  .sh {
-    background-color: #fff0f0;
+    color: #032f62;
  }

  // Literal.String.Interpol
  .si {
-    background-color: #eee;
+    color: #005cc5;
  }

  // Literal.String.Other
  .sx {
-    background-color: #fff0f0;
-    color: #d20;
+    color: #032f62;
  }

  // Literal.String.Regex
  .sr {
-    background-color: #fff0ff;
-    color: #000;
+    color: #032f62;
  }

  // Literal.String.Single
  .s1 {
-    background-color: #fff0f0;
+    color: #032f62;
  }

  // Literal.String.Symbol
  .ss {
-    color: #a60;
+    color: #005cc5;
  }

  // Name.Builtin.Pseudo
  .bp {
-    color: #007020;
+    color: #005cc5;
  }

  // Name.Function.Magic
  .fm {
-    color: #06b;
-    font-weight: bold;
+    color: #005cc5;
  }

  // Name.Variable.Class
  .vc {
-    color: #369;
+    color: #24292e;
  }

  // Name.Variable.Global
  .vg {
-    color: #d70;
-    font-weight: bold;
+    color: #24292e;
  }

  // Name.Variable.Instance
  .vi {
-    color: #33b;
+    color: #24292e;
  }

  // Name.Variable.Magic
  .vm {
-    color: #963;
+    color: #005cc5;
  }

  // Literal.Number.Integer.Long
  .il {
-    color: #00d;
-    font-weight: bold;
+    color: #005cc5;
  }
 }
--- a/src/sass/components/_top.scss
+++ b/src/sass/components/_top.scss
@@ -330,6 +330,7 @@

        &:hover,
        &:focus {
+          background-color: $main-menu-bg-hover;
          box-shadow: inset 0 (-$main-menu-shadow-width) 0 $main-menu-shadow-hover;
          text-decoration: none;
        }
@@ -337,6 +338,7 @@
        &.selected {
          padding-bottom: $main-menu-padding-vertical - $main-menu-shadow-width;
          border-bottom: 3px solid $main-menu-shadow-active;
+          background-color: $main-menu-bg-active;
          box-shadow: none;
          color: $main-menu-link-active;
          font-weight: $font-weight-semi-bold;
@@ -421,6 +423,10 @@
      box-sizing: border-box;
      height: $tabs-height - 1px;
      background-color: $main-menu-bg;
+
+      &:hover {
+        background-color: $main-menu-bg-hover;
+      }
    }
  }

--- a/src/sass/components/_wiki.scss
+++ b/src/sass/components/_wiki.scss
@@ -116,6 +116,8 @@ div.wiki {
  }

  blockquote {
+    margin-bottom: 1em;
+
    > :first-child {
      margin-top: 0;
    }
@@ -157,7 +159,8 @@ div.wiki {
  }

  li > p {
-    margin-top: ($line-height-computed / 2);
+    margin-top: .25em;
+    margin-bottom: 0;
  }

  table {
@@ -203,10 +206,9 @@ div.wiki {
  pre {
    width: auto;
    margin-bottom: 1.15em;
-    padding: 4px 8px;
+    padding: 12px 15px;
    overflow-x: auto;
    overflow-y: hidden;
-    border: 1px solid rgba($gray-500, .45);
    border-radius: $border-radius-base;
    background-color: rgba($gray-500, .15);
    font-size: $font-size-small;
@@ -225,30 +227,27 @@ div.wiki {
  }

  .toc {
+    display: table;
+    max-width: 45%;
    margin-bottom: $line-height-computed;
    margin-left: 0;
-    padding: 0;
+    padding: $padding-small-vertical $padding-small-horizontal;
    list-style-type: none;
+    border: 1px solid $toc-border;
+    border-radius: $border-radius-base;
+    background-color: $toc-bg;
+    box-shadow: $toc-shadow;
+    color: $toc-text;
+    font-size: $font-size-small;

-    &.right,
-    &.left {
-      max-width: 45%;
-      padding: 8px;
-      border: 1px solid $highlight-border;
-      border-radius: $border-radius-base;
-      background-color: $highlight-bg;
-      box-shadow: $panel-shadow;
-      font-size: $font-size-small;
+    a {
+      color: $toc-link;
+      font-weight: $font-weight-normal;
+      text-decoration: none;

-      a {
-        color: $highlight-text;
-        font-weight: $font-weight-normal;
-        text-decoration: none;
-
-        &:hover {
-          color: darken($highlight-text, 10%);
-          text-decoration: underline;
-        }
+      &:hover {
+        color: $toc-link-hover;
+        text-decoration: underline;
      }
    }

--- a/src/sass/javascripts/_sidebar-toggler.scss
+++ b/src/sass/javascripts/_sidebar-toggler.scss
@@ -1,6 +1,12 @@
@if $enable-sidebar-toggler {
  #main {
    position: relative;
+
+    // Fix full screen view for dashboard plugin
+    // https://github.com/jgraichen/redmine_dashboard
+    @at-root .controller-rdb_taskboard & {
+      position: static;
+    }
  }

  #sidebar {
--- a/stylesheets/application.css
+++ b/stylesheets/application.css
Author	SHA1	Message	Date
mrliptontea	e7500035e3	Release v2.10.2	2020-04-09 15:37:37 +01:00
Grzegorz Rajchman	d3ed59dc9b	Merge pull request #176 from mrliptontea/fix-175-target-note-edit Fix target note cannot be edited	2020-04-09 09:21:58 +01:00
mrliptontea	edbe4feca8	Fix #175 target note cannot be edited	2020-04-09 09:20:38 +01:00
mrliptontea	942f23f2cb	Release v2.10.1	2020-04-06 18:53:33 +01:00
Grzegorz Rajchman	3fc4660203	Merge pull request #163 from mrliptontea/issue-160-checklist-menu-hover Fix #160 checklist plugin menu highlight color	2020-04-06 18:52:50 +01:00
mrliptontea	1fa4a87da7	Fix #160 checklist plugin menu highlight color	2020-04-06 18:49:52 +01:00
mrliptontea	07a08db560	Release v2.10.0	2020-04-05 22:17:14 +01:00
Grzegorz Rajchman	2eb5d83f59	Merge pull request #174 from mrliptontea/issues-169-170-171-172 * Fix #172 Collapsed/expended icons for completed versions. * Fix #171 "Display" label in Gantt option. * Fix #170 radio buttons in projects options. * Fix #169 styles in the spent time tab. * Change lightness of shades 50 and 950. * Change loader styles. * Change rouge syntax highlighter color scheme.	2020-04-05 22:15:01 +01:00
mrliptontea	1bdfab795a	Change rouge syntax highlighter color scheme	2020-04-05 22:10:20 +01:00
mrliptontea	aa4c59a48c	Fix some styling issues in Redmine 4. * Fix #172 Collapsed/expended icons for completed versions. * Fix #171 "Display" label in Gantt option. * Fix #170 radio buttons in projects options. * Fix #169 styles in the spent time tab. * Change lightness of shades 50 and 950. * Change loader styles.	2020-04-05 18:53:53 +01:00
Grzegorz Rajchman	aaddd2e10b	Merge pull request #168 from mrliptontea/issues-148-150-dashboard-agile-plugins Fix styling issues in Dashboard and Agile plugins	2020-03-28 13:10:05 +00:00
mrliptontea	5c14dbbf62	Simpler workflow trigger	2020-03-28 13:04:59 +00:00
mrliptontea	f8609cbbbb	Fix styling issues in Dashboard and Agile plugins - Fix #150 styling for query totals and expander in Agile plugin. - Fix #148 full screen view for Dashboard plugin.	2020-03-28 13:01:29 +00:00
Grzegorz Rajchman	6443eba8c2	Merge pull request #166 from mrliptontea/issue-164-responsive-theme-not-applied Fix #164 Apply responsive override more generally	2020-03-28 11:37:00 +00:00
mrliptontea	70c88722fb	Fix #164 Apply responsive override more generally	2020-03-27 18:15:12 +00:00
Grzegorz Rajchman	4b10532cea	Upgrade packages and improve linter action (#167 )	2020-03-27 18:14:49 +00:00
Grzegorz Rajchman	77a9633984	Merge pull request #162 from mrliptontea/issue-159/long-text-wrapping Fix #159 wrapping long text in issue attributes	2020-03-15 21:35:01 +00:00
mrliptontea	92e92e75b9	Fix #159 wrapping long text in issue attributes	2020-03-15 21:29:40 +00:00
Grzegorz Rajchman	e4c69d5d86	Merge pull request #161 from mrliptontea/dependabot/npm_and_yarn/acorn-7.1.1 Bump acorn from 7.1.0 to 7.1.1	2020-03-15 21:25:34 +00:00
dependabot[bot]	4d82879d90	Bump acorn from 7.1.0 to 7.1.1 Bumps [acorn](https://github.com/acornjs/acorn) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/7.1.0...7.1.1) Signed-off-by: dependabot[bot] <support@github.com>	2020-03-13 21:27:39 +00:00
mrliptontea	a2b49b6ff1	Release v2.9.1	2020-02-22 14:55:25 +00:00
mrliptontea	205109ac30	Fix roadmap badge positioning	2020-02-22 14:54:33 +00:00
mrliptontea	e981dc4ec0	Merge branch '1resu-patch-1'	2020-02-22 14:45:55 +00:00
mrliptontea	955aca022e	Build updated JS	2020-02-22 14:41:40 +00:00
1resu	164391c6c2	Fix url.indexOf is Not a Function Error The sidebar toogler isn't working with newer jquery versions (https://jquery.com/upgrade-guide/3.0/#breaking-change-load-unload-and-error-removed)	2020-02-20 22:20:12 +01:00
mrliptontea	e5b9b5fdf9	Release v2.9.0	2020-01-30 21:14:20 +00:00
Grzegorz Rajchman	e7e68125b3	Merge pull request #154 from mrliptontea/resolve-issues Resolve issues	2020-01-30 20:59:03 +00:00
mrliptontea	57a60673a7	Resolve issues * Fixed #141: improved styling for issue edit form. * Fixed #142: TOC assumes `left` by default, also added new variables to control how it looks. * Fixed #143: `$main-menu-bg-hover` is now being used. * Resolved #144: added `$main-menu-bg-active` variable. * Resolved #145: added `$table-list-header-bg` variable. * Fixed #147: corrected forum edit attached files icon. * Fixed #153: improved styling for `label.block`.	2020-01-30 20:55:46 +00:00
mrliptontea	136cf02394	Update dependencies	2020-01-28 20:20:28 +00:00
mrliptontea	9f7d02e511	Update badges	2019-08-13 23:04:19 +01:00
Grzegorz Rajchman	6b64af35a5	Merge pull request #137 from mrliptontea/actions Set up actions	2019-08-13 22:46:28 +01:00
mrliptontea	e716b92e67	Set up actions	2019-08-13 22:42:48 +01:00