Merge "Bug 1867707 Add comments and details block header active state"

htdocs/theme/raw/plugintype/artefact/file/templates/folder_render_in_modal.tpl

@@ -74,8 +74,8 @@
 </div>
 
 <script>
-    jQuery('.modal_link').off('click');
-    jQuery('.modal_link').on('click', function(e) {
+    jQuery('#configureblock .modal_link').off('click');
+    jQuery('#configureblock .modal_link').on('click', function(e) {
         open_modal(e);
         toggleDetailsBtn();
     });

htdocs/theme/raw/sass/layout/_block-comments-details-header.scss

@@ -13,11 +13,11 @@
        background-color: $theme-block-header-hover-bg-color;
        color: $theme-block-header-hover-color;
      }
+   }
 
-     &.active-block {
-        background-color: $theme-block-header-active-bg-color;
-        color: $theme-block-header-active-color;
-     }
+   &.active-block a {
+      background-color: $theme-block-header-active-bg-color;
+      color: $theme-block-header-active-color;
    }
 }
 
@@ -42,7 +42,7 @@
           border: 0;
         }
 
-        &.active-block {
+        &.active-block .btn-secondary {
           background-color: $theme-block-header-active-bg-color;
           color: $theme-block-header-active-color;
         }
@@ -139,11 +139,14 @@
         border: 0;
       }
 
-      &:not(:disabled):not(.disabled):active,
-      &.active-block {
+      &:not(:disabled):not(.disabled):active {
         background-color: $theme-block-header-active-bg-color;
         color: $theme-block-header-active-color;
       }
     }
+    &.active-block .btn-secondary {
+      background-color: $theme-block-header-active-bg-color;
+      color: $theme-block-header-active-color;
+    }
   }
 }