Backport fixes from v2

- Fix #89: RM+ custom menu breaking the layout - Fix #90: regression in some sidebar layouts - Fix #93: Agile chart expanding indefinitely when Additional "Go to top" link is enabled - Fix #94: subtasks indentation - Fix styling of some flash messages - Fix horizontal scrollbar appearing when sidebar is on the right - Fix footer being mispositioned in Agile charts - Fix positioning of admin menu icons for some plugins - Improve support for Redmine Tags plugin - Add separator line between news on the news list - Improve Redmine 4.0 compatibility - Update Font Awesome icons to 4.7.0
2019-03-22 23:22:36 +00:00
parent b79991966a
commit f1df7d1e29
34 changed files with 3518 additions and 760 deletions
--- a/README.md
+++ b/README.md
@@ -56,6 +56,22 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe

 ## Changelog

+Latest:
+
+* Backported fixes from v2:
+  * Fixed #89: [RM+ custom menu](http://rmplus.pro/en/redmine/plugins/custom_menu) breaking the layout
+  * Fixed #90: regression in some sidebar layouts
+  * Fixed #93: Agile chart expanding indefinitely when Additional "Go to top" link is enabled
+  * Fixed #94: subtasks indentation
+  * Fixed styling of some flash messages
+  * Fixed horizontal scrollbar appearing when sidebar is on the right
+  * Fixed footer being mispositioned in Agile charts
+  * Fixed positioning of admin menu icons for some plugins
+  * Improved support for [Redmine Tags](https://www.redmineup.com/pages/plugins/tags) plugin
+  * Added separator line between news on the news list
+  * Improved Redmine 4.0 compatibility
+  * Updated Font Awesome icons to 4.7.0
+
 v1.10.0 (2019-03-12):

 * Fixed #86: added support for redmine_hearts plugin
--- a/fonts/FontAwesome.otf
+++ b/fonts/FontAwesome.otf
--- a/fonts/fontawesome-webfont.eot
+++ b/fonts/fontawesome-webfont.eot
--- a/fonts/fontawesome-webfont.svg
+++ b/fonts/fontawesome-webfont.svg
--- a/fonts/fontawesome-webfont.ttf
+++ b/fonts/fontawesome-webfont.ttf
--- a/fonts/fontawesome-webfont.woff
+++ b/fonts/fontawesome-webfont.woff
--- a/fonts/fontawesome-webfont.woff2
+++ b/fonts/fontawesome-webfont.woff2
--- a/package-lock.json
+++ b/package-lock.json
@@ -657,12 +657,6 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
          "dev": true
        },
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-          "dev": true
-        },
        "glob": {
          "version": "7.1.3",
          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
@@ -678,9 +672,9 @@
          }
        },
        "js-yaml": {
-          "version": "3.12.1",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-          "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+          "version": "3.13.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+          "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
          "dev": true,
          "requires": {
            "argparse": "^1.0.7",
@@ -960,9 +954,9 @@
      }
    },
    "esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
    },
    "esquery": {
      "version": "1.0.1",
@@ -1276,9 +1270,9 @@
      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
    },
    "grunt": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz",
-      "integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz",
+      "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==",
      "requires": {
        "coffeescript": "~1.10.0",
        "dateformat": "~1.0.12",
@@ -1291,7 +1285,7 @@
        "grunt-legacy-log": "~2.0.0",
        "grunt-legacy-util": "~1.1.1",
        "iconv-lite": "~0.4.13",
-        "js-yaml": "~3.5.2",
+        "js-yaml": "~3.13.0",
        "minimatch": "~3.0.2",
        "mkdirp": "~0.5.1",
        "nopt": "~3.0.6",
@@ -1704,12 +1698,12 @@
      "dev": true
    },
    "js-yaml": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz",
-      "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=",
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+      "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
      "requires": {
-        "argparse": "^1.0.2",
-        "esprima": "^2.6.0"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
      }
    },
    "jsbn": {
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
  },
  "dependencies": {
    "autoprefixer": "^9.4.8",
-    "grunt": "^1.0.3",
+    "grunt": "^1.0.4",
    "grunt-contrib-uglify": "^4.0.0",
    "grunt-contrib-watch": "^1.1.0",
    "grunt-postcss": "^0.9.0",
--- a/src/sass/components/_admin.scss
+++ b/src/sass/components/_admin.scss
@@ -3,6 +3,18 @@
 // --------------------------------------------------

 #admin-menu {
+  ul:nth-child(n) {
+    li {
+      list-style-type: none;
+
+      > a:not(.icon-only) {
+        padding-left: $sidebar-padding-horizontal + 5px + 20px;
+        background-repeat: no-repeat;
+        background-position: $sidebar-padding-horizontal center;
+      }
+    }
+  }
+
  #admin-index > & {
    ul {
      margin: 0;
@@ -19,16 +31,6 @@
      background-position: 0 center;
    }
  }
-
-  li {
-    list-style-type: none;
-
-    > a:not(.icon-only) {
-      padding-left: $sidebar-padding-horizontal + 5px + 20px;
-      background-repeat: no-repeat;
-      background-position: $sidebar-padding-horizontal center;
-    }
-  }
 }


--- a/src/sass/components/_base.scss
+++ b/src/sass/components/_base.scss
@@ -4,6 +4,7 @@

 html {
  overflow-y: scroll;
+  tab-size: 4;
 }

 body {
@@ -41,6 +42,19 @@ a {
  }
 }

+// Remove the tapping delay on clickable elements
+a,
+area,
+button,
+input,
+label,
+select,
+summary,
+textarea,
+[tabindex] {
+  touch-action: manipulation;
+}
+
 h1 {
  margin: 0;
  font-size: 2em;             // ~28px
@@ -127,6 +141,11 @@ hr {
  margin-bottom: $line-height-computed;
  border: 0;
  border-top: 1px solid $hr-border;
+
+  li & {
+    margin-top:    $line-height-computed / 2;
+    margin-bottom: $line-height-computed / 2;
+  }
 }

 abbr[title] {
--- a/src/sass/components/_buttons.scss
+++ b/src/sass/components/_buttons.scss
@@ -4,6 +4,7 @@

 input[type="button"],
 input[type="submit"],
+input[type="reset"],
 button {
  @include button-size($btn-padding-vertical, $btn-padding-horizontal, $font-size-base, $line-height-base, $border-radius-base);
  display: inline-block;
--- a/src/sass/components/_content.scss
+++ b/src/sass/components/_content.scss
@@ -29,7 +29,22 @@
 // --------------------------------------------------

 #sidebar {
-  padding: $padding-side $sidebar-padding-horizontal;
+  #main & {
+    padding: $padding-side $sidebar-padding-horizontal;
+  }
+
+  #main.nosidebar & {
+    margin: 0;
+    padding: 0;
+    border: 0 none;
+
+    @if $flexbox-layout {
+      flex: 0 0 auto;
+    } @else {
+      width: 0;
+      float: none;
+    }
+  }

  @if $flexbox-layout {
    flex: 0 0 $sidebar-width-computed;
@@ -58,19 +73,6 @@
    }
  }

-  .nosidebar & {
-    margin: 0;
-    padding: 0;
-    border: 0 none;
-
-    @if $flexbox-layout {
-      flex: 0 0 auto;
-    } @else {
-      width: 0;
-      float: none;
-    }
-  }
-
  h3 {
    margin-top: $line-height-computed * 1.5;
  }
