PAY-6748: Correct merge conflict.

hmcts · May 10, 2024 · bb97fff · bb97fff
2 parents 7a3c088 + e49df89
commit bb97fff
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 71 deletions.
diff --git a/src/app/shared/components/navigation/navigation.component.html b/src/app/shared/components/navigation/navigation.component.html
@@ -10,7 +10,7 @@
       <ul class="bar-header__list bar-header-left">
         <li class="title">
           <a href="/ccd-search?takePayment=true" title="Go to the GOV.UK homepage" class="content">
-            <span class="service-title" id="proposition-name">HMCTS PayBubble</span>
+            <span class="govuk-service-title" id="proposition-name">HMCTS PayBubble</span>
           </a>
         </li>
       </ul>

diff --git a/src/app/shared/components/phase-banner/phase-banner.component.html b/src/app/shared/components/phase-banner/phase-banner.component.html
@@ -1,10 +1,10 @@
 <div class="center-content">
 	<div class="grid-row">
 		<div class="column-full">
-			<div class="phase-banner">
-				<p>
-					<strong class="phase-tag">{{ type | uppercase }}</strong>
-					<span>This is a new service – your <a (click)="myFunction()">feedback</a> will help us to improve it.</span>
+			<div class="govuk-phase-banner">
+				<p class="govuk-phase-banner__content">
+					<strong class="govuk-tag govuk-phase-banner__content__tag">{{ type | uppercase }}</strong>
+					<span  class="govuk-phase-banner__text">This is a new service – your <a (click)="myFunction()">feedback</a> will help us to improve it.</span>
 				</p>
 			</div>
 		</div>

diff --git a/src/assets/js/cookie.js b/src/assets/js/cookie.js
@@ -1,72 +1,71 @@
 
 window.cookieManager.on('UserPreferencesLoaded', (preferences) => {
-    var dataLayer = window.dataLayer || [];
-    dataLayer.push({ 'event': 'Cookie Preferences', 'cookiePreferences': preferences });
-  });
+  var dataLayer = window.dataLayer || [];
+  dataLayer.push({ 'event': 'Cookie Preferences', 'cookiePreferences': preferences });
+});
 
-  window.cookieManager.on('UserPreferencesSaved', (preferences) => {
-    var dataLayer = window.dataLayer || [];
-    var dtrum = window.dtrum;
+window.cookieManager.on('UserPreferencesSaved', (preferences) => {
+  var dataLayer = window.dataLayer || [];
+  var dtrum = window.dtrum;
 
-    dataLayer.push({ 'event': 'Cookie Preferences', 'cookiePreferences': preferences });
+  dataLayer.push({ 'event': 'Cookie Preferences', 'cookiePreferences': preferences });
 
-    if (dtrum !== undefined) {
-      if (preferences.apm === 'on') {
-        dtrum.enable();
-        dtrum.enableSessionReplay();
-      } else {
-        dtrum.disableSessionReplay();
-        dtrum.disable();
-      }
+  if (dtrum !== undefined) {
+    if (preferences.apm === 'on') {
+      dtrum.enable();
+      dtrum.enableSessionReplay();
+    } else {
+      dtrum.disableSessionReplay();
+      dtrum.disable();
     }
-  });
+  }
+});
 
-  window.cookieManager.on('PreferenceFormSubmitted', () => {
-    const message = document.querySelector('.cookie-preference-success');
-    message.style.display = 'block';
-    document.body.scrollTop = 0; // For Safari
-    document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera
-  });
+window.cookieManager.on('PreferenceFormSubmitted', () => {
+  const message = document.querySelector('.cookie-preference-success');
+  message.style.display = 'block';
+  document.body.scrollTop = 0; // For Safari
+  document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera
+});
 
-
-  var config = {
-    userPreferences: {
-      cookieName: 'ccpay-bubble-cookie-preferences',
+var config = {
+  userPreferences: {
+    cookieName: 'ccpay-bubble-cookie-preferences',
+  },
+  preferencesForm: {
+      class: 'cookie-preferences-form',
+  },
+  cookieManifest: [
+    {
+      categoryName: 'analytics',
+      cookies: [
+        '_ga',
+        '_gid',
+        '_gat_UA-'
+      ]
+    },
+    {
+      categoryName: 'apm',
+      cookies: [
+        'dtCookie',
+        'dtLatC',
+        'dtPC',
+        'dtSa',
+        'rxVisitor',
+        'rxvt'
+      ]
     },
-    preferencesForm: {
-        class: 'cookie-preferences-form',
+    {
+      categoryName: 'essential',
+      optional: false,
+      matchBy: 'exact',
+      cookies: [
+        '_csrf',
+        '__user-info',
+        '__site-id'
+      ]
     },
-    cookieManifest: [
-      {
-        categoryName: 'analytics',
-        cookies: [
-          '_ga',
-          '_gid',
-          '_gat_UA-'
-        ]
-      },
-      {
-        categoryName: 'apm',
-        cookies: [
-          'dtCookie',
-          'dtLatC',
-          'dtPC',
-          'dtSa',
-          'rxVisitor',
-          'rxvt'
-        ]
-      },
-      {
-        categoryName: 'essential',
-        optional: false,
-        matchBy: 'exact',
-        cookies: [
-          '_csrf',
-          '__user-info',
-          '__site-id'
-        ]
-      },
-    ]
-  };
+  ]
+};
 
-  window.cookieManager.init(config);
+window.cookieManager.init(config);
diff --git a/src/assets/stylesheets/main.css b/src/assets/stylesheets/main.css
diff --git a/src/assets/stylesheets/main.scss b/src/assets/stylesheets/main.scss
@@ -35,12 +35,20 @@ body {
   padding-top: 10px;
 }
 
-// overwrite incoming font sizing
+// overwrite incoming gov styling
 
 .govuk-button {
   font-size: 19px;
 }
 
-.govuk-footer {
+.govuk-footer, .govuk-phase-banner__content, .govuk-tag {
   font-size: 16px;
+}
+
+.govuk-phase-banner {
+  margin-bottom: 24px;
+}
+
+.govuk-service-title {
+  color: white;
 }
diff --git a/src/index.html b/src/index.html
@@ -36,8 +36,8 @@
 <!-- End Google Tag Manager -->
 
 <!-- Cookie Manager -->
-<script async src="/assets/js/cookie-manager-1.0.0.min.js"></script>
-<script async src="/assets/js/cookie.js"></script>
+<script src="/assets/js/cookie-manager-1.0.0.min.js"></script>
+<script src="/assets/js/cookie.js"></script>
 <!-- End Cookie Manager -->
 </head>