UJ: Merged from template.

somiibo · Jan 30, 2024 · 3d71d0b · 3d71d0b
2 parents 3d34d16 + 254e25e
commit 3d71d0b
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 21 deletions.
diff --git a/_includes/master/global/foot.html b/_includes/master/global/foot.html
@@ -36,12 +36,6 @@
   </script>
 {% endcapture -%}
 
-<!-- Master - Alert Box -->
-<div class="master-alert master-alert-outdated">
-  <span class="master-alert-close" onclick="this.parentElement.style.display='none';">&times;</span>
-  You are using an outdated browser that our site <strong>DOES NOT</strong> support. Please <a href="https://www.google.com/chrome" rel="nofollow" target="_blank">click here</a> to update your browser.
-</div>
-
 <!-- Master - Chat Opener -->
 <a id="prechat-btn" class="animation-fade-in" href="#" onclick="return false;" style="display: none;">
   <svg height="100%" stroke-miterlimit="10" style="fill-rule:nonzero;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;" version="1.1" viewBox="0 0 700 700" width="100%" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -55,7 +49,7 @@
   </svg>
 </a>
 
-<!-- Master - Exit Popip -->
+<!-- Master - Exit Popup -->
 <div id="modal-exit-popup" class="modal fade" tabindex="-1" hidden>
   <div class="modal-dialog">
     <div class="modal-content">

diff --git a/_includes/master/global/head.html b/_includes/master/global/head.html
@@ -341,15 +341,27 @@
   /* Alert box */
   .master-alert {
     padding: 20px;
-    background-color: #f44336;
     color: white;
-    bottom:0;
-    left:0;
-    position:fixed;
-    z-index:9999;
+    left: 0;
+    z-index: 999999;
     width: 100%;
   }
 
+  .master-alert-top {
+    top: 0;
+  }
+
+  .master-alert-bottom {
+    bottom: 0;
+  }
+
+  .master-alert-fixed {
+    position: fixed;
+  }
+
+  .master-alert-block {
+  }
+
   .master-alert a {
     color: white;
     text-decoration: underline;
@@ -374,7 +386,15 @@
   }
 
   .master-alert-outdated {
-    display: none;
+    background-color: #f44336;
+  }
+
+  .master-alert-suspended {
+    background-color: #f44336;
+  }
+
+  .master-alert-sale {
+    background-color: #0d6efd;
   }
 
   /* Chat box opener */
@@ -422,11 +442,54 @@
   }
 </style>
 
-<!-- Style - IE 8 and Below Only -->
-<!--[if lte IE 8]>
-<link rel="stylesheet" type="text/css" href="/assets/css/master/lte-ie8.css?cb={{ site.time | date: '%s' }}">
+<!-- Style - IE 9 and Below Only -->
+<!--[if lte IE 9]>
+<link rel="stylesheet" type="text/css" href="/assets/css/master/lte-ie9.css?cb={{ site.time | date: '%s' }}">
 <![endif]-->
 
+<!-- Style - Scripts are Disabled -->
+<noscript>
+  <style media="screen">
+    .master-alert-outdated {
+      display: block !important;
+    }
+  </style>
+</noscript>
+
+<!-- Alerts -->
+<!-- Master - Outdated Alert Box -->
+<div
+  class="master-alert master-alert-top master-alert-fixed master-alert-outdated bg-danger animation-fade-in"
+  role="alert" aria-live="polite" aria-label="Outdated browser"
+  hidden>
+  <span class="master-alert-close">&times;</span>
+  <div>
+    <i class="fa-solid fa-warning fa-bounce me-2"></i>
+    You are using an outdated browser that our site <strong>DOES NOT</strong> support. Please <a href="https://www.google.com/chrome" rel="nofollow" target="_blank">click here</a> to update your browser.
+  </div>
+</div>
+<div
+  class="master-alert master-alert-top master-alert-fixed master-alert-suspended bg-danger animation-fade-in"
+  role="alert" aria-live="polite" aria-label="Payment method issue"
+  hidden>
+  <span class="master-alert-close">&times;</span>
+  <div>
+    <i class="fa-solid fa-warning fa-bounce me-2"></i>
+    There is a <strong>problem with your payment method</strong>. To continue using <strong>{{ site.brand.name }}</strong>, please <a href="{{ site.url }}/account#billing" target="_blank">update your payment method</a>.
+  </div>
+</div>
+<div
+  class="master-alert master-alert-top master-alert-fixed master-alert-sale bg-primary animation-fade-in"
+  role="alert" aria-live="polite" aria-label="Flash sale"
+  hidden>
+  <span class="master-alert-close">&times;</span>
+  <div>
+    <i class="fa-solid fa-stopwatch fa-beat  me-2"></i>
+    <strong>FLASH SALE!</strong>
+    Save <strong>15%</strong> at checkout—today only! <a href="{{ site.url }}/pricing" target="_blank">Claim discount</a>.
+  </div>
+</div>
+
 <!-- App - Head Content -->
 {%- if page.settings.include-app-head == false -%}
 {% elsif layout.settings.include-app-head == false %}

diff --git a/_layouts/master/authentication/account.html b/_layouts/master/authentication/account.html
@@ -555,12 +555,12 @@ <h4 class="mb-0"><i class="bi-credit-card nav-icon me-1"></i> Billing</h4>
                     <div class="alert alert-soft-danger" role="alert">
                       <h4 class="alert-heading">
                         <i class="fas fa-exclamation-triangle mr-1"></i>
-                        Subscription Suspended!
+                        Action required
                       </h4>
-                      Your premium features have been disabled due to a failed payment.
+                      Your premium features are temporarily paused due to a payment hiccup. Your subscription is not cancelled.
                       <br>
                       <br>
-                      Please <a href="" class="auth-billing-update-btn" target="_blank">update your payment method</a> to continue using premium features.
+                      To reactivate your premium features, please <a href="" class="auth-billing-update-btn" target="_blank">update your payment method</a> at your earliest convenience.
                     </div>
                   </div>
                 </div>

diff --git a/assets/_src/sass/master/lte-ie8.css → assets/_src/sass/master/lte-ie9.css b/assets/_src/sass/master/lte-ie8.css → assets/_src/sass/master/lte-ie9.css
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "through2": "4.0.2",
     "ultimate-jekyll-poster": "0.0.15",
     "vinyl-named": "1.1.0",
-    "web-manager": "3.2.33",
+    "web-manager": "3.2.37",
     "webpack": "5.89.0",
     "webpack-stream": "6.1.2",
     "wonderful-fetch": "^1.1.1",

diff --git a/special/master/redirects/authentication/helpers/cancel.html b/special/master/redirects/authentication/helpers/cancel.html
@@ -5,5 +5,5 @@
 
 ### REGULAR PAGES ###
 redirect:
-  url: /account?action=cancel
+  url: /account#billing?action=cancel
 ---
diff --git a/special/master/redirects/authentication/helpers/refund.html b/special/master/redirects/authentication/helpers/refund.html
@@ -0,0 +1,9 @@
+---
+### ALL PAGES ###
+layout: master/misc/redirect
+permalink: /refund
+
+### REGULAR PAGES ###
+redirect:
+  url: https://itwcreativeworks.com/portal/account/payment/manage
+---