From d4f75f3e9d45d80c970f72f37b725dfe2b81fbcc Mon Sep 17 00:00:00 2001
From: Liam <liam.sharpe@catalyst.net.nz>
Date: Mon, 28 Jan 2019 10:53:50 +1300
Subject: [PATCH] Bug #1765276: More Default theme changes

Change-Id: I89522f00d65299dc0eb3f1458fd905b54c472fbb
---
 htdocs/theme/default/sass/components/_list-group.scss     | 4 +++-
 htdocs/theme/default/sass/layout/card/_card-footer.scss   | 8 +++++---
 .../artefact/file/blocktype/pdf/templates/pdf.tpl         | 2 +-
 htdocs/theme/raw/sass/_custom.scss                        | 1 -
 htdocs/theme/raw/sass/layout/card/_card-quarter.scss      | 3 +++
 htdocs/theme/raw/templates/view/blocks.tpl                | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/htdocs/theme/default/sass/components/_list-group.scss b/htdocs/theme/default/sass/components/_list-group.scss
index 912d9cd85a..07c1facda6 100755
--- a/htdocs/theme/default/sass/components/_list-group.scss
+++ b/htdocs/theme/default/sass/components/_list-group.scss
@@ -17,7 +17,9 @@
     &.published {
         background-color: #fff;
     }
-    .list-group-item-controls {
+    .list-group-item-controls,
+    .btn-action-list,
+    .list-group-item-heading {
         .btn-group-top {
             @include media-breakpoint-up(lg) {
                 margin-top: -13px;
diff --git a/htdocs/theme/default/sass/layout/card/_card-footer.scss b/htdocs/theme/default/sass/layout/card/_card-footer.scss
index 96016e32fe..ccf0ee5237 100755
--- a/htdocs/theme/default/sass/layout/card/_card-footer.scss
+++ b/htdocs/theme/default/sass/layout/card/_card-footer.scss
@@ -7,9 +7,11 @@ a.card-footer {
         color: $link-hover-color;
     }
 }
-.card,
-.card.bg-warning { // Use to change the footer color of cards that have a yellow background
-    .card-footer {
+.card {
+    &.bg-warning .card-footer,
+    &.bg-success .card-footer,
+    &.bg-info .card-footer,
+    .card-footer { // Use to change the footer color of cards that have a yellow background
         background-color: $card-footer-bg;
     }
 }
diff --git a/htdocs/theme/raw/plugintype/artefact/file/blocktype/pdf/templates/pdf.tpl b/htdocs/theme/raw/plugintype/artefact/file/blocktype/pdf/templates/pdf.tpl
index c372560633..61a29e2749 100644
--- a/htdocs/theme/raw/plugintype/artefact/file/blocktype/pdf/templates/pdf.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/file/blocktype/pdf/templates/pdf.tpl
@@ -56,7 +56,7 @@ See https://github.com/adobe-type-tools/cmap-resources
       <div id="sidebarContainer">
         <div id="toolbarSidebar">
           <div class="splitToolbarButton toggled">
-            <button id="viewcard card-body class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
+            <button id="viewcard card-body" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
                <span data-l10n-id="thumbs_label">Thumbnails</span>
             </button>
             <button id="viewOutline" class="toolbarButton" title="Show Document Outline (double-click to expand/collapse all items)" tabindex="3" data-l10n-id="document_outline">
diff --git a/htdocs/theme/raw/sass/_custom.scss b/htdocs/theme/raw/sass/_custom.scss
index 024755444a..de1701e21a 100644
--- a/htdocs/theme/raw/sass/_custom.scss
+++ b/htdocs/theme/raw/sass/_custom.scss
@@ -609,7 +609,6 @@
     }
     input {
         margin-left: 3px;
-        margin-top: -20px;
         float: left;
     }
     div {
diff --git a/htdocs/theme/raw/sass/layout/card/_card-quarter.scss b/htdocs/theme/raw/sass/layout/card/_card-quarter.scss
index 0cd6584f50..6be9383a6d 100644
--- a/htdocs/theme/raw/sass/layout/card/_card-quarter.scss
+++ b/htdocs/theme/raw/sass/layout/card/_card-quarter.scss
@@ -27,6 +27,9 @@
         height: 100%;
         border: 1px solid $card-border-color;
         box-shadow: 0 1px 1px rgba(0,0,0,.05);
+        .card-header {
+            background-color: transparent;
+        }
     }
 
     .card-header {
diff --git a/htdocs/theme/raw/templates/view/blocks.tpl b/htdocs/theme/raw/templates/view/blocks.tpl
index e9c4083701..9a6973eed0 100644
--- a/htdocs/theme/raw/templates/view/blocks.tpl
+++ b/htdocs/theme/raw/templates/view/blocks.tpl
@@ -74,7 +74,7 @@
             {/if}
             {if $groupid}
             <a class="btn btn-secondary" href="{$WWWROOT}view/groupviews.php?group={$groupid}">
-                {str tag=returntogrouppages section=group}
+                {str tag=returntogroupportfolios section=group}
                 <span class="icon icon-arrow-circle-right right" role="presentation" aria-hidden="true"></span>
             </a>
             {/if}
-- 
GitLab