From a704e4a828945e3441e5c38f49e6f43793b86a02 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Mon, 10 Oct 2022 09:29:42 +0100
Subject: [PATCH] watch icon showing incorrectly

---
 components/search/searchresults.js     |  3 +-
 components/searchresults.js            |  2 +
 pages/searchresults.js                 |  7 ++-
 styles/sass/welshgov/_application.scss | 69 ++++++++------------------
 4 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/components/search/searchresults.js b/components/search/searchresults.js
index 5d0f90d4..5fa56b46 100644
--- a/components/search/searchresults.js
+++ b/components/search/searchresults.js
@@ -61,6 +61,7 @@ const SearchResults = (props) => {
         setWatchedCasesDetails,
         isLinkedCase,
         setCurrentPage,
+        showLoginCheck,
     } = props;
     let { t } = useTranslation();
 
@@ -533,7 +534,7 @@ const SearchResults = (props) => {
                                             )}
                                         </dd>
                                     )}
-                                    {!session && (
+                                    {showLoginCheck == "true" && !session && (
                                         <dd>
                                             <span
                                                 className="govuk-summary-list__actionLink watchLink"
diff --git a/components/searchresults.js b/components/searchresults.js
index 7381390f..359ef547 100644
--- a/components/searchresults.js
+++ b/components/searchresults.js
@@ -14,6 +14,7 @@ export default function Search(props) {
         myportal,
         watchedCases,
         isLinkedCase,
+        showLoginCheck,
     } = props;
     let { t } = useTranslation();
 
@@ -50,6 +51,7 @@ export default function Search(props) {
                                 myportal={myportal}
                                 watchedCases={watchedCases}
                                 isLinkedCase={isLinkedCase}
+                                showLoginCheck
                             />
                         </div>
                     </div>
diff --git a/pages/searchresults.js b/pages/searchresults.js
index a853cb8b..b0680248 100644
--- a/pages/searchresults.js
+++ b/pages/searchresults.js
@@ -106,6 +106,7 @@ const Home = (props) => {
                         searchString={props.search.searchString}
                         searchResultsObj={props.searchResultsObj}
                         isLinkedCase={isLinkedCase}
+                        showLoginCheck
                     />
                 </div>
                 <Footer footerLinks={footerLinks} />
@@ -125,6 +126,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
                     : false;
 
             //console.log("is linked:", isLinked);
+            const showLoginCheck = process.env.SHOWLOGIN || false;
 
             let searchResultsObj = await getBasicSearch(query.q);
 
@@ -156,7 +158,10 @@ export const getServerSideProps = wrapper.getServerSideProps(
             }
 
             return {
-                props: { isLinkedCase: isLinked },
+                props: {
+                    isLinkedCase: isLinked,
+                    showLoginCheck: showLoginCheck,
+                },
             };
         }
     //     }
diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss
index b4f755de..f3c52fdd 100644
--- a/styles/sass/welshgov/_application.scss
+++ b/styles/sass/welshgov/_application.scss
@@ -80,9 +80,9 @@ body {
     .cookies-banner__link,
     .cookies-banner__button {
         display: block;
-        color: $blue;
+        color: #0360a6;
         background-color: inherit;
-        border: 2px solid $blue;
+        border: 2px solid #0360a6;
         padding: 7px 14px;
         margin-top: 10px;
         font-size: 14px;
@@ -94,7 +94,7 @@ body {
         text-align: center;
 
         &:hover {
-            background-color: $blue;
+            background-color: #0360a6;
             color: #eeeeee;
         }
     }
@@ -190,7 +190,7 @@ a.longLinkBreak {
 
 .govuk-breadcrumbs__link:link,
 .govuk-breadcrumbs__link:visited {
-    color: $blue;
+    color: #0360a6;
     font-weight: bold;
     text-decoration: none;
     font-size: 16px;
@@ -1086,14 +1086,14 @@ textarea,
         background: none;
         padding-left: 0;
 
-        color: $blue;
+        color: #0360a6;
 
         &.sortDesc:after {
             width: 0;
             height: 0;
             border-style: solid;
             border-width: 12px 5px 0 5px;
-            border-color: $blue transparent transparent transparent;
+            border-color: #0360a6 transparent transparent transparent;
             content: "";
             top: 16px;
             position: relative;
@@ -1105,7 +1105,7 @@ textarea,
             height: 0;
             border-style: solid;
             border-width: 0 5px 12px 5px;
-            border-color: transparent transparent $blue transparent;
+            border-color: transparent transparent #0360a6 transparent;
             content: "";
             top: -16px;
             position: relative;
@@ -1302,7 +1302,7 @@ ul#sharePageLinks.active {
     padding-top: 2px;
     padding-left: 25px;
     height: 24px;
-    color: $blue;
+    color: #0360a6;
 }
 
 .block-share ul li a {
@@ -1315,7 +1315,7 @@ ul#sharePageLinks.active {
     padding-left: 25px;
     height: 24px;
     background-color: inherit;
-    color: $blue;
+    color: #0360a6;
     font-weight: bold;
     text-decoration: none;
 }
@@ -2256,7 +2256,7 @@ fade {
     display: flex;
     justify-content: space-between;
     font-size: 18px;
-    padding: 20px 20px 30px 5px;
+    padding: 25px 30px;
     margin-top: 20px;
 
 
@@ -2266,53 +2266,29 @@ fade {
             margin-top: 0px;
         }
 
-        // background-image: url(/assets/images/information.svg);
-        // content: " ";
-        // position: relative;
-        // border: 0px solid red;
-        // background-color: transparent;
-        // background-repeat: no-repeat;
-        // background-position: center;
-        // border-color: $blue;
-        // background-color: $blue;
-        // min-width: 25px;
-        // min-height: 25px;
-        // font-size: 20px;
-        // line-height: 20px;
-        // left: 20px;
+        border-color: $blue;
+        background-color: $blue;
+        min-width: 25px;
+        min-height: 25px;
+        font-size: 20px;
+        line-height: 20px;
+        left: 20px;
     }
 
     .govuk-warning-text__text {
-        padding-left: 20px;
+        padding-left: 35px;
         padding-right: 10px;
         color: $black;
         font-weight: normal;
         font-size: 18px;
 
-        &:before {
-            background-image: url(/assets/images/information.svg);
-            content: " ";
-            position: relative;
-            border: 0px solid red;
-            background-color: transparent;
-            background-repeat: no-repeat;
-            background-position: 0, 0;
-            height: 100%;
-            width: 30px;
-            display: block;
-            float: left;
-            left: -14px;
-
-        }
     }
 
     .hideNotice span {
         font-size: 14px;
-        color: $blue;
+        color: $black;
         font-weight: bold;
         cursor: pointer;
-        text-decoration: none;
-        margin-right: 18px;
 
         a {
             text-decoration: underline;
@@ -2322,15 +2298,14 @@ fade {
         }
 
         &:hover {
-            color: $lightblue;
+            color: $charcoal
         }
 
         &:after {
             content: "\00d7";
-            font-size: 28px;
+            font-size: 20px;
             position: relative;
-            top: 6px;
-            left: 6px
+            top: 3px;
         }
     }