Merge branch 'develop' of gitea.livecarta.com:LiveCarta/LiveCartaWP into develop

htdocs/wp-content/themes/lawcarta/assets/fonts/lcFiltered/lawcarta.svg

@@ -7,7 +7,6 @@
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe20e;" glyph-name="menu" d="M128 704h768v-86h-768v86zM128 406v84h768v-84h-768zM128 192v86h768v-86h-768z" />
 <glyph unicode="&#xe600;" glyph-name="account-settings" horiz-adv-x="1079" d="M622.703 399.568h69.189c20.757 27.676 34.595 62.27 41.514 96.865l-48.432 48.432c0 13.838 0 27.676 0 48.432 0 13.838 0 27.676 0 48.432l48.432 48.432c-6.919 34.595-20.757 69.189-41.514 96.865h-69.189c-20.757 20.757-41.514 48.432-62.27 62.27v69.189c-27.676 20.757-62.27 34.595-96.865 41.514l-48.432-48.432c-13.838 0-27.676 0-48.432 0-13.838 0-27.676 0-48.432 0l-48.432 48.432c-34.595-6.919-69.189-20.757-96.865-41.514v-69.189c-20.757-20.757-48.432-41.514-62.27-62.27h-69.189c-20.757-27.676-34.595-62.27-41.514-96.865l48.432-48.432c0-13.838 0-27.676 0-48.432 0-13.838 0-27.676 0-48.432l-48.432-48.432c6.919-34.595 20.757-69.189 41.514-96.865h69.189c20.757-20.757 41.514-48.432 62.27-62.27v-69.189c27.676-20.757 62.27-34.595 96.865-41.514l48.432 48.432c13.838 0 27.676 0 48.432 0 13.838 0 27.676 0 48.432 0l48.432-48.432c34.595 6.919 69.189 20.757 96.865 41.514v69.189c27.676 13.838 48.432 34.595 62.27 62.27zM373.622 482.595c-55.351 0-103.784 48.432-103.784 103.784s48.432 103.784 103.784 103.784c55.351 0 103.784-48.432 103.784-103.784 0-62.27-48.432-103.784-103.784-103.784zM1037.838 143.568l41.514 20.757c0 20.757 0 48.432-6.919 69.189l-41.514 6.919c-6.919 6.919-6.919 20.757-13.838 27.676s-13.838 13.838-13.838 27.676l13.838 41.514c-13.838 20.757-34.595 34.595-55.351 41.514l-34.595-27.676c-20.757 6.919-34.595 13.838-55.351 13.838l-20.757 41.514c-20.757 0-48.432 0-69.189-6.919l-6.919-41.514c-6.919-6.919-20.757-6.919-27.676-13.838s-13.838-13.838-27.676-13.838l-41.514 13.838c-20.757-13.838-34.595-34.595-41.514-55.351l27.676-34.595c-6.919-20.757-13.838-34.595-13.838-55.351l-41.514-20.757c0-20.757 0-48.432 6.919-69.189l41.514-6.919c6.919-6.919 6.919-20.757 13.838-27.676s13.838-13.838 13.838-27.676l-13.838-41.514c13.838-20.757 34.595-34.595 55.351-41.514l34.595 27.676c20.757-6.919 41.514-13.838 55.351-13.838l20.757-41.514c20.757 0 48.432 0 69.189 6.919l6.919 41.514c6.919 6.919 20.757 6.919 27.676 13.838s13.838 13.838 27.676 13.838l41.514-13.838c20.757 13.838 34.595 34.595 41.514 55.351l-27.676 34.595c6.919 13.838 13.838 34.595 13.838 55.351zM864.865 102.054c-34.595-20.757-76.108-6.919-96.865 27.676s-6.919 76.108 27.676 96.865c34.595 20.757 76.108 6.919 96.865-27.676s6.919-76.108-27.676-96.865z" />
 <glyph unicode="&#xe609;" glyph-name="close" d="M512 553.412l-384 384c-30.118 30.118-75.294 30.118-105.412 0s-30.118-75.294 0-105.412l384-384-384-384c-30.118-30.118-30.118-75.294 0-105.412s75.294-30.118 105.412 0l384 384 384-384c30.118-30.118 75.294-30.118 105.412 0 15.059 15.059 22.588 37.647 22.588 52.706 0 22.588-7.529 37.647-22.588 52.706l-384 384 384 384c15.059 15.059 22.588 37.647 22.588 52.706 0 22.588-7.529 37.647-22.588 52.706-30.118 30.118-75.294 30.118-105.412 0l-384-384z" />
 <glyph unicode="&#xe900;" glyph-name="warning" d="M1010.432 121.248l-383.968 768c-21.664 43.36-65.952 70.752-114.464 70.752s-92.8-27.392-114.464-70.752l-383.968-768c-19.84-39.68-17.728-86.816 5.6-124.576 23.328-37.696 64.512-60.672 108.864-60.672h767.904c44.384 0 85.568 22.976 108.864 60.672 23.328 37.76 25.44 84.896 5.632 124.576zM575.936 96c0-17.696-14.304-32-32-32h-64c-17.696 0-32 14.304-32 32v64c0 17.696 14.304 32 32 32h64c17.696 0 32-14.304 32-32v-64zM575.936 352c0-17.696-14.304-32-32-32h-64c-17.696 0-32 14.304-32 32v320c0 17.664 14.304 32 32 32h64c17.696 0 32-14.336 32-32v-320z" />
