Release OpenProject 10.6.1

Author: oliverguenther

.DS_Store

@@ -961,7 +961,7 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     will_paginate (3.3.0)
     with_advisory_lock (4.6.0)
       activerecord (>= 4.2)

Gemfile.lock

@@ -181,12 +181,6 @@ hr
 .form--space
   padding-top: 1rem
 
-  &.-left-spacing
-    padding-left: 1rem
-
-  &.-big
-    padding-top: 20px
-
 .form--row
   @include grid-block
   @include grid-visible-overflow

app/assets/stylesheets/content/_forms.sass

@@ -55,7 +55,7 @@
     </ul>
 ```
 
-## Modals: With footer
+## Modals: Highlighted and with footer
 
 ```
 <div class="op-modal--modal-container -highlight">
@@ -87,3 +87,24 @@
   </div>
 </div>
 ```
+
+## Modals: Danger zone highlighting
+
+```
+<div class="op-modal--modal-container -highlight -danger-zone">
+  <div class="op-modal--modal-header">
+    <h3 class="icon-context icon-warning">Confirm deletion of Work Package</h3>
+    <a class="op-modal--modal-close-button" title="Close popup">
+      <i class="icon-close"></i>
+    </a>
+  </div>
+  <div class="op-modal--modal-body">
+    <p>Are you sure you want to delete the following work package?<p>
+    <p> ... </p>
+  </div>
+  <div class="op-modal--modal-footer">
+    <button name="button" type="submit" class="button -danger">Continue</button>
+    <button name="button" type="submit" class="button">Cancel</button>
+  </div>
+</div>
+```

app/assets/stylesheets/content/_modal.lsg

@@ -88,7 +88,6 @@ $modal-footer-height: $modal-header-height
       margin-bottom: 0px
 
 .op-modal--modal-footer
-  margin: 1em 0
   padding: 0 1.5rem
 
   button:last-of-type
@@ -127,17 +126,29 @@ $modal-footer-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,
-  .icon-context
+  .avatar
     margin-right: 0.5rem
 
+  &.-danger-zone
+    .op-modal--modal-header
+      @include varprop(background-color, content-form-danger-zone-bg-color)
+      @include varprop(border-bottom-color, content-form-danger-zone-bg-color)
+
+    .op-modal--modal-close-button
+      @include varprop(color, content-form-danger-zone-font-color)
+
+
 // Specific styles for columns-modal
 .columns-modal--content
   margin-bottom: 15px

app/assets/stylesheets/content/_modal.sass

@@ -32,6 +32,15 @@ ckeditor-augmented-textarea .op-ckeditor--wrapper
   figure.image
     margin: 1em 0
 
+  figure.table
+    // Ensure we break apart words in table cells that
+    // are restricted in width (OP#33524)
+    td[style*=";width:"],
+    td[style^="width:"],
+    th[style*=";width:"],
+    th[style^="width:"]
+      word-break: break-all
+
 .ck .ck-widget.op-ckeditor--code-block
   // Display content as pre
   white-space: pre-wrap

app/assets/stylesheets/content/editor/_ckeditor.sass

@@ -55,3 +55,11 @@ div.ck-editor__preview
     > table
       height: 100%
       width: 100%
+
+    // Ensure we break apart words in table cells that
+    // are restricted in width (OP#33524)
+    td[style*=";width:"],
+    td[style^="width:"],
+    th[style*=";width:"],
+    th[style^="width:"]
+      word-break: break-all

app/assets/stylesheets/content/editor/_markdown.sass

@@ -17,19 +17,26 @@
       border: none
       overflow: visible !important
       position: relative
+      grid-template-columns: auto
 
       #content-wrapper,
       #content
         margin: 0
         width: 100%
+        height: 100%
         overflow: visible !important
         position: relative
 
+        .work-packages-partitioned-page--content-right
+          .work-packages--details-toolbar-container
+            display: none
+
         .work-packages-partitioned-query-space--container
           padding-left: 0
 
           .work-packages-split-view--tabletimeline-side
             .work-packages-split-view--tabletimeline-content
+              height: 100%
               .wp-table--hierarchy-aditional-row,
               tr.-checked,
               .row-hovered
@@ -60,47 +67,31 @@
       overflow: hidden
 
   // -------------------- Sepcial Rules for FF --------------------
-  html.-browser-firefox
+  body.-browser-firefox
+    #wrapper,
+    #main,
+    .work-packages-partitioned-query-space--container,
+    .work-packages-partitioned-page--content-container,
+    .work-packages-split-view--tabletimeline-side,
+    .work-packages-split-view--tabletimeline-content
+      display: block !important
+
     .router--work-packages-partitioned-split-view,
     .router--work-packages-full-view,
     .router--work-packages-full-create
-      #main
-        display: block
-
-        #content-wrapper,
-        #content
-          .work-packages-partitioned-query-space--container
-            display: block
-            .toolbar-container
-              display: none
-            .work-packages-split-view
-              display: block
-
-              .work-packages-split-view--tabletimeline-side
-                display: block
-                .work-packages-split-view--tabletimeline-content
-                  display: block
-                  .work-packages-split-view--tabletimeline-side
-                    display: none
-                  .work-packages-tabletimeline--table-side
-                    &.-timeline-visible
-                      display: initial
-
-                    &.-timeline-visible
-                      thead
-                        // Undo that hack from above for FF
-                        display: table-header-group
-                  .work-packages-tabletimeline--timeline-side
-                    // As this print is worthless, we remove it for FF
-                    display: none !important
-
-
-  html.-browser-firefox,
-  html.-browser-edge
-    .router--work-packages-full-view,
-      .work-packages--show-view,
-      .work-packages-full-view--split-container
-        display: block
+      .work-packages-partitioned-query-space--container
+        .toolbar-container
+          display: none
+
+    .work-packages-partitioned-page--content-right
+      .work-packages--details-content
+        position: relative
+
+  body.-browser-firefox,
+  body.-browser-edge
+    .work-packages--show-view,
+    .work-packages-full-view--split-container
+      display: block
 
   // ------------------Only WP full screen view ------------------
   .router--work-packages-full-view

app/assets/stylesheets/layout/work_packages/_print.sass

@@ -192,6 +192,7 @@ $breakpoint-classes: (tiny small medium large xlarge xxlarge xxxlarge);
 // $code-border-style: solid;
 // $code-border-color: scale-color($code-background-color, $lightness: -10%);
 // $code-padding: rem-calc(2) rem-calc(5) rem-calc(1);
+// $code-line-height: 1.75em;
 
 // We use these to style anchors
 // $anchor-text-decoration: none;

app/assets/stylesheets/openproject/_settings.scss

@@ -192,6 +192,7 @@
 // $code-border-style: solid;
 // $code-border-color: scale-color($code-background-color, $lightness: -10%);
 // $code-padding: rem-calc(2) rem-calc(5) rem-calc(1);
+// $code-line-height: 1.75em;
 
 // We use these to style anchors
 // $anchor-text-decoration: none;