Merge branch 'develop'

taqueci · May 19, 2023 · d649b1f · d649b1f
2 parents 8396dcd + f473b69
commit d649b1f
Show file tree

Hide file tree

Showing 10 changed files with 330 additions and 51 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,16 +9,16 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install npm dependencies
         run: npm ci
@@ -30,18 +30,18 @@ jobs:
         run: npm run lint:sass
 
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [16.x, 18.x, 19.x]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+v2.16.0 (2023-05-14):
+
+* Update theme to make it work with 5.0.
+* Fixed issues #222, #233, #242, #245, #246, #253, and few others.
+
 v2.15.0 (2021-05-23):
 
 * Updated styles for Redmine 4.2.

diff --git a/javascripts/theme.js b/javascripts/theme.js
diff --git a/src/javascripts/modules/SidebarToggler.js b/src/javascripts/modules/SidebarToggler.js
@@ -32,6 +32,7 @@ PurpleMine.SidebarToggler = (function () {
     this.sidebarVisible = true
     this.sidebarHiding = null
     this.$toggler = null
+    this.$header = $('#header')
     this.$main = $('#main')
     this.$sidebar = $('#sidebar')
     this.lang = document.documentElement.lang
@@ -42,13 +43,6 @@ PurpleMine.SidebarToggler = (function () {
 
     this._ = translations[this.lang]
 
-    // Fix issue with context menu position
-    if (this.$main.css('position') === 'relative') {
-      $(window).on('load', function () {
-        $('#context-menu').appendTo('#wrapper3')
-      })
-    }
-
     handleSidebar()
   }
 
@@ -96,7 +90,7 @@ PurpleMine.SidebarToggler = (function () {
       '"></a>'
     instance.$toggler = $(togglerHtml)
 
-    instance.$main.append(instance.$toggler)
+    instance.$header.append(instance.$toggler)
     instance.$toggler.on('click', instance.toggleSidebar)
   }
 

diff --git a/src/sass/components/_content.scss b/src/sass/components/_content.scss
@@ -117,6 +117,7 @@
 
     &:not(.watchers) {
       li {
+        position: relative;
         margin: 0;
         padding: 0;
         list-style-type: none;
@@ -330,8 +331,8 @@
 }
 
 #footer {
-  margin: 0 $padding-side $line-height-computed;
-  padding-top: $line-height-computed;
+  margin: 0 $padding-side;
+  padding: $line-height-computed 0;
   border-top: 1px solid $gray-400;
   color: $gray-600;
   font-size: $font-size-small;
@@ -343,24 +344,49 @@
 
 @if $fixed-layout {
   @media screen and (min-width: $screen-sm-min) {
+    body {
+      background: $gray-100;
+    }
+    #top-menu,
+    #header,
     #main-menu ul,
-    #main {
+    #main,
+    #footer {
       width: $width-sm;
       margin-right: auto;
       margin-left: auto;
     }
+    #main {
+      overflow: hidden;
+      background: $body-bg;
+    }
+    #footer {
+      background: $body-bg;
+
+      &::before {
+        content: " ";
+        display: inline-block;
+        width: 20px;
+      }
+    }
   }
 
   @media screen and (min-width: $screen-md-min) {
+    #top-menu,
+    #header,
     #main-menu ul,
-    #main {
+    #main,
+    #footer {
       width: $width-md;
     }
   }
 
   @media screen and (min-width: $screen-lg-min) {
+    #top-menu,
+    #header,
     #main-menu ul,
-    #main {
+    #main,
+    #footer {
       width: $width-lg;
     }
   }

diff --git a/src/sass/components/_elements.scss b/src/sass/components/_elements.scss
@@ -290,10 +290,11 @@ p.subtitle {
 
 .block-receiver {
   box-sizing: border-box;
-  min-height: 20px;
-  margin-bottom: $line-height-computed;
+  flex-basis: 100%;
 
   .dragging & {
+    min-height: 20px;
+    margin-bottom: $line-height-computed;
     outline: 2px dashed $gray-600;
   }
 }
@@ -347,6 +348,9 @@ a.close-icon {
 
 // For Redmine 3.4+
 #my-page {
+  display: flex;
+  flex-wrap: wrap;
+
   .mypage-box {
     > .contextual {
       transition: opacity $transition-time;
@@ -359,15 +363,11 @@ a.close-icon {
   }
 
   #list-left {
-    width: 50%;
-    padding-right: ($padding-side * .5);
-    float: left;
+    flex-basis: 50%;
   }
 
   #list-right {
-    width: 50%;
-    padding-left: ($padding-side * .5);
-    float: right;
+    flex-basis: 50%;
   }
 }
 
@@ -613,11 +613,6 @@ div#roadmap {
     td {
       height: $progress-height;
     }
-
-    + .percent {
-      position: relative;
-      top: 0;
-    }
   }
 
   header {