Release OpenProject 10.6.2

Author: HDinger

.pkgr.yml

@@ -17,6 +17,8 @@ targets:
     <<: *debian9
   ubuntu-18.04:
     <<: *debian9
+  ubuntu-20.04:
+    <<: *debian9
   centos-8:
    dependencies:
       - epel-release

Gemfile

@@ -85,7 +85,7 @@ gem 'escape_utils', '~> 1.0'
 # Syntax highlighting used in html-pipeline with rouge
 gem 'rouge', '~> 3.17.0'
 # HTML sanitization used for html-pipeline
-gem 'sanitize', '~> 5.1.0'
+gem 'sanitize', '~> 5.2.1'
 # HTML autolinking for mails and urls (replaces autolink)
 gem 'rinku', '~> 2.0.4'
 # Version parsing with semver

Gemfile.lock

@@ -713,7 +713,7 @@ GEM
       multi_json
     puma (4.3.5)
       nio4r (~> 2.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.2.2)
@@ -861,7 +861,7 @@ GEM
       structured_warnings (~> 0.3)
     rubyzip (1.3.0)
     safe_yaml (1.0.5)
-    sanitize (5.1.0)
+    sanitize (5.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
@@ -1110,7 +1110,7 @@ DEPENDENCIES
   ruby-prof
   ruby-progressbar (~> 1.10.0)
   rubytree (~> 1.0.0)
-  sanitize (~> 5.1.0)
+  sanitize (~> 5.2.1)
   sassc-rails (~> 2.1.0)
   secure_headers (~> 6.3.0)
   selenium-webdriver (~> 3.14)

app/assets/stylesheets/content/_attributes_group.lsg

@@ -137,7 +137,7 @@
       <h3 class="attributes-group--header-text">Related To</h3>
     </div>
     <div class="attributes-group--header-toggle">
-      <a href="#" class="button -small -transparent">Group by work package type</a>
+      <a href="#" class="button -small -transparent -with-icon icon-group-by icon-small">Group by work package type</a>
     </div>
   </div>
   <div class="content">

app/assets/stylesheets/content/_attributes_group.sass

@@ -59,7 +59,7 @@
   overflow-y: hidden
 
   .button
-    margin: 0 0 5px 0
+    margin: 0 0 8px 0
 
 // HACK. TODO: Remove H3 element rules in various places.
 .attributes-group--header-text,

app/assets/stylesheets/content/_boxes.sass

@@ -32,18 +32,6 @@
   line-height: 1.5em
   border: 1px solid #e4e4e4
 
-  li
-    &.filter label
-      clear: left
-      float: left
-      width: 170px
-    &.decorated
-      margin-left: 20px
-      list-style: disc outside none
-
 .box p
   padding-top: 5px
   padding-bottom: 8px
-
-#content .box h3
-  margin-top: 3px

app/assets/stylesheets/content/_buttons.sass

@@ -87,23 +87,18 @@ a.button
 
 
   &.-transparent
-    @include button-style($background: $button--font-color, $style: hollow)
-    border-color: transparent
+    background: transparent
 
-    &:hover, &:focus
-      @include varprop(border-color, button--border-color)
-
-    &.-active
-      background: $button--active-background-color
-
-      &:hover, &:focus
-        border-color: $button--active-border-color
+    &:hover, &:focus, &.-active
+      background: $button--background-hover-color
 
   &.-tiny
     @include button-size(tiny)
 
   &.-small
     @include button-size(small)
+    &.-with-icon:before
+      vertical-align: initial
 
   &.-large
     @include button-size(large)

app/assets/stylesheets/content/_forms.sass

@@ -587,9 +587,6 @@ input[readonly].-clickable
   line-height: normal
   padding: rem-concat-list($select-element-padding)
 
-  &.parent-select
-    height: 100%
-
   &[multiple]
     background-image: none
     padding-right: $form-padding

app/assets/stylesheets/content/_modal.lsg

@@ -3,18 +3,14 @@
 ## Modals: Standard style
 
 ```
-<div class="modal-container">
+<div class="op-modal--modal-container">
   <div class="op-modal--modal-header">
+    <h3>Export</h3>
     <a class="op-modal--modal-close-button">
       <i class="icon-close" title="Close popup"></i>
     </a>
   </div>
-  <div class="modal-content">
-    <h3>Modal Headline</h3>
-    Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper
-  </div>
-</div><br /><br />
-<h3>Export</h3>
+  <div class="op-modal--modal-body">
     <ul class="export-options">
       <li>
         <a>
@@ -24,13 +20,13 @@
       </li>
        <li>
         <a>
-          <i class="icon-export-vnd-ms-excel icon-big"></i>
+          <i class="icon-export-xls icon-big"></i>
           <span class="export-label">XLS</span>
         </a>
       </li>
        <li>
         <a>
-          <i class="icon-export-vnd-ms-excel-descr icon-big"></i>
+          <i class="icon-export-export-xls-with-descriptions icon-big"></i>
           <span class="export-label">XLS with description</span>
         </a>
       </li>
@@ -53,6 +49,9 @@
         </a>
       </li>
     </ul>
+  </div>
+</div>
+
 ```
 
 ## Modals: Highlighted and with footer

app/assets/stylesheets/content/_modal.sass

@@ -58,7 +58,7 @@ $modal-footer-height: $modal-header-height
   transition: opacity 0.25s ease
   background: $ng-modal-background
   position: relative
-  padding: $ng-modal-padding / 2
+  padding: 5px $ng-modal-padding / 2
   min-width: 200px
   max-width: 60vw
   overflow-y: auto
@@ -74,7 +74,21 @@ $modal-footer-height: $modal-header-height
     min-height: 20vh
 
 .op-modal--modal-header
-  padding: 0
+  display: flex
+  align-items: center
+  height: $modal-header-height
+  padding: 0 45px 0 0
+  margin-bottom: 15px
+  border-bottom: 1px solid $light-gray
+
+  *
+    height: $modal-header-height
+    line-height: $modal-header-height
+
+  h2, h3
+    border: none
+    @include text-shortener
+    margin: 0
 
 .op-modal--modal-body
   margin: 1em 0
@@ -95,8 +109,8 @@ $modal-footer-height: $modal-header-height
 
 .op-modal--modal-close-button
   position: absolute
-  top: 0.75rem
-  right: 0.75rem
+  right: 25px
+  top: 4px
   cursor: pointer
   @include varprop(color, body-font-color)
   &:hover
@@ -109,32 +123,19 @@ $modal-footer-height: $modal-header-height
 
   // Overridden header styles
   .op-modal--modal-header
-    display: flex
-    align-items: center
-    height: $modal-header-height
-    padding: 0 45px 0 1.5rem
-    border-bottom-style: solid
+    padding-left: 1.5rem
     @include varprop(background-color, header-bg-color)
     @include varprop(border-bottom-width, header-border-bottom-width)
     @include varprop(border-bottom-color, header-border-bottom-color)
 
     *
       @include varprop(color, header-item-font-color)
-      height: $modal-header-height
-      line-height: $modal-header-height
-
-    h2, h3
-      @include text-shortener
-      margin: 0
-      border: none
 
   .op-modal--modal-footer
     margin: 1em 0
 
   .op-modal--modal-close-button
-    right: 10px
     top: 0
-    @include varprop(line-height, modal-header-height)
     @include varprop(color, header-item-font-color)
 
   .avatar