Merge branch 'v1.x' into fix-sidebar-toggler-in-fixed-layout

README.md

@@ -60,6 +60,22 @@ Latest:
 
 * Fixed sidebar toggler style when fixed layout is enabled
 
+v1.11.0 (2019-03-22):
+
+* 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
+
 v2.1.0 (2019-03-22):
 
 * Added CSS grid layout support (off by default because of IE support)

package-lock.json

@@ -784,12 +784,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",
@@ -805,9 +799,9 @@
           }
         },
         "js-yaml": {
-          "version": "3.12.1",
+          "version": "3.13.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
-          "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+          "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
           "dev": true,
           "requires": {
             "argparse": "^1.0.7",
@@ -1087,9 +1081,9 @@
       }
     },
     "esprima": {
-      "version": "2.7.3",
+      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
       "version": "1.0.1",
@@ -1403,9 +1397,9 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "grunt": {
-      "version": "1.0.3",
+      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz",
-      "integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==",
+      "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==",
       "requires": {
         "coffeescript": "~1.10.0",
         "dateformat": "~1.0.12",
@@ -1418,7 +1412,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",
@@ -1864,12 +1858,12 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.5.5",
+      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
-      "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=",
+      "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
       "requires": {
-        "argparse": "^1.0.2",
+        "argparse": "^1.0.7",
-        "esprima": "^2.6.0"
+        "esprima": "^4.0.0"
       }
     },
     "jsbn": {
@@ -3171,6 +3165,11 @@
         "whet.extend": "~0.9.9"
       },
       "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+        },
         "js-yaml": {
           "version": "3.6.1",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz",

src/sass/components/_elements.scss

@@ -217,7 +217,6 @@ a.collapsible.collapsed,
       }
 
       img.gravatar {
-        position: relative;
         margin-right: .5em;
       }
     }

src/sass/components/_flash.scss

@@ -70,16 +70,16 @@
   padding-left: $padding-large-horizontal;
   text-align: center;
 
-  &::before {
-    margin-left: 0;
-    float: none;
-  }
-
   &.nodata-left {
     &::before {
       float: left;
     }
   }
+
+  &::before {
+    margin-left: 0;
+    float: none;
+  }
 }
 
 #errorExplanation {

src/sass/components/_issue.scss

@@ -246,10 +246,16 @@
   }
 
   div.attachments {
-    margin: -$issue-padding;
+    margin: 0;
-    padding: $issue-padding;
+    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 {
@@ -329,6 +335,10 @@ div.thumbnails {
   .issues {
     margin: ($line-height-computed / 2) 0 0;
 
+    tr {
+      background-color: transparent;
+    }
+
     tr:last-child > td {
       border-bottom: 0 none;
     }

src/sass/components/_plugins.scss

@@ -258,7 +258,6 @@
 }
 
 
-
 //
 // Redmine custom menu
 // http://rmplus.pro/en/redmine/plugins/custom_menu
@@ -319,7 +318,6 @@
 }
 
 
-
 //
 // Redmine CRM People
 // http://www.redminecrm.com/projects/people/