Merge pull request catchpoint#3025 from catchpoint/revert-3001-overla…

…pping_text Revert "Overlapping text"
HTTPArchive · Dec 12, 2023 · 0fc3777 · 0fc3777
2 parents 44ca170 + c6200f6
commit 0fc3777
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/www/assets/css/account.css b/www/assets/css/account.css
@@ -189,20 +189,6 @@ body.theme-b {
   border: 0;
 }
 
-.contact-info-modal {
-    height: 38rem !important;
-}
-.contact-info-modal-form {
-    height: 26rem !important;
-}
-
-.password-modal {
-    height: 34rem !important;
-}
-.password-modal-form {
-    height: 22rem !important;
-}
-
 .modal,
 .modal_screen {
   position: fixed;

diff --git a/www/assets/css/wpt-header.css b/www/assets/css/wpt-header.css
@@ -35,7 +35,7 @@ wpt-header {
   width: 100%;
   grid-column: 1 / 13;
   position: relative;
-  z-index: 1000;
+  z-index: 9999999;
   background: none;
   border: none;
 }
@@ -416,7 +416,7 @@ wpt-header .wptheader_nav_menu details[open] summary span:after {
 
 @media (min-width: 86em) {
   wpt-header {
-    z-index: 1000;
+    z-index: 999999;
   }
   cp-header a {
     padding-left: 1.5rem;

diff --git a/www/templates/account/includes/modals/contact-info.php b/www/templates/account/includes/modals/contact-info.php
@@ -31,10 +31,8 @@
             <input type="hidden" name="id" value="<?= $id; ?>" />
             <input type="hidden" name="type" value="contact-info" />
             <input type="hidden" name="csrf_token" value="<?= $csrf_token ?>" />
-            <div class="section">
-                <div class="save-button">
-                    <button type="submit" class="pill-button blue">Save</button>
-                </div>
+            <div class="save-button">
+                <button type="submit" class="pill-button blue">Save</button>
             </div>
         </div>
     </form>

diff --git a/www/templates/account/includes/modals/password.php b/www/templates/account/includes/modals/password.php
@@ -1,5 +1,5 @@
 <fg-modal id="password-modal" class="password-modal fg-modal">
-    <form method="POST" class="password-modal-form" action="/account">
+    <form method="POST" action="/account">
         <h3 class="modal_title">Change your password</h3>
         <p class="details">The requirements are at least 8 characters, including a number, lowercase letter, uppercase letter and symbol. No &lt;, &gt;.</p>
         <div class="input-set">