Merge "Bug 1845104 More small style bugs"

htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl

@@ -51,7 +51,7 @@
                 justdetails=$justdetails
                 displayiconsonly=true}
         {/if}
-        <div class="post list-group-item">
+        <div class="post list-group-item flush">
             <h4 class="title">
                 {if !($editing)}
                      <a class="modal_link inner-link" data-toggle="modal-docked" data-target="#configureblock" href="#" data-blockid="{$blockid}" data-artefactid="{$post->id}">

htdocs/theme/raw/sass/_custom.scss

@@ -27,18 +27,11 @@
 
 // Plan
 .card.card-secondary .list-group .task-item {
-    &:first-child {
-        border-top: 1px solid $list-group-border-color;
-    }
     a[data-toggle="collapse"] .collapse-indicator,
     a[data-toggle="collapse"].collapsed .collapse-indicator {
         margin-right: 10px;
         margin-top: 17px;
     }
-    & .btn-group + a[data-toggle="collapse"] .collapse-indicator,
-    & .btn-group + a[data-toggle="collapse"].collapsed .collapse-indicator {
-        margin-right: 90px;
-    }
     .plan-task-icon {
         vertical-align: top;
         padding-top: 4px;
@@ -57,6 +50,12 @@
         }
     }
 }
+.bt-plans-editor.card.card-secondary .list-group .task-item {
+    a[data-toggle="collapse"] .collapse-indicator,
+    a[data-toggle="collapse"].collapsed .collapse-indicator {
+        margin-right: 90px;
+    }
+}
 
 .no-results {
     @extend .lead;

htdocs/theme/raw/sass/components/_list-group.scss

@@ -309,7 +309,6 @@
     }
 }
 
-.card-header + .block > .list-group .list-group-item:first-child,
 .list-group + .card-footer {
     border-top-width: 0;
 }
@@ -374,23 +373,10 @@
     cursor: pointer;
 }
 
-// wallpost block borders
-.card.card-secondary .list-group .wallpost:first-child {
-    border-top: 1px solid $list-group-border;
-}
 .card.bt-wall > .block .list-group:last-child .list-group-item:last-child {
     border-bottom: 1px solid $list-group-border;
 }
 
-.bt-taggedposts .list-group,
-.taggedposts.list-group,
-.blog .list-group,
-.bt-plans .list-group,
-.resume-content .list-group {
-    border-top: 1px solid $list-group-border-color;
-    margin-top: -1px;
-}
-
 .bt-entireresume,
 .bt-entireresume-editor {
     .list-group {
@@ -398,11 +384,6 @@
             font-weight: bold;
             margin: 10px 0;
         }
-        .list-group-item {
-            &.flush {
-                border: 0;
-            }
-        }
         .resume-content {
             h5.title {
               font-weight: bold;
@@ -462,3 +443,36 @@
         }
     }
 }
+
+// Rmove some list's first child top border when they don't have anything between card header and list
+.card.card-secondary {
+  &.bt-recentposts, &.bt-recentposts-editor,
+  &.bt-recentforumposts, &.bt-recentforumposts-editor,
+  &.bt-navigation, &.bt-navigation-editor,
+  &.bt-entireresume, &.bt-entireresume-editor,
+  &.bt-resumefield, &.bt-resumefield-editor,
+  &.bt-filedownload, &.bt-filedownload-editor,
+  &.bt-folder, &.bt-folder-editor,
+  &.bt-myviews, &.bt-myviews-editor,
+  &.bt-newviews, &.bt-newviews-editor,
+  &.bt-inbox, &.bt-inbox-editor,
+  &.bt-watchlist, &.bt-watchlist-editor {
+    .list-group {
+      .list-group-item:first-child,
+      + .list-group-item:first-child,
+      .block-header:first-child + .list-group-item {
+        border-top: 0;
+      }
+    }
+  }
+  // except list in list
+  &.bt-entireresume, &.bt-entireresume-editor {
+    .list-group .list-group {
+      .list-group-item:first-child,
+      + .list-group-item:first-child,
+      .block-header:first-child + .list-group-item {
+        border-top: 1px solid $list-group-border-color;
+      }
+    }
+  }
+}

htdocs/theme/raw/sass/layout/card/_card-collapse.scss

@@ -89,7 +89,7 @@
                 padding: 20px 0;
                 border-bottom: 1px solid $list-group-border-color;
                 &.alert {
-                    padding: 5px 10px;
+                    padding: 10px 50px;
                 }
                 &:last-child,
                 &.last {

htdocs/theme/raw/sass/layout/card/_card-footer.scss

@@ -70,3 +70,7 @@ a.card-footer {
 .fieldset-body .card-footer {
     margin: 20px -15px -10px;
 }
+
+.blockinstance .blockinstance-content .card-footer {
+    border-top: 0;
+}

htdocs/theme/raw/sass/layout/card/_card-secondary.scss

@@ -60,9 +60,6 @@
     .list-group .list-group-item {
         border-left: 0;
         border-right: 0;
-        &:first-child {
-            border-top:0;
-        }
     }
     > .card-body,
     > .block > .card-body {
@@ -81,9 +78,4 @@
             margin: 0;
         }
     }
-
-    // pdf blocks need padding taken away
-    &.bt-pdf .block > .card-body {
-      padding: 0;
-    }
 }