@@ -98,6 +97,7 @@
 <glyph unicode="&#xe955;" glyph-name="new-info" d="M477.878 958.91c-150.33-11.198-284.342-83.869-374.949-203.281-51.795-68.245-84.001-146.168-98.271-237.634-5.219-33.462-5.219-106.529 0-139.991 21.9-140.453 89.782-255.67 199.845-339.175 67.98-51.563 146.3-83.968 237.502-98.172 33.462-5.219 106.529-5.219 139.991 0 124.433 19.39 230.202 75.479 309.545 164.17 70.359 78.617 111.021 165.525 127.802 273.177 5.219 33.462 5.219 106.529 0 139.991-14.204 91.202-46.609 169.522-98.172 237.502-84.662 111.583-205.659 181.81-345.154 200.275-19.985 2.643-79.377 4.558-98.139 3.138zM553.323 891.689c91.342-8.831 173.147-43.834 239.414-97.32l-0.855 0.668c18.63-14.798 52.356-48.524 67.155-67.155 37.558-47.203 67.089-104.547 82.151-159.546 34.585-126.117 13.477-259.799-57.773-366.526-43.267-64.587-101.094-116.236-168.983-151.039l-2.521-1.174c-63.686-31.942-127.571-46.939-199.911-46.939-100.187 0-189.176 29.993-270.501 91.136-23.023 17.276-59.26 52.455-76.569 74.323-90.773 114.457-120.535 259.964-82.019 400.582 14.931 54.503 44.99 112.838 81.986 159.182 14.865 18.63 48.59 52.356 67.221 67.221 67.683 54.041 151.552 88.328 236.115 96.52 12.871 0.976 27.877 1.532 43.014 1.532 14.806 0 29.488-0.532 44.027-1.579l-1.95 0.113zM487.49 723.786c-12.982-5.45-24.444-15.195-31.447-26.756-7.465-12.354-9.612-20.414-9.513-35.708 0.132-18.894 5.087-30.357 19.225-44.527 14.765-14.732 25.666-19.291 46.245-19.291 19.093 0 30.654 4.459 44.362 17.177 17.144 15.855 24.576 36.864 20.645 58.302-3.835 22.091-18.023 40.206-37.285 49.407l-0.405 0.174c-7.697 3.667-12.321 4.525-25.6 4.922-14.039 0.429-17.573-0.066-26.228-3.7zM445.44 392.539v-159.579h133.12v319.158h-133.12v-159.579z" />
 <glyph unicode="&#xe956;" glyph-name="right-arrow" horiz-adv-x="1112" d="M559.514 957.484c-15.243-3.277-30.31-11.703-44.442-24.781-20.539-19.017-31.685-39.409-34.289-62.786-1.463-13.166 2.048-29.755 9.918-47.045 11.791-25.893 24.839-39.965 136.221-147.134 35.933-34.421 67.601-65.127 99.094-96.010l-1.873 1.831 9.86-10.094-4.184-8.631-4.213-8.631h-725.606v-200.119h727.742l3.95-9.157c2.165-5.003 3.92-9.538 3.92-10.035s-36.484-35.46-81.042-77.678c-130.984-124.080-149.036-142.921-161.792-168.989-18.11-36.952-16.443-65.126 5.53-93.886 35.343-46.256 78.058-57.637 127.415-33.88 11.761 5.647 19.222 12.083 63.020 54.36 98.099 94.764 360.945 359.892 373.058 376.335 36.337 49.269 34.055 85.489-8.602 137.099-16.706 20.246-338.622 342.894-384.059 384.936-21.738 20.158-28.731 25.424-43.184 32.709-17.057 8.572-37.040 14.16-49.679 13.926-3.569-0.088-11.118-1.141-16.764-2.341z" />
 <glyph unicode="&#xe957;" glyph-name="download-new" horiz-adv-x="1100" d="M472.936 716.553v-243.484l-6.258-2.996-6.296-2.996-53.096 56.282c-99.025 104.979-110.478 114.195-141.881 114.309-16.232 0.038-29.241-5.879-42.818-19.418-16.953-16.953-23.817-37.888-19.115-58.103 5.613-24.159 3.831-22.149 146.508-165.319 73.159-73.425 137.975-137.444 144.043-142.298 18.887-15.095 28.786-19.266 45.928-19.304 13.122-0.038 16.081 0.645 26.814 6.068 7.396 3.793 20.025 13.312 32.882 24.879 32.768 29.468 256.076 255.924 264.002 267.719 9.595 14.298 15.208 33.071 13.805 46.421-2.238 21.921-18.508 43.729-40.695 54.575-8.154 3.982-12.402 4.855-24.045 4.779-12.553-0.038-15.663-0.796-27.989-6.903-16.081-7.964-29.81-20.708-90.567-84.12-23.969-25.062-42.557-44.37-61.193-63.631l4.19 4.352-18.394-18.925-5.992 2.882-6.030 2.844v485.831h-133.803v-243.447zM0 161.811c0-129.972 0.721-145.143 7.661-163.726 6.865-18.318 17.636-26.927 41.339-32.996 11.643-2.996 42.249-3.186 492.658-3.186h480.294l12.933 4.058c15.132 4.741 26.093 12.136 33.83 22.793 11.112 15.36 11.188 16.156 12.288 131.679 0.569 57.989 0.417 119.239-0.341 136.116l-1.365 30.72h-131.375l-1.176-7.964c-0.503-4.333-0.789-9.354-0.789-14.441 0-2.177 0.053-4.343 0.156-6.494l-0.012 0.304c0.303-6.978 0.379-46.27 0.19-87.343l-0.417-74.714h-812.070v190.654h-133.803v-125.459z" />
