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.
mrliptontea · Apr 5, 2020 · 2eb5d83 · 2eb5d83
2 parents aaddd2e + 1bdfab7
commit 2eb5d83
Show file tree

Hide file tree

Showing 22 changed files with 293 additions and 236 deletions.
diff --git a/README.md b/README.md
@@ -58,11 +58,18 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe
 
 Latest (master):
 
+* 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):
 

diff --git a/plugins/redmine_backlogs/jquery/jquery-ui.css b/plugins/redmine_backlogs/jquery/jquery-ui.css
diff --git a/plugins/redmine_backlogs/master_backlog.css b/plugins/redmine_backlogs/master_backlog.css
diff --git a/plugins/redmine_backlogs/taskboard.css b/plugins/redmine_backlogs/taskboard.css
diff --git a/screenshots/calendar.png b/screenshots/calendar.png
diff --git a/screenshots/issue-page.png b/screenshots/issue-page.png
diff --git a/screenshots/issues.png b/screenshots/issues.png
diff --git a/screenshots/new-issue.png b/screenshots/new-issue.png
diff --git a/screenshots/redmine-backlogs.png b/screenshots/redmine-backlogs.png
diff --git 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) {
@@ -612,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;
@@ -648,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

diff --git 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;

diff --git a/src/sass/components/_buttons.scss b/src/sass/components/_buttons.scss
@@ -187,6 +187,10 @@ p.buttons {
     min-width: 130px;
   }
 
+  label + & {
+    margin-left: $padding-side;
+  }
+
   @at-root span#{&} {
     > span {
       display: inline-block;

diff --git 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);
@@ -669,28 +672,44 @@ 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;
   font-weight: $font-weight-bold;
   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;
+    }
   }
 }
 
@@ -754,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;
 
@@ -776,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;
     }
@@ -794,7 +813,7 @@ div.table-list.boards {
 
     .attachments {
       padding: $bubble-padding-horizontal;
-      border-top-color: mix($gray-400, $gray-100, 50%);
+      border-top-color: $bubble-border;
     }
   }
 
@@ -828,12 +847,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;
         }
       }
 

diff --git 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;
     }
   }
 }
@@ -386,6 +402,10 @@ label.inline {
     margin-left: -$check-input-gutter;
     float: left;
   }
+
+  input + & {
+    padding-left: 0;
+  }
 }
 
 label.block {

diff --git a/src/sass/components/_icons.scss b/src/sass/components/_icons.scss
@@ -266,6 +266,10 @@ a.icon-del {
   }
 }
 
+.icon-zoom-in + .icon-zoom-out {
+  margin-left: 5px;
+}
+
 
 //== Administration menu sections
 //