@@ -81,56 +83,70 @@
  }

  ul {
-    margin: 0 0 ($line-height-computed / 2);
-    padding: 0;
+    &:nth-child(n) {
+      margin: 0 0 ($line-height-computed / 2);
+      padding: 0;

-    @if $sidebar-position == "left" {
-      margin-right: -($sidebar-padding-horizontal);
-    } @else {
-      margin-left: -($sidebar-padding-horizontal);
+      @if $sidebar-position == "left" {
+        margin-right: -($sidebar-padding-horizontal);
+      }
+    }
+
+    &:not(.watchers) {
+      li {
+        margin: 0;
+        padding: 0;
+        list-style-type: none;
+
+        > a:not(.icon-only) {
+          display: block;
+          padding: $sidebar-padding-vertical $sidebar-padding-horizontal;
+          border: 1px solid transparent;
+
+          @if $sidebar-position == "left" {
+            border-left-width: 3px;
+            border-radius: $border-radius-large 0 0 $border-radius-large;
+          } @else {
+            border-right-width: 3px;
+            border-radius: 0 $border-radius-large $border-radius-large 0;
+          }
+
+          &:hover {
+            background-color: $sidebar-link-hover-bg;
+            text-decoration: none;
+          }
+
+          &.selected {
+            border-color: $sidebar-link-active-border;
+            background-color: $sidebar-link-active-bg;
+            color: $sidebar-link-active-text;
+
+            @if $sidebar-position == "left" {
+              margin-right: -1px;
+              border-right-color: $body-bg;
+              border-left-color: $sidebar-link-active-side;
+              box-shadow: -3px 1px 2px rgba(0, 0, 0, .1);
+            } @else {
+              margin-left: -1px;
+              border-right-color: $sidebar-link-active-side;
+              border-left-color: $body-bg;
+              box-shadow: 3px 1px 2px rgba(0, 0, 0, .1);
+            }
+          }
+        }
+      }
    }
  }

-  li {
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
+  // Special treatment for anchor tags directly under sidebar tag
+  > a {
+    margin: $sidebar-padding-vertical $sidebar-padding-horizontal;

-    > a:not(.icon-only) {
-      display: block;
-      padding: $sidebar-padding-vertical $sidebar-padding-horizontal;
-      border: 1px solid transparent;
-
-      @if $sidebar-position == "left" {
-        border-left-width: 3px;
-        border-radius: $border-radius-large 0 0 $border-radius-large;
-      } @else {
-        border-right-width: 3px;
-        border-radius: 0 $border-radius-large $border-radius-large 0;
-      }
-
-      &:hover {
-        background-color: $sidebar-link-hover-bg;
-        text-decoration: none;
-      }
-
-      &.selected {
-        border-color: $sidebar-link-active-border;
-        background-color: $sidebar-link-active-bg;
-        color: $sidebar-link-active-text;
-
-        @if $sidebar-position == "left" {
-          margin-right: -1px;
-          border-right-color: $body-bg;
-          border-left-color: $sidebar-link-active-side;
-          box-shadow: -3px 1px 2px rgba(0, 0, 0, .1);
-        } @else {
-          margin-left: -1px;
-          border-right-color: $sidebar-link-active-side;
-          border-left-color: $body-bg;
-          box-shadow: 3px 1px 2px rgba(0, 0, 0, .1);
-        }
-      }
+    @if $sidebar-position == "left" {
+      margin-left: $sidebar-padding-horizontal + 3px;
+    } @else {
+      margin-right: $sidebar-padding-horizontal + 3px;
+      margin-left: 0;
    }
  }
 }
--- a/src/sass/components/_dropdown.scss
+++ b/src/sass/components/_dropdown.scss
@@ -5,40 +5,14 @@
    > .drdn-content {
      display: block;
    }
-
-    > .drdn-trigger {
-      @if $use-font-awesome {
-        &::after {
-          content: $fa-var-caret-up;
-        }
-      } @else {
-        @extend %image-arrow-up;
-      }
-    }
  }

  &-trigger {
-    @extend %form-field;
    display: inline-block;
    position: relative;
    box-sizing: border-box;
    cursor: pointer;
    user-select: none;
-
-    @if $use-font-awesome {
-      @extend %fa-icon-after;
-
-      &::after {
-        content: $fa-var-caret-down;
-        position: absolute;
-        top: ($font-size-base / 2);
-        right: $input-padding-horizontal;
-      }
-    } @else {
-      @extend %image-arrow-down;
-      background-repeat: no-repeat;
-      background-position: right ($input-padding-horizontal / 2) center;
-    }
  }

  &-content {
@@ -48,9 +22,10 @@
    z-index: 1002;
    top: $input-height-base + $btn-padding-vertical;
    right: 0;
+    min-width: 150px;
    overflow: hidden;
    border-radius: $border-radius-base;
-    background: $main-menu-dropdown-bg;
+    background: $body-bg;
  }

  &-items {
@@ -69,7 +44,7 @@
          content: " ";
          display: inline-block;
          width: 1em;
-          font-weight: bold;
+          font-weight: $font-weight-bold;
        }

        @if $use-font-awesome {
@@ -89,10 +64,49 @@
    > a,
    > span {
      display: block;
-      padding: $btn-padding-vertical $btn-padding-horizontal;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
+      margin: 0;
+      padding: $btn-padding-vertical $btn-padding-horizontal-small;
+
+      &.icon {
+        padding-left: 20px + $btn-padding-horizontal-small;
+
+        &::before {
+          width: 20px;
+          margin-top: 3px;
+          float: left;
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+
+.contextual {
+  .drdn {
+    &-trigger {
+      > .icon-only::before {
+        margin: 0 1px;
+      }
+    }
+
+    &-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;
+        }
+      }
    }
  }
 }
--- a/src/sass/components/_elements.scss
+++ b/src/sass/components/_elements.scss
@@ -47,7 +47,7 @@ a.collapsible.collapsed,
  fieldset.collapsible {
    min-height: $line-height-computed;
    max-height: $collapsible-max-height;
-    overflow: hidden;
+    overflow: auto;
    transition: max-height $collapsible-animation-time ease-out;

    > div {
@@ -59,6 +59,7 @@ a.collapsible.collapsed,

    &.collapsed {
      max-height: 0;
+      overflow: hidden;
      transition: max-height $collapsible-animation-time;

      > div {
@@ -93,10 +94,14 @@ a.collapsible.collapsed,

  a {
    display: inline-block;
-    margin-left: $padding-small-vertical;
    white-space: nowrap;
  }

+  a,
+  .drdn {
+    margin-left: $padding-small-vertical;
+  }
+
  > :first-child {
    margin-left: 0;
  }
@@ -235,10 +240,7 @@ a.collapsible.collapsed,
      }

      img.gravatar {
-        position: relative;
-        top: 1px;
        margin-right: .5em;
-        vertical-align: top;
      }
    }
  }
@@ -834,8 +836,49 @@ div.table-list.boards {
 //== News
 //

+.news.box {
+  p > a:not(:last-child) {
+    display: inline-block;
+    margin-bottom: floor($line-height-computed / 4);
+    font-size: $font-size-h4;
+  }
+
+  .summary,
+  .author {
+    display: block;
+    margin-bottom: floor($line-height-computed / 4);
+
+    + br {
+      display: none;
+    }
+  }
+
+  .author {
+    margin-bottom: $line-height-computed;
+  }
+}
+
+#edit-news + p {
+  em {
+    display: block;
+    margin-bottom: floor($line-height-computed / 4);
+
+    + br {
+      display: none;
+    }
+  }
+}
+
+.news.box .summary,
+#edit-news + p em {
+  padding: floor($line-height-computed / 4) $padding-base-horizontal;
+  border-left: 4px solid $blockquote-border-color;
+}
+
 .news-article {
  margin-bottom: $line-height-computed;
+  padding-top: $line-height-computed;
+  border-top: 1px solid $panel-border;

  header {
    h3 {
@@ -849,8 +892,12 @@ div.table-list.boards {
  }
 }

-.author .user {
-  font-weight: $font-weight-bold;
+.author {
+  color: $gray;
+
+  .user {
+    font-weight: $font-weight-bold;
+  }
 }


--- a/src/sass/components/_flash.scss
+++ b/src/sass/components/_flash.scss
@@ -77,6 +77,12 @@
  padding-left: $padding-large-horizontal;
  text-align: center;

+  &.nodata-left {
+    &::before {
+      float: left;
+    }
+  }
+
  @if $use-font-awesome {
    &::before {
      margin-left: 0;
--- a/src/sass/components/_forms.scss
+++ b/src/sass/components/_forms.scss
@@ -615,6 +615,7 @@ fieldset#filters {
    }

    &.values {
+      min-width: 130px;
      white-space: nowrap;

      select {
--- a/src/sass/components/_gravatar.scss
+++ b/src/sass/components/_gravatar.scss
@@ -3,6 +3,8 @@
 // --------------------------------------------------

 img.gravatar {
+  position: relative;
+  top: -.15em;
  overflow: hidden;
  border-radius: $border-radius-large;
  line-height: 1;
@@ -11,8 +13,6 @@ img.gravatar {
  h2 &,
  h3 &,
  h4 & {
-    position: relative;
-    top: -1px;
    margin-right: 5px;
  }
 }
@@ -22,10 +22,7 @@ img.gravatar {
 //

 .username img.gravatar {
-  position: relative;
-  top: 1px;
  margin-right: .5em;
-  vertical-align: top;
 }

 //== Gravatar
--- a/src/sass/components/_icons.scss
+++ b/src/sass/components/_icons.scss
@@ -36,7 +36,7 @@ $icon-danger-hover-color:            darken($brand-danger, 10%);
  }

  table.list .buttons > a::before {
-    font-size: 14px;
+    font-size: $fa-font-size-base;
  }
 }

@@ -121,6 +121,7 @@ $icon-danger-hover-color:            darken($brand-danger, 10%);
  .open .icon-folder::before          { content: $fa-var-folder-open; }
  .icon-package::before               { content: $fa-var-cube; }
  .icon-user::before                  { content: $fa-var-user; }
+  .icon-project::before               { content: $fa-var-cube; }
  .icon-projects::before              { content: $fa-var-cubes; }
  .icon-help::before                  { content: $fa-var-info-circle; }
  .icon-attachment::before            { content: $fa-var-paperclip; }
@@ -131,9 +132,9 @@ $icon-danger-hover-color:            darken($brand-danger, 10%);
  .icon-stats::before                 { content: $fa-var-line-chart; }
  .icon-warning::before               { content: $fa-var-warning; }
  .icon-error::before                 { content: $fa-var-exclamation; }
-  .icon-fav::before                   { content: $fa-var-star; }
+  .icon-fav::before                   { content: $fa-var-star; color: #ed820c; }
  .icon-fav-off::before               { content: $fa-var-star-o; }
-  .icon-heart::before                 { content: $fa-var-heart; }
+  .icon-heart::before                 { content: $fa-var-heart; color: #eb5286; }
  .icon-heart-off::before             { content: $fa-var-heart-o; }
  .icon-reload::before                { content: $fa-var-refresh; }
  .icon-locked::before                { content: $fa-var-lock; }
@@ -152,7 +153,6 @@ $icon-danger-hover-color:            darken($brand-danger, 10%);
  .icon-passwd::before                { content: $fa-var-key; }
  .icon-test::before                  { content: $fa-var-arrow-circle-right; }
  .icon-phone::before                 { content: $fa-var-phone; }
-  .icon-email::before                 { content: $fa-var-envelope; }
  .icon-skype::before                 { content: $fa-var-skype; }
  .icon-facebook::before              { content: $fa-var-facebook-square; }
  .icon-linkedin::before              { content: $fa-var-linkedin-square; }
@@ -193,6 +193,7 @@ $icon-danger-hover-color:            darken($brand-danger, 10%);
  .icon-project::before               { content: $fa-var-cube; }
  .icon-add-bullet::before            { content: $fa-var-plus-circle; }
  .icon-shared::before                { content: $fa-var-link; }
+  .icon-actions::before               { content: $fa-var-ellipsis-h; }
 } @else {
  .icon {
    padding-top: 2px;
@@ -425,13 +426,6 @@ $icon-danger-hover-color:            darken($brand-danger, 10%);
  %admin-icon {
    @extend %fa-icon;

-    &::before {
-      width: 20px;
-      margin-left: -(5px + 20px);
-      color: $gray;
-      text-align: center;
-    }
-
    &:hover::before {
      color: $gray-darker;
    }
@@ -451,6 +445,16 @@ $icon-danger-hover-color:            darken($brand-danger, 10%);
    li {
      > a {
        padding-left: $sidebar-padding-horizontal + 5px + 20px;
+
+        &::before {
+          display: inline-block;
+          width: 20px;
+          margin: 0;
+          margin-left: -(5px + 20px);
+          padding: 0;
+          color: $gray;
+          text-align: center;
+        }
      }
    }

@@ -972,6 +976,7 @@ $icon-danger-hover-color:            darken($brand-danger, 10%);
  .other-formats {
    %other-format {
      @extend %fa-icon;
+      background-image: none;

      &::before {
        margin-right: .3em;
--- a/src/sass/components/_issue.scss
+++ b/src/sass/components/_issue.scss
@@ -18,6 +18,7 @@
        position: relative;

        > img.gravatar {
+          top: 0;
          width: $issue-gravatar-size;
          height: $issue-gravatar-size;
          margin-right: 10px;
@@ -37,6 +38,7 @@
      }

      > img.gravatar {
+        top: 0;
        width: $issue-gravatar-size;
        height: $issue-gravatar-size;
        margin-right: 10px;
@@ -219,10 +221,16 @@
  }

  div.attachments {
-    margin: -$issue-padding;
-    padding: $issue-padding;
+    margin: 0;
+    padding: 0;
    border-top: 0;
  }
+
+  div.description + div.attachments {
+    margin: $issue-padding (-$issue-padding) (-$issue-padding);
+    padding: $issue-padding;
+    border-top: 1px solid $issue-border;
+  }
 }

 div.fileover {
@@ -302,6 +310,10 @@ div.thumbnails {
  .issues {
    margin: ($line-height-computed / 2) 0 0;

+    tr {
+      background-color: transparent;
+    }
+
    tr:last-child > td {
      border-bottom: 0 none;
    }
@@ -310,26 +322,17 @@ div.thumbnails {
      display: none;
    }

-    td.subject {
-      padding-left: 0;
+    td.done_ratio {
+      width: 80px;
    }

    td.buttons {
+      width: 3em;
      vertical-align: middle;
    }
  }
 }

-#relations {
-  td.checkbox {
-    display: none;
-  }
-
-  td.buttons {
-    padding: 0;
-  }
-}
-
 #new-relation-form {
  text-align: right;

@@ -491,6 +494,7 @@ div.thumbnails {
      }

      > .gravatar {
+        top: 0;
        margin-top: $line-height-computed - $bubble-gravatar-size;
        margin-left: -($bubble-gravatar-size + $bubble-gravatar-space + $bubble-padding-horizontal + 1px);
        float: left;
--- a/src/sass/components/_jquery-ui.scss
+++ b/src/sass/components/_jquery-ui.scss
@@ -72,7 +72,7 @@
  background: $component-bg;
  box-shadow: none;
  color: $component-color;
-  font-weight: normal;
+  font-weight: $font-weight-normal;
 }

 .ui-state-default a,
@@ -91,7 +91,7 @@
  border: 1px solid $component-active-border;
  background: $component-active-bg;
  color: $component-active-color;
-  font-weight: normal;
+  font-weight: $font-weight-normal;
 }

 .ui-state-hover a,
@@ -112,7 +112,7 @@
  border: 1px solid $component-active-border;
  background: $component-active-bg;
  color: $component-active-color;
-  font-weight: normal;
+  font-weight: $font-weight-normal;

  .ui-icon {
    background-image: url("../../../stylesheets/jquery/images/ui-icons_ffffff_256x240.png");
--- a/src/sass/components/_jstoolbar.scss
+++ b/src/sass/components/_jstoolbar.scss
@@ -59,7 +59,7 @@
  }
 }

-.jstElements {
+div.jstElements {
  @extend %clearfix;

  .box & {
@@ -94,8 +94,15 @@

  button {
    margin-bottom: 5px;
+    padding: 0;
+    background-color: $body-bg;
    box-shadow: none;
+    color: $btn-default-color;
    vertical-align: top;
+
+    &::before {
+      text-align: center;
+    }
  }
 }

@@ -103,14 +110,7 @@
  .jstElements {
    %jstb-icon {
      @include fa-icon;
-      padding: 0;
-      background: $body-bg;
      background-image: none;
-      color: $btn-default-color;
-
-      &::before {
-        text-align: center;
-      }
    }

    .jstb_strong {
--- a/src/sass/components/_list.scss
+++ b/src/sass/components/_list.scss
@@ -51,15 +51,6 @@ table.list {
      }
    }

-    &.checkbox {
-      width: 15px;
-      padding: $table-cell-padding 0 0;
-
-      input {
-        margin: 2px 0 0;
-      }
-    }
-
    &.id,
    &.parent,
    &.relations,
@@ -72,10 +63,35 @@ table.list {
      text-align: right;
    }

+    &.reorder {
+      white-space: nowrap;
+    }
+
+    &.attachments a {
+      display: block;
+    }
+  }
+
+  th,
+  td {
+    &.checkbox {
+      width: 15px;
+      padding-right: $table-cell-padding;
+      padding-left: $table-cell-padding;
+
+      input {
+        margin: 2px 0 0;
+      }
+    }
+
+    &.id {
+      text-align: right;
+    }
+
+    &.activity,
    &.assigned_to,
    &.attachments,
    &.author,
-    &.activity,
    &.category,
    &.comments,
    &.description,
@@ -90,26 +106,19 @@ table.list {
    &.string,
    &.subject,
    &.text,
+    &.tracker,
    &.user {
      text-align: left;
    }

    &.estimated_hours,
+    &.float,
+    &.int,
    &.remaining_hours,
    &.spent_hours,
-    &.story_points,
-    &.int,
-    &.float {
+    &.story_points {
      text-align: right;
    }
-
-    &.reorder {
-      white-space: nowrap;
-    }
-
-    &.attachments a {
-      display: block;
-    }
  }

  td,
@@ -120,6 +129,10 @@ table.list {

      a {
        padding-right: 5px;
+
+        &.icon-only {
+          padding: 0;
+        }
      }

      img {
@@ -152,16 +165,15 @@ tr.project {
    color: #aaa;
  }

-  &.idnt .name span {
+  &.idnt td.name {
    @extend %image-arrow-right;
-    padding-left: 16px;
    background-repeat: no-repeat;
-    background-position: -5px 50%;
  }

  @for $i from 1 through 9 {
-    &.idnt-#{$i} .name {
-      padding-left: $table-cell-padding + 16px * ($i - 1);
+    &.idnt-#{$i} td.name {
+      padding-left: $table-cell-padding + 16px * $i;
+      background-position: ($table-cell-padding + 16px * ($i - 1) - 3px) 50%;
    }
  }
 }
@@ -186,13 +198,6 @@ tr.issue {
    }
  }

-  &.idnt .subject a {
-    @extend %image-arrow-right;
-    padding-left: 10px;
-    background-repeat: no-repeat;
-    background-position: -5px 0;
-  }
-
  .controller-issues.action-index & {
    &.assigned-to-me {
      .assigned_to,
@@ -204,9 +209,15 @@ tr.issue {
    }
  }

+  &.idnt td.subject {
+    @extend %image-arrow-right;
+    background-repeat: no-repeat;
+  }
+
  @for $i from 1 through 9 {
-    &.idnt-#{$i} .subject {
-      padding-left: $table-cell-padding + 16px * ($i - 1);
+    &.idnt-#{$i} td.subject {
+      padding-left: $table-cell-padding + 16px * $i;
+      background-position: ($table-cell-padding + 16px * ($i - 1) - 3px) 50%;
    }
  }
 }
--- a/src/sass/components/_plugins.scss
+++ b/src/sass/components/_plugins.scss
@@ -55,7 +55,7 @@
  > .heart-link-with-count {
    display: block;
    position: relative;
-    margin: -($line-height-computed / 2 + 1px) $bubble-padding-vertical 0;
+    margin: -($line-height-computed / 2 + 1px) ($bubble-padding-horizontal - $padding-small-vertical) 0;
    float: right;
    border: 0;
    background-color: $body-bg;
@@ -69,13 +69,8 @@
    background-image: none;
  }

-  .icon.icon-heart {
-    &::before {
-      color: #eb5286;
-    }
-  }
-
  .heart-link-with-count {
+    margin-right: $padding-small-vertical;
    margin-left: $padding-small-vertical;

    > .heart-count-number {
@@ -104,7 +99,7 @@
@if $use-font-awesome {
  .tt_list_button {
    @extend %fa-icon;
-    font-size: 14px;
+    font-size: $fa-font-size-base;
  }

  .icon,
@@ -151,6 +146,142 @@
 }


+//
+// Redmine Agile
+// https://www.redmineup.com/pages/plugins/agile
+// --------------------------------------------------
+
+.controller-agile_charts #main {
+  @if $flexbox-layout {
+    flex-wrap: wrap;
+
+    > #footer {
+      flex: 1 0 auto;
+      order: 3;
+    }
+  }
+
+  // Page layout on Agile charts is broken, and with "Go to top" link
+  // from https://github.com/alphanodes/additionals plugin enabled
+  // the chart expands and resize event is triggered indefinitely.
+  // Hiding the "Go to top" link fixes this issue.
+  .gototop {
+    display: none;
+  }
+}
+
+
+//
+// Redmine Tags
+// https://www.redmineup.com/pages/plugins/tags
+// --------------------------------------------------
+
+.select2 {
+  .filter .values & {
+    min-width: 180px;
+    margin: 0;
+  }
+
+  &.select2-container.select2-container--default {
+    .select2-selection--multiple {
+      line-height: $line-height-base;
+
+      .select2-selection__rendered {
+        padding: 0 3px 3px;
+      }
+
+      .select2-selection__choice {
+        padding-top: 0;
+        padding-bottom: 0;
+      }
+
+      .select2-search--inline {
+        input {
+          height: auto;
+          padding-top: 0;
+          padding-bottom: 0;
+          line-height: inherit;
+        }
+      }
+    }
+
+    .select2-selection {
+      transition: border-color 50ms ease-in-out,
+                  box-shadow 50ms ease-in-out;
+      border-color: $input-border;
+      box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
+    }
+
+    &.select2-container--focus {
+      .select2-selection {
+        border-color: rgba($input-border-focus, $input-border-focus-alpha);
+        box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 0 2px rgba($input-border-focus, $input-shadow-focus-alpha);
+      }
+    }
+  }
+}
+
+
+//
+// Redmine custom menu
+// http://rmplus.pro/en/redmine/plugins/custom_menu
+// --------------------------------------------------
+
+#top-menu {
+  .cm-menu-header {
+    > li {
+      margin: 0;
+
+      > a,
+      > .title {
+        line-height: $input-height-base;
+      }
+
+      > .cm-menu-divider {
+        height: 18px;
+        margin: 5px 4px 0 5px;
+        border-top: 0;
+        border-left: 1px solid;
+        opacity: .3;
+      }
+    }
+
+    .drdn-trigger {
+      font-size: $font-size-base;
+    }
+  }
+
+  .dropdown {
+    .dropdown-menu > li a:hover,
+    .dropdown-menu > li a:focus,
+    .dropdown-submenu:hover a,
+    .dropdown-submenu:focus a {
+      background-color: $brand-primary;
+      color: $brand-text;
+    }
+  }
+
+  .rm-icon {
+    &::before {
+      font-size: $fa-font-size-base;
+    }
+  }
+
+  #quick-search {
+    margin: 0;
+
+    form > input {
+      width: $quick-search-width / 2;
+      min-width: $quick-search-width / 2;
+    }
+
+    a {
+      line-height: inherit;
+    }
+  }
+}
+
+
 //
 // Redmine CRM People
 // http://www.redminecrm.com/projects/people/
--- a/src/sass/components/_responsive.scss
+++ b/src/sass/components/_responsive.scss
@@ -1,3 +1,4 @@
+// scss-lint:disable SelectorDepth
 .theme-Purplemine2 {
  @media screen and (max-width: $redmine-responsive-max) {
    .flyout-menu + div {
@@ -76,7 +77,7 @@
        padding: ($padding-side / 2);
        line-height: normal;

-        input[type='text'] {
+        input[type="text"] {
          height: $responsive-header-height - $padding-side;
          line-height: $responsive-header-height - $padding-side;
        }
@@ -138,6 +139,7 @@
    }

    .splitcontentleft {
+      margin-bottom: $line-height-computed;
      padding-right: 0;
      float: none;
    }
@@ -147,6 +149,29 @@
      float: none;
    }

+    .attributes .splitcontentleft {
+      margin-bottom: 0;
+    }
+
+    .tabular {
+      input[type="checkbox"],
+      input[type="radio"],
+      input.date {
+        width: auto;
+        max-width: 95%;
+      }
+
+      label {
+        float: none;
+      }
+    }
+
+    .pagination {
+      .pages {
+        display: block;
+      }
+    }
+
    p.buttons,
    .other-formats > span,
    #wiki_add_attachment > p,
@@ -170,7 +195,6 @@
        &:hover,
        &:focus {
          border-color: $pagination-hover-border;
-          outline: 0;
          background-color: $pagination-hover-bg;
          text-decoration: none;
        }
@@ -191,6 +215,38 @@
      }
    }

+    // For Redmine 4.0+
+    #content > .contextual .drdn {
+      padding: 0;
+      border: 0;
+
+      .drdn-trigger {
+        padding: ($btn-padding-vertical * 2) $btn-padding-horizontal;
+        border: 1px solid $pagination-border;
+        border-radius: $border-radius-base;
+        background-color: $pagination-bg;
+
+        &:active,
+        &:hover,
+        &:focus {
+          border-color: $pagination-hover-border;
+          background-color: $pagination-hover-bg;
+          text-decoration: none;
+        }
+      }
+
+      .drdn-items {
+        a {
+          display: block;
+          margin: 3px 0 0;
+
+          &:first-child {
+            margin-top: 0;
+          }
+        }
+      }
+    }
+
    // For Redmine 3.4+
    #my-page {
      #list-left {
--- a/src/sass/components/_simple-list.scss
+++ b/src/sass/components/_simple-list.scss
@@ -64,6 +64,7 @@

    @if $use-gravatars {
      .gravatar {
+        top: 0;
        margin-top: -2px;
        margin-right: $activity-avatar-space;
        float: left;
--- a/src/sass/components/_tabs.scss
+++ b/src/sass/components/_tabs.scss
@@ -56,17 +56,17 @@ $tabs-height: $line-height-computed + $tab-padding-vertical * 2 + 1px + 1px;
    top: 0;
    right: 0;
    width: $tabs-buttons-width;
+    border-bottom: 1px solid $tab-border;
    background-color: $body-bg;

    > button {
      width: 50%;
-      height: $tabs-height;
+      height: $tabs-height - 1px;
      margin: 0;
      padding: 0;
      float: left;
      transition: opacity .1s;
      border: 0 none;
-      border-bottom: 1px solid $tab-border;
      border-radius: 0;
      opacity: .8;
      background-color: $body-bg;
@@ -82,6 +82,10 @@ $tabs-height: $line-height-computed + $tab-padding-vertical * 2 + 1px + 1px;
      &:active {
        background-color: $tab-hover-bg;
      }
+
+      &.disabled {
+        opacity: .4;
+      }
    }

    .tab-left {
--- a/src/sass/components/_top.scss
+++ b/src/sass/components/_top.scss
@@ -42,7 +42,7 @@
      @if $use-font-awesome {
        @extend %fa-icon;
        color: mix($top-menu-link, $top-menu-bg, 33%);
-        font-size: 14px;
+        font-size: $fa-font-size-base;
        line-height: 1;

        &::before {
@@ -87,14 +87,15 @@
  }

  ul {
+    @include clearfix;
    margin: 0;
    padding: 0;
  }

  li {
-    display: inline;
    margin: 0 .5em 0 0;
    padding: 0;
+    float: left;
    list-style-type: none;
    white-space: nowrap;
  }
@@ -174,17 +175,19 @@
 }

 #quick-search {
-  margin-top: floor(($header-title-line-height + $header-padding-vertical * 2 - $input-height-base) / 2) - 1px;
-  margin-right: $header-padding-horizontal;
-  float: right;
-  color: $header-text;
+  #header & {
+    margin-top: floor(($header-title-line-height + $header-padding-vertical * 2 - $input-height-base) / 2) - 1px;
+    margin-right: $header-padding-horizontal;
+    float: right;
+    color: $header-text;
+  }

  form {
    display: inline-block;
-  }

-  input {
-    width: $quick-search-width;
+    input {
+      width: $quick-search-width;
+    }
  }

  > form > input,
@@ -216,13 +219,37 @@
      padding-bottom: $header-padding-horizontal / 2;
      border-color: $quick-search-dropdown-bg;
      background-color: $quick-search-dropdown-bg;
+
+      @if $use-font-awesome {
+        &::after {
+          content: $fa-var-caret-up;
+        }
+      } @else {
+        @extend %image-arrow-up;
+      }
    }
  }

  .drdn {
    &-trigger {
+      @extend %form-field;
      min-width: $quick-search-width;
      border-color: $quick-search-border;
+
+      @if $use-font-awesome {
+        @extend %fa-icon-after;
+
+        &::after {
+          content: $fa-var-caret-down;
+          position: absolute;
+          top: ($font-size-base / 2);
+          right: $input-padding-horizontal;
+        }
+      } @else {
+        @extend %image-arrow-down;
+        background-repeat: no-repeat;
+        background-position: right ($input-padding-horizontal / 2) center;
+      }
    }

    &-content {
@@ -240,6 +267,13 @@

    &-items {
      border-top: 1px solid $quick-search-dropdown-border;
+
+      > a,
+      > span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
    }
  }

@@ -248,7 +282,6 @@

    &:hover,
    &:focus {
-      outline: 0 none;
      background-color: $component-active-bg;
      color: $component-active-color;
      text-decoration: none;
@@ -402,11 +435,12 @@
  .tabs-buttons {
    display: none !important; // scss-lint:disable ImportantRule
    padding-left: 0;
+    border-color: $main-menu-border;
    background-color: $main-menu-bg;

    > button {
      box-sizing: border-box;
-      height: $tabs-height;
+      height: $tabs-height - 1px;
      background-color: $main-menu-bg;
    }
  }
--- a/src/sass/components/_wiki.scss
+++ b/src/sass/components/_wiki.scss
@@ -23,8 +23,11 @@
  }
 }

-.controller-wiki .wiki > .preview {
-  font-size: $wiki-font-size;
+.controller-wiki {
+  .wiki > .preview,
+  .wiki.wiki-preview {
+    font-size: $wiki-font-size;
+  }
 }

 div.wiki {
--- a/src/sass/lib/_font-awesome.scss
+++ b/src/sass/lib/_font-awesome.scss
@@ -1,5 +1,5 @@
-/**
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
 *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
 */

--- a/src/sass/lib/font-awesome/_path.scss
+++ b/src/sass/lib/font-awesome/_path.scss
@@ -5,9 +5,10 @@
  font-family: "FontAwesome";
  src: url("#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}");
  src: url("#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}") format("embedded-opentype"),
-     url("#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}") format("woff"),
-     url("#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}") format("truetype"),
-     url("#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular") format("svg");
+    url("#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}") format("woff2"),
+    url("#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}") format("woff"),
+    url("#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}") format("truetype"),
+    url("#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular") format("svg");
  font-weight: normal;
  font-style: normal;
 }
--- a/src/sass/lib/font-awesome/_variables.scss
+++ b/src/sass/lib/font-awesome/_variables.scss
@@ -2,19 +2,28 @@
 // --------------------------

 $fa-font-path:                  "../fonts" !default;
+$fa-font-size-base:             14px !default;
+$fa-line-height-base:           1 !default;
 $fa-css-prefix:                 fa !default;
-$fa-version:                    "4.2.0" !default;
+$fa-version:                    "4.7.0" !default;
 $fa-border-color:               #eee !default;
 $fa-inverse:                    #fff !default;
 $fa-li-width:                   (30em / 14) !default;

+$fa-var-500px:                  "\f26e";
+$fa-var-address-book:           "\f2b9";
+$fa-var-address-book-o:         "\f2ba";
+$fa-var-address-card:           "\f2bb";
+$fa-var-address-card-o:         "\f2bc";
 $fa-var-adjust:                 "\f042";
 $fa-var-adn:                    "\f170";
 $fa-var-align-center:           "\f037";
 $fa-var-align-justify:          "\f039";
 $fa-var-align-left:             "\f036";
 $fa-var-align-right:            "\f038";
+$fa-var-amazon:                 "\f270";
 $fa-var-ambulance:              "\f0f9";
+$fa-var-american-sign-language-interpreting: "\f2a3";
 $fa-var-anchor:                 "\f13d";
 $fa-var-android:                "\f17b";
 $fa-var-angellist:              "\f209";
@@ -45,16 +54,35 @@ $fa-var-arrows:                 "\f047";
 $fa-var-arrows-alt:             "\f0b2";
 $fa-var-arrows-h:               "\f07e";
 $fa-var-arrows-v:               "\f07d";
+$fa-var-asl-interpreting:       "\f2a3";
+$fa-var-assistive-listening-systems: "\f2a2";
 $fa-var-asterisk:               "\f069";
 $fa-var-at:                     "\f1fa";
+$fa-var-audio-description:      "\f29e";
 $fa-var-automobile:             "\f1b9";
 $fa-var-backward:               "\f04a";
+$fa-var-balance-scale:          "\f24e";
 $fa-var-ban:                    "\f05e";
+$fa-var-bandcamp:               "\f2d5";
 $fa-var-bank:                   "\f19c";
 $fa-var-bar-chart:              "\f080";
 $fa-var-bar-chart-o:            "\f080";
 $fa-var-barcode:                "\f02a";
 $fa-var-bars:                   "\f0c9";
+$fa-var-bath:                   "\f2cd";
+$fa-var-bathtub:                "\f2cd";
+$fa-var-battery:                "\f240";
+$fa-var-battery-0:              "\f244";
+$fa-var-battery-1:              "\f243";
+$fa-var-battery-2:              "\f242";
+$fa-var-battery-3:              "\f241";
+$fa-var-battery-4:              "\f240";
+$fa-var-battery-empty:          "\f244";
+$fa-var-battery-full:           "\f240";
+$fa-var-battery-half:           "\f242";
+$fa-var-battery-quarter:        "\f243";
+$fa-var-battery-three-quarters: "\f241";
+$fa-var-bed:                    "\f236";
 $fa-var-beer:                   "\f0fc";
 $fa-var-behance:                "\f1b4";
 $fa-var-behance-square:         "\f1b5";
@@ -68,12 +96,17 @@ $fa-var-birthday-cake:          "\f1fd";
 $fa-var-bitbucket:              "\f171";
 $fa-var-bitbucket-square:       "\f172";
 $fa-var-bitcoin:                "\f15a";
+$fa-var-black-tie:              "\f27e";
+$fa-var-blind:                  "\f29d";
+$fa-var-bluetooth:              "\f293";
+$fa-var-bluetooth-b:            "\f294";
 $fa-var-bold:                   "\f032";
 $fa-var-bolt:                   "\f0e7";
 $fa-var-bomb:                   "\f1e2";
 $fa-var-book:                   "\f02d";
 $fa-var-bookmark:               "\f02e";
 $fa-var-bookmark-o:             "\f097";
+$fa-var-braille:                "\f2a1";
 $fa-var-briefcase:              "\f0b1";
 $fa-var-btc:                    "\f15a";
 $fa-var-bug:                    "\f188";
@@ -82,10 +115,15 @@ $fa-var-building-o:             "\f0f7";
 $fa-var-bullhorn:               "\f0a1";
 $fa-var-bullseye:               "\f140";
 $fa-var-bus:                    "\f207";
+$fa-var-buysellads:             "\f20d";
 $fa-var-cab:                    "\f1ba";
 $fa-var-calculator:             "\f1ec";
 $fa-var-calendar:               "\f073";
+$fa-var-calendar-check-o:       "\f274";
+$fa-var-calendar-minus-o:       "\f272";
 $fa-var-calendar-o:             "\f133";
+$fa-var-calendar-plus-o:        "\f271";
+$fa-var-calendar-times-o:       "\f273";
 $fa-var-camera:                 "\f030";
 $fa-var-camera-retro:           "\f083";
 $fa-var-car:                    "\f1b9";
@@ -97,9 +135,13 @@ $fa-var-caret-square-o-left:    "\f191";
 $fa-var-caret-square-o-right:   "\f152";
 $fa-var-caret-square-o-up:      "\f151";
 $fa-var-caret-up:               "\f0d8";
+$fa-var-cart-arrow-down:        "\f218";
+$fa-var-cart-plus:              "\f217";
 $fa-var-cc:                     "\f20a";
 $fa-var-cc-amex:                "\f1f3";
+$fa-var-cc-diners-club:         "\f24c";
 $fa-var-cc-discover:            "\f1f2";
+$fa-var-cc-jcb:                 "\f24b";
 $fa-var-cc-mastercard:          "\f1f1";
 $fa-var-cc-paypal:              "\f1f4";
 $fa-var-cc-stripe:              "\f1f5";
@@ -121,12 +163,14 @@ $fa-var-chevron-left:           "\f053";
 $fa-var-chevron-right:          "\f054";
 $fa-var-chevron-up:             "\f077";
 $fa-var-child:                  "\f1ae";
+$fa-var-chrome:                 "\f268";
 $fa-var-circle:                 "\f111";
 $fa-var-circle-o:               "\f10c";
 $fa-var-circle-o-notch:         "\f1ce";
 $fa-var-circle-thin:            "\f1db";
 $fa-var-clipboard:              "\f0ea";
 $fa-var-clock-o:                "\f017";
+$fa-var-clone:                  "\f24d";
 $fa-var-close:                  "\f00d";
 $fa-var-cloud:                  "\f0c2";
 $fa-var-cloud-download:         "\f0ed";
@@ -135,19 +179,26 @@ $fa-var-cny:                    "\f157";
 $fa-var-code:                   "\f121";
 $fa-var-code-fork:              "\f126";
 $fa-var-codepen:                "\f1cb";
+$fa-var-codiepie:               "\f284";
 $fa-var-coffee:                 "\f0f4";
 $fa-var-cog:                    "\f013";
 $fa-var-cogs:                   "\f085";
 $fa-var-columns:                "\f0db";
 $fa-var-comment:                "\f075";
 $fa-var-comment-o:              "\f0e5";
+$fa-var-commenting:             "\f27a";
+$fa-var-commenting-o:           "\f27b";
 $fa-var-comments:               "\f086";
 $fa-var-comments-o:             "\f0e6";
 $fa-var-compass:                "\f14e";
 $fa-var-compress:               "\f066";
+$fa-var-connectdevelop:         "\f20e";
+$fa-var-contao:                 "\f26d";
 $fa-var-copy:                   "\f0c5";
 $fa-var-copyright:              "\f1f9";
+$fa-var-creative-commons:       "\f25e";
 $fa-var-credit-card:            "\f09d";
+$fa-var-credit-card-alt:        "\f283";
 $fa-var-crop:                   "\f125";
 $fa-var-crosshairs:             "\f05b";
 $fa-var-css3:                   "\f13c";
@@ -156,27 +207,39 @@ $fa-var-cubes:                  "\f1b3";
 $fa-var-cut:                    "\f0c4";
 $fa-var-cutlery:                "\f0f5";
 $fa-var-dashboard:              "\f0e4";
+$fa-var-dashcube:               "\f210";
 $fa-var-database:               "\f1c0";
+$fa-var-deaf:                   "\f2a4";
+$fa-var-deafness:               "\f2a4";
 $fa-var-dedent:                 "\f03b";
 $fa-var-delicious:              "\f1a5";
 $fa-var-desktop:                "\f108";
 $fa-var-deviantart:             "\f1bd";
+$fa-var-diamond:                "\f219";
 $fa-var-digg:                   "\f1a6";
 $fa-var-dollar:                 "\f155";
 $fa-var-dot-circle-o:           "\f192";
 $fa-var-download:               "\f019";
 $fa-var-dribbble:               "\f17d";
+$fa-var-drivers-license:        "\f2c2";
+$fa-var-drivers-license-o:      "\f2c3";
 $fa-var-dropbox:                "\f16b";
 $fa-var-drupal:                 "\f1a9";
+$fa-var-edge:                   "\f282";
 $fa-var-edit:                   "\f044";
+$fa-var-eercast:                "\f2da";
 $fa-var-eject:                  "\f052";
 $fa-var-ellipsis-h:             "\f141";
 $fa-var-ellipsis-v:             "\f142";
 $fa-var-empire:                 "\f1d1";
 $fa-var-envelope:               "\f0e0";
 $fa-var-envelope-o:             "\f003";
+$fa-var-envelope-open:          "\f2b6";
+$fa-var-envelope-open-o:        "\f2b7";
 $fa-var-envelope-square:        "\f199";
+$fa-var-envira:                 "\f299";
 $fa-var-eraser:                 "\f12d";
+$fa-var-etsy:                   "\f2d7";
 $fa-var-eur:                    "\f153";
 $fa-var-euro:                   "\f153";
 $fa-var-exchange:               "\f0ec";
@@ -184,16 +247,21 @@ $fa-var-exclamation:            "\f12a";
 $fa-var-exclamation-circle:     "\f06a";
 $fa-var-exclamation-triangle:   "\f071";
 $fa-var-expand:                 "\f065";
+$fa-var-expeditedssl:           "\f23e";
 $fa-var-external-link:          "\f08e";
 $fa-var-external-link-square:   "\f14c";
 $fa-var-eye:                    "\f06e";
 $fa-var-eye-slash:              "\f070";
 $fa-var-eyedropper:             "\f1fb";
+$fa-var-fa:                     "\f2b4";
 $fa-var-facebook:               "\f09a";
+$fa-var-facebook-f:             "\f09a";
+$fa-var-facebook-official:      "\f230";
 $fa-var-facebook-square:        "\f082";
 $fa-var-fast-backward:          "\f049";
 $fa-var-fast-forward:           "\f050";
 $fa-var-fax:                    "\f1ac";
+$fa-var-feed:                   "\f09e";
 $fa-var-female:                 "\f182";
 $fa-var-fighter-jet:            "\f0fb";
 $fa-var-file:                   "\f15b";
@@ -219,6 +287,8 @@ $fa-var-film:                   "\f008";
 $fa-var-filter:                 "\f0b0";
 $fa-var-fire:                   "\f06d";
 $fa-var-fire-extinguisher:      "\f134";
+$fa-var-firefox:                "\f269";
+$fa-var-first-order:            "\f2b0";
 $fa-var-flag:                   "\f024";
 $fa-var-flag-checkered:         "\f11e";
 $fa-var-flag-o:                 "\f11d";
@@ -231,8 +301,13 @@ $fa-var-folder-o:               "\f114";
 $fa-var-folder-open:            "\f07c";
 $fa-var-folder-open-o:          "\f115";
 $fa-var-font:                   "\f031";
+$fa-var-font-awesome:           "\f2b4";
+$fa-var-fonticons:              "\f280";
+$fa-var-fort-awesome:           "\f286";
+$fa-var-forumbee:               "\f211";
 $fa-var-forward:                "\f04e";
 $fa-var-foursquare:             "\f180";
+$fa-var-free-code-camp:         "\f2c5";
 $fa-var-frown-o:                "\f119";
 $fa-var-futbol-o:               "\f1e3";
 $fa-var-gamepad:                "\f11b";
@@ -241,45 +316,87 @@ $fa-var-gbp:                    "\f154";
 $fa-var-ge:                     "\f1d1";
 $fa-var-gear:                   "\f013";
 $fa-var-gears:                  "\f085";
+$fa-var-genderless:             "\f22d";
+$fa-var-get-pocket:             "\f265";
+$fa-var-gg:                     "\f260";
+$fa-var-gg-circle:              "\f261";
 $fa-var-gift:                   "\f06b";
 $fa-var-git:                    "\f1d3";
 $fa-var-git-square:             "\f1d2";
 $fa-var-github:                 "\f09b";
 $fa-var-github-alt:             "\f113";
 $fa-var-github-square:          "\f092";
+$fa-var-gitlab:                 "\f296";
 $fa-var-gittip:                 "\f184";
 $fa-var-glass:                  "\f000";
+$fa-var-glide:                  "\f2a5";
+$fa-var-glide-g:                "\f2a6";
 $fa-var-globe:                  "\f0ac";
 $fa-var-google:                 "\f1a0";
 $fa-var-google-plus:            "\f0d5";
+$fa-var-google-plus-circle:     "\f2b3";
+$fa-var-google-plus-official:   "\f2b3";
 $fa-var-google-plus-square:     "\f0d4";
 $fa-var-google-wallet:          "\f1ee";
 $fa-var-graduation-cap:         "\f19d";
+$fa-var-gratipay:               "\f184";
+$fa-var-grav:                   "\f2d6";
 $fa-var-group:                  "\f0c0";
 $fa-var-h-square:               "\f0fd";
 $fa-var-hacker-news:            "\f1d4";
+$fa-var-hand-grab-o:            "\f255";
+$fa-var-hand-lizard-o:          "\f258";
 $fa-var-hand-o-down:            "\f0a7";
 $fa-var-hand-o-left:            "\f0a5";
 $fa-var-hand-o-right:           "\f0a4";
 $fa-var-hand-o-up:              "\f0a6";
+$fa-var-hand-paper-o:           "\f256";
+$fa-var-hand-peace-o:           "\f25b";
+$fa-var-hand-pointer-o:         "\f25a";
+$fa-var-hand-rock-o:            "\f255";
+$fa-var-hand-scissors-o:        "\f257";
+$fa-var-hand-spock-o:           "\f259";
+$fa-var-hand-stop-o:            "\f256";
+$fa-var-handshake-o:            "\f2b5";
+$fa-var-hard-of-hearing:        "\f2a4";
+$fa-var-hashtag:                "\f292";
 $fa-var-hdd-o:                  "\f0a0";
 $fa-var-header:                 "\f1dc";
 $fa-var-headphones:             "\f025";
 $fa-var-heart:                  "\f004";
 $fa-var-heart-o:                "\f08a";
+$fa-var-heartbeat:              "\f21e";
 $fa-var-history:                "\f1da";
 $fa-var-home:                   "\f015";
 $fa-var-hospital-o:             "\f0f8";
+$fa-var-hotel:                  "\f236";
+$fa-var-hourglass:              "\f254";
+$fa-var-hourglass-1:            "\f251";
+$fa-var-hourglass-2:            "\f252";
+$fa-var-hourglass-3:            "\f253";
+$fa-var-hourglass-end:          "\f253";
+$fa-var-hourglass-half:         "\f252";
+$fa-var-hourglass-o:            "\f250";
+$fa-var-hourglass-start:        "\f251";
+$fa-var-houzz:                  "\f27c";
 $fa-var-html5:                  "\f13b";
+$fa-var-i-cursor:               "\f246";
+$fa-var-id-badge:               "\f2c1";
+$fa-var-id-card:                "\f2c2";
+$fa-var-id-card-o:              "\f2c3";
 $fa-var-ils:                    "\f20b";
 $fa-var-image:                  "\f03e";
+$fa-var-imdb:                   "\f2d8";
 $fa-var-inbox:                  "\f01c";
 $fa-var-indent:                 "\f03c";
+$fa-var-industry:               "\f275";
 $fa-var-info:                   "\f129";
 $fa-var-info-circle:            "\f05a";
 $fa-var-inr:                    "\f156";
 $fa-var-instagram:              "\f16d";
 $fa-var-institution:            "\f19c";
+$fa-var-internet-explorer:      "\f26b";
+$fa-var-intersex:               "\f224";
 $fa-var-ioxhost:                "\f208";
 $fa-var-italic:                 "\f033";
 $fa-var-joomla:                 "\f1aa";
@@ -293,6 +410,7 @@ $fa-var-laptop:                 "\f109";
 $fa-var-lastfm:                 "\f202";
 $fa-var-lastfm-square:          "\f203";
 $fa-var-leaf:                   "\f06c";
+$fa-var-leanpub:                "\f212";
 $fa-var-legal:                  "\f0e3";
 $fa-var-lemon-o:                "\f094";
 $fa-var-level-down:             "\f149";
@@ -306,6 +424,7 @@ $fa-var-line-chart:             "\f201";
 $fa-var-link:                   "\f0c1";
 $fa-var-linkedin:               "\f0e1";
 $fa-var-linkedin-square:        "\f08c";
+$fa-var-linode:                 "\f2b8";
 $fa-var-linux:                  "\f17c";
 $fa-var-list:                   "\f03a";
 $fa-var-list-alt:               "\f022";
@@ -317,32 +436,58 @@ $fa-var-long-arrow-down:        "\f175";
 $fa-var-long-arrow-left:        "\f177";
 $fa-var-long-arrow-right:       "\f178";
 $fa-var-long-arrow-up:          "\f176";
+$fa-var-low-vision:             "\f2a8";
 $fa-var-magic:                  "\f0d0";
 $fa-var-magnet:                 "\f076";
 $fa-var-mail-forward:           "\f064";
 $fa-var-mail-reply:             "\f112";
 $fa-var-mail-reply-all:         "\f122";
 $fa-var-male:                   "\f183";
+$fa-var-map:                    "\f279";
 $fa-var-map-marker:             "\f041";
+$fa-var-map-o:                  "\f278";
+$fa-var-map-pin:                "\f276";
+$fa-var-map-signs:              "\f277";
+$fa-var-mars:                   "\f222";
+$fa-var-mars-double:            "\f227";
+$fa-var-mars-stroke:            "\f229";
+$fa-var-mars-stroke-h:          "\f22b";
+$fa-var-mars-stroke-v:          "\f22a";
 $fa-var-maxcdn:                 "\f136";
 $fa-var-meanpath:               "\f20c";
+$fa-var-medium:                 "\f23a";
 $fa-var-medkit:                 "\f0fa";
+$fa-var-meetup:                 "\f2e0";
 $fa-var-meh-o:                  "\f11a";
+$fa-var-mercury:                "\f223";
+$fa-var-microchip:              "\f2db";
 $fa-var-microphone:             "\f130";
 $fa-var-microphone-slash:       "\f131";
 $fa-var-minus:                  "\f068";
 $fa-var-minus-circle:           "\f056";
 $fa-var-minus-square:           "\f146";
 $fa-var-minus-square-o:         "\f147";
+$fa-var-mixcloud:               "\f289";
 $fa-var-mobile:                 "\f10b";
 $fa-var-mobile-phone:           "\f10b";
+$fa-var-modx:                   "\f285";
 $fa-var-money:                  "\f0d6";
 $fa-var-moon-o:                 "\f186";
 $fa-var-mortar-board:           "\f19d";
+$fa-var-motorcycle:             "\f21c";
+$fa-var-mouse-pointer:          "\f245";
 $fa-var-music:                  "\f001";
 $fa-var-navicon:                "\f0c9";
+$fa-var-neuter:                 "\f22c";
 $fa-var-newspaper-o:            "\f1ea";
+$fa-var-object-group:           "\f247";
+$fa-var-object-ungroup:         "\f248";
+$fa-var-odnoklassniki:          "\f263";
+$fa-var-odnoklassniki-square:   "\f264";
+$fa-var-opencart:               "\f23d";
 $fa-var-openid:                 "\f19b";
+$fa-var-opera:                  "\f26a";
+$fa-var-optin-monster:          "\f23c";
 $fa-var-outdent:                "\f03b";
 $fa-var-pagelines:              "\f18c";
 $fa-var-paint-brush:            "\f1fc";
@@ -352,19 +497,24 @@ $fa-var-paperclip:              "\f0c6";
 $fa-var-paragraph:              "\f1dd";
 $fa-var-paste:                  "\f0ea";
 $fa-var-pause:                  "\f04c";
+$fa-var-pause-circle:           "\f28b";
+$fa-var-pause-circle-o:         "\f28c";
 $fa-var-paw:                    "\f1b0";
 $fa-var-paypal:                 "\f1ed";
 $fa-var-pencil:                 "\f040";
 $fa-var-pencil-square:          "\f14b";
 $fa-var-pencil-square-o:        "\f044";
+$fa-var-percent:                "\f295";
 $fa-var-phone:                  "\f095";
 $fa-var-phone-square:           "\f098";
 $fa-var-photo:                  "\f03e";
 $fa-var-picture-o:              "\f03e";
 $fa-var-pie-chart:              "\f200";
-$fa-var-pied-piper:             "\f1a7";
+$fa-var-pied-piper:             "\f2ae";
 $fa-var-pied-piper-alt:         "\f1a8";
+$fa-var-pied-piper-pp:          "\f1a7";
 $fa-var-pinterest:              "\f0d2";
+$fa-var-pinterest-p:            "\f231";
 $fa-var-pinterest-square:       "\f0d3";
 $fa-var-plane:                  "\f072";
 $fa-var-play:                   "\f04b";
@@ -375,28 +525,36 @@ $fa-var-plus:                   "\f067";
 $fa-var-plus-circle:            "\f055";
 $fa-var-plus-square:            "\f0fe";
 $fa-var-plus-square-o:          "\f196";
+$fa-var-podcast:                "\f2ce";
 $fa-var-power-off:              "\f011";
 $fa-var-print:                  "\f02f";
+$fa-var-product-hunt:           "\f288";
 $fa-var-puzzle-piece:           "\f12e";
 $fa-var-qq:                     "\f1d6";
 $fa-var-qrcode:                 "\f029";
 $fa-var-question:               "\f128";
 $fa-var-question-circle:        "\f059";
+$fa-var-question-circle-o:      "\f29c";
+$fa-var-quora:                  "\f2c4";
 $fa-var-quote-left:             "\f10d";
 $fa-var-quote-right:            "\f10e";
 $fa-var-ra:                     "\f1d0";
 $fa-var-random:                 "\f074";
+$fa-var-ravelry:                "\f2d9";
 $fa-var-rebel:                  "\f1d0";
 $fa-var-recycle:                "\f1b8";
 $fa-var-reddit:                 "\f1a1";
+$fa-var-reddit-alien:           "\f281";
 $fa-var-reddit-square:          "\f1a2";
 $fa-var-refresh:                "\f021";
+$fa-var-registered:             "\f25d";
 $fa-var-remove:                 "\f00d";
 $fa-var-renren:                 "\f18b";
 $fa-var-reorder:                "\f0c9";
 $fa-var-repeat:                 "\f01e";
 $fa-var-reply:                  "\f112";
 $fa-var-reply-all:              "\f122";
+$fa-var-resistance:             "\f1d0";
 $fa-var-retweet:                "\f079";
 $fa-var-rmb:                    "\f157";
 $fa-var-road:                   "\f018";
@@ -409,13 +567,18 @@ $fa-var-rss-square:             "\f143";
 $fa-var-rub:                    "\f158";
 $fa-var-ruble:                  "\f158";
 $fa-var-rupee:                  "\f156";
+$fa-var-s15:                    "\f2cd";
+$fa-var-safari:                 "\f267";
 $fa-var-save:                   "\f0c7";
 $fa-var-scissors:               "\f0c4";
+$fa-var-scribd:                 "\f28a";
 $fa-var-search:                 "\f002";
 $fa-var-search-minus:           "\f010";
 $fa-var-search-plus:            "\f00e";
+$fa-var-sellsy:                 "\f213";
 $fa-var-send:                   "\f1d8";
 $fa-var-send-o:                 "\f1d9";
+$fa-var-server:                 "\f233";
 $fa-var-share:                  "\f064";
 $fa-var-share-alt:              "\f1e0";
 $fa-var-share-alt-square:       "\f1e1";
@@ -424,16 +587,29 @@ $fa-var-share-square-o:         "\f045";
 $fa-var-shekel:                 "\f20b";
 $fa-var-sheqel:                 "\f20b";
 $fa-var-shield:                 "\f132";
+$fa-var-ship:                   "\f21a";
+$fa-var-shirtsinbulk:           "\f214";
+$fa-var-shopping-bag:           "\f290";
+$fa-var-shopping-basket:        "\f291";
 $fa-var-shopping-cart:          "\f07a";
+$fa-var-shower:                 "\f2cc";
 $fa-var-sign-in:                "\f090";
+$fa-var-sign-language:          "\f2a7";
 $fa-var-sign-out:               "\f08b";
 $fa-var-signal:                 "\f012";
+$fa-var-signing:                "\f2a7";
+$fa-var-simplybuilt:            "\f215";
 $fa-var-sitemap:                "\f0e8";
+$fa-var-skyatlas:               "\f216";
 $fa-var-skype:                  "\f17e";
 $fa-var-slack:                  "\f198";
 $fa-var-sliders:                "\f1de";
 $fa-var-slideshare:             "\f1e7";
 $fa-var-smile-o:                "\f118";
+$fa-var-snapchat:               "\f2ab";
+$fa-var-snapchat-ghost:         "\f2ac";
+$fa-var-snapchat-square:        "\f2ad";
+$fa-var-snowflake-o:            "\f2dc";
 $fa-var-soccer-ball-o:          "\f1e3";
 $fa-var-sort:                   "\f0dc";
 $fa-var-sort-alpha-asc:         "\f15d";
@@ -466,13 +642,20 @@ $fa-var-steam-square:           "\f1b7";
 $fa-var-step-backward:          "\f048";
 $fa-var-step-forward:           "\f051";
 $fa-var-stethoscope:            "\f0f1";
+$fa-var-sticky-note:            "\f249";
+$fa-var-sticky-note-o:          "\f24a";
 $fa-var-stop:                   "\f04d";
+$fa-var-stop-circle:            "\f28d";
+$fa-var-stop-circle-o:          "\f28e";
+$fa-var-street-view:            "\f21d";
 $fa-var-strikethrough:          "\f0cc";
 $fa-var-stumbleupon:            "\f1a4";
 $fa-var-stumbleupon-circle:     "\f1a3";
 $fa-var-subscript:              "\f12c";
+$fa-var-subway:                 "\f239";
 $fa-var-suitcase:               "\f0f2";
 $fa-var-sun-o:                  "\f185";
+$fa-var-superpowers:            "\f2dd";
 $fa-var-superscript:            "\f12b";
 $fa-var-support:                "\f1cd";
 $fa-var-table:                  "\f0ce";
@@ -482,6 +665,8 @@ $fa-var-tag:                    "\f02b";
 $fa-var-tags:                   "\f02c";
 $fa-var-tasks:                  "\f0ae";
 $fa-var-taxi:                   "\f1ba";
+$fa-var-telegram:               "\f2c6";
+$fa-var-television:             "\f26c";
 $fa-var-tencent-weibo:          "\f1d5";
 $fa-var-terminal:               "\f120";
 $fa-var-text-height:            "\f034";
@@ -489,6 +674,18 @@ $fa-var-text-width:             "\f035";
 $fa-var-th:                     "\f00a";
 $fa-var-th-large:               "\f009";
 $fa-var-th-list:                "\f00b";
+$fa-var-themeisle:              "\f2b2";
+$fa-var-thermometer:            "\f2c7";
+$fa-var-thermometer-0:          "\f2cb";
+$fa-var-thermometer-1:          "\f2ca";
+$fa-var-thermometer-2:          "\f2c9";
+$fa-var-thermometer-3:          "\f2c8";
+$fa-var-thermometer-4:          "\f2c7";
+$fa-var-thermometer-empty:      "\f2cb";
+$fa-var-thermometer-full:       "\f2c7";
+$fa-var-thermometer-half:       "\f2c9";
+$fa-var-thermometer-quarter:    "\f2ca";
+$fa-var-thermometer-three-quarters: "\f2c8";
 $fa-var-thumb-tack:             "\f08d";
 $fa-var-thumbs-down:            "\f165";
 $fa-var-thumbs-o-down:          "\f088";
@@ -498,6 +695,8 @@ $fa-var-ticket:                 "\f145";
 $fa-var-times:                  "\f00d";
 $fa-var-times-circle:           "\f057";
 $fa-var-times-circle-o:         "\f05c";
+$fa-var-times-rectangle:        "\f2d3";
+$fa-var-times-rectangle-o:      "\f2d4";
 $fa-var-tint:                   "\f043";
 $fa-var-toggle-down:            "\f150";
 $fa-var-toggle-left:            "\f191";
@@ -505,10 +704,15 @@ $fa-var-toggle-off:             "\f204";
 $fa-var-toggle-on:              "\f205";
 $fa-var-toggle-right:           "\f152";
 $fa-var-toggle-up:              "\f151";
+$fa-var-trademark:              "\f25c";
+$fa-var-train:                  "\f238";
+$fa-var-transgender:            "\f224";
+$fa-var-transgender-alt:        "\f225";
 $fa-var-trash:                  "\f1f8";
 $fa-var-trash-o:                "\f014";
 $fa-var-tree:                   "\f1bb";
 $fa-var-trello:                 "\f181";
+$fa-var-tripadvisor:            "\f262";
 $fa-var-trophy:                 "\f091";
 $fa-var-truck:                  "\f0d1";
 $fa-var-try:                    "\f195";
@@ -516,26 +720,45 @@ $fa-var-tty:                    "\f1e4";
 $fa-var-tumblr:                 "\f173";
 $fa-var-tumblr-square:          "\f174";
 $fa-var-turkish-lira:           "\f195";
+$fa-var-tv:                     "\f26c";
 $fa-var-twitch:                 "\f1e8";
 $fa-var-twitter:                "\f099";
 $fa-var-twitter-square:         "\f081";
 $fa-var-umbrella:               "\f0e9";
 $fa-var-underline:              "\f0cd";
 $fa-var-undo:                   "\f0e2";
+$fa-var-universal-access:       "\f29a";
 $fa-var-university:             "\f19c";
 $fa-var-unlink:                 "\f127";
 $fa-var-unlock:                 "\f09c";
 $fa-var-unlock-alt:             "\f13e";
 $fa-var-unsorted:               "\f0dc";
 $fa-var-upload:                 "\f093";
+$fa-var-usb:                    "\f287";
 $fa-var-usd:                    "\f155";
 $fa-var-user:                   "\f007";
+$fa-var-user-circle:            "\f2bd";
+$fa-var-user-circle-o:          "\f2be";
 $fa-var-user-md:                "\f0f0";
+$fa-var-user-o:                 "\f2c0";
+$fa-var-user-plus:              "\f234";
+$fa-var-user-secret:            "\f21b";
+$fa-var-user-times:             "\f235";
 $fa-var-users:                  "\f0c0";
+$fa-var-vcard:                  "\f2bb";
+$fa-var-vcard-o:                "\f2bc";
+$fa-var-venus:                  "\f221";
+$fa-var-venus-double:           "\f226";
+$fa-var-venus-mars:             "\f228";
+$fa-var-viacoin:                "\f237";
+$fa-var-viadeo:                 "\f2a9";
+$fa-var-viadeo-square:          "\f2aa";
 $fa-var-video-camera:           "\f03d";
+$fa-var-vimeo:                  "\f27d";
 $fa-var-vimeo-square:           "\f194";
 $fa-var-vine:                   "\f1ca";
 $fa-var-vk:                     "\f189";
+$fa-var-volume-control-phone:   "\f2a0";
 $fa-var-volume-down:            "\f027";
 $fa-var-volume-off:             "\f026";
 $fa-var-volume-up:              "\f028";
@@ -543,17 +766,33 @@ $fa-var-warning:                "\f071";
 $fa-var-wechat:                 "\f1d7";
 $fa-var-weibo:                  "\f18a";
 $fa-var-weixin:                 "\f1d7";
+$fa-var-whatsapp:               "\f232";
 $fa-var-wheelchair:             "\f193";
+$fa-var-wheelchair-alt:         "\f29b";
 $fa-var-wifi:                   "\f1eb";
+$fa-var-wikipedia-w:            "\f266";
+$fa-var-window-close:           "\f2d3";
+$fa-var-window-close-o:         "\f2d4";
+$fa-var-window-maximize:        "\f2d0";
+$fa-var-window-minimize:        "\f2d1";
+$fa-var-window-restore:         "\f2d2";
 $fa-var-windows:                "\f17a";
 $fa-var-won:                    "\f159";
 $fa-var-wordpress:              "\f19a";
+$fa-var-wpbeginner:             "\f297";
+$fa-var-wpexplorer:             "\f2de";
+$fa-var-wpforms:                "\f298";
 $fa-var-wrench:                 "\f0ad";
 $fa-var-xing:                   "\f168";
 $fa-var-xing-square:            "\f169";
+$fa-var-y-combinator:           "\f23b";
+$fa-var-y-combinator-square:    "\f1d4";
 $fa-var-yahoo:                  "\f19e";
+$fa-var-yc:                     "\f23b";
+$fa-var-yc-square:              "\f1d4";
 $fa-var-yelp:                   "\f1e9";
 $fa-var-yen:                    "\f157";
+$fa-var-yoast:                  "\f2b1";
 $fa-var-youtube:                "\f167";
 $fa-var-youtube-play:           "\f16a";
 $fa-var-youtube-square:         "\f166";
--- a/src/sass/mixins/_issues.scss
+++ b/src/sass/mixins/_issues.scss
@@ -123,6 +123,12 @@
      }

      > .attachments {
+        span.author {
+          color: mix($color, $gray, 25%);
+        }
+      }
+
+      > .description + .attachments {
        border-top-color: lighten($border-color, 5%);

        @if ".priority-default" == $parent {
@@ -130,10 +136,6 @@
        } @else {
          background-color: lighten($background, 5%);
        }
-
-        span.author {
-          color: mix($color, $gray, 25%);
-        }
      }

      .list td {
--- a/stylesheets/application.css
+++ b/stylesheets/application.css