+<glyph unicode="&#xe958;" glyph-name="menu" horiz-adv-x="1536" d="M0 896v-64h1536v128h-1536v-64zM0 448v-64h1536v128h-1536v-64zM0 0v-64h1536v128h-1536v-64z" />
 <glyph unicode="&#xea1c;" glyph-name="caret" d="M192 832l640-384-640-384z" />
 <glyph unicode="&#xeabe;" glyph-name="apple" d="M791.498 415.908c-1.294 129.682 105.758 191.876 110.542 194.966-60.152 88.020-153.85 100.078-187.242 101.472-79.742 8.074-155.596-46.948-196.066-46.948-40.368 0-102.818 45.754-168.952 44.552-86.916-1.292-167.058-50.538-211.812-128.38-90.304-156.698-23.126-388.84 64.89-515.926 43.008-62.204 94.292-132.076 161.626-129.58 64.842 2.588 89.362 41.958 167.756 41.958s100.428-41.958 169.050-40.67c69.774 1.296 113.982 63.398 156.692 125.796 49.39 72.168 69.726 142.038 70.924 145.626-1.548 0.706-136.060 52.236-137.408 207.134zM662.562 796.478c35.738 43.358 59.86 103.512 53.28 163.522-51.478-2.096-113.878-34.29-150.81-77.55-33.142-38.376-62.148-99.626-54.374-158.436 57.466-4.484 116.128 29.204 151.904 72.464z" />
 </font></defs></svg>

htdocs/wp-content/themes/lawcarta/header.php

@@ -150,6 +150,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     <header class="header">
         <div class="cont">
             <div class="header-cont">
+                <button class="header-menu-toggle header-btn mobile" title="Open Menu">
+                    <span class="icon-menu"></span>
+                </button>
                 <a href="/" class="logo" title="Logo" tabindex="0">
                     <img src="<?= get_theme_file_uri('/assets/img/logo.svg'); ?>" alt="Logo">
                 </a>
@@ -277,9 +280,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                         hrmHtml += `</button>`;
                     }
                     hrmHtml += `
-                        <button class="header-menu-toggle header-btn mobile" title="Open Menu">
-                            <span class="icon-menu"></span>
-                        </button>
                         <a class="header-btn circle" href="${linksObject.cart}" title="My Cart" tabindex="0">
                             <span class="icon-shop"></span>
                             ${frontSettings?.cartItemsCount > 0 ? `<span class="num">${frontSettings.cartItemsCount}</span>` : ''}

htdocs/wp-content/themes/lawcarta/page_resource_item.php

@@ -18,9 +18,11 @@
         btn.addEventListener("click", ( event ) => {
           btn.classList.add("btn-loading");
         },false);
+
         document.addEventListener( 'wpcf7invalid', ( event ) => {
           btn.classList.remove("btn-loading");
         },false);
+        
         document.addEventListener( 'wpcf7mailfailed', ( event ) => {
           btn.classList.remove("btn-loading");
         },false);
@@ -31,7 +33,7 @@
             return;
           }
           btn.classList.remove("btn-loading");
-          window.open(pdfUrl, "_self");
+          window.open(pdfUrl, "_blank");
         }, false );
       });
     </script>