Valentin 4 месяцев назад
Родитель
Сommit
18bcbf0562

+ 26 - 1
index.php

@@ -68,10 +68,35 @@
     <?php wp_body_open(); ?>
     <?php do_action('get_header'); ?>
 
-    <div id="app" class="banner bg-jlg-dark-blue text-jlg-white font-authentic flex w-full flex-col justify-center items-center">
+    <div id="app" class="banner bg-jlg-dark-blue text-jlg-white font-authentic flex w-full flex-col justify-center items-center" style="opacity: 0; transition: opacity 0.2s ease-out;">
       <?php echo view(app('sage.view'), app('sage.data'))->render(); ?>
     </div>
 
+    <div id="loading" style="
+        width: 100vw;
+        height: 100vh;
+        background-color: #010d19;
+        z-index: 9999;
+        position: fixed;
+        top: 0;
+        left: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-family: sans-serif;
+        color: white;
+        opacity: 1;
+        transition: opacity 0.2s ease-out;
+    ">
+      <p>
+        Chargement
+        <span class="dot-one">.</span>
+        <span class="dot-two">.</span>
+        <span class="dot-three">.</span>
+      </p>
+    </div>
+
+
     <script>
       document.addEventListener('DOMContentLoaded', function () {
       }, false);

+ 13 - 2
resources/scripts/app.js

@@ -96,11 +96,11 @@ domReady(async () => {
   // et privacy policy
   let loginPopupText = document.getElementById('content_login_popup');
   let privacyText = document.getElementById('content_privacy').innerHTML;
-  loginPopupText = loginPopupText.innerText;
+  loginPopupText = loginPopupText.innerHTML;
   let loginPopupTextWrapper = document.getElementsByClassName('xoo-el-sidebar');
   if (loginPopupTextWrapper[0]) {
     loginPopupTextWrapper[0].innerHTML = `<div>Espace collaboratif du site</div>`;
-    loginPopupTextWrapper[0].innerHTML += `<p style="padding-top: 15px;">${loginPopupText}</p>`;
+    loginPopupTextWrapper[0].innerHTML += loginPopupText;
   }
   let loginPopupHeader = document.querySelector('.xoo-el-sidebar div:first-of-type');
   if (loginPopupHeader !== null) {
@@ -140,11 +140,20 @@ domReady(async () => {
     loginPopupTextWrapper[0].style.overflowY = "scroll";
     loginPopupTextWrapper[0].appendChild(privacyPolicyContent);
   }
+  const privacyCheck = document.querySelector(".xoo-aff-required.xoo-aff-checkbox_single label");
+  if (privacyCheck) {
+    privacyCheck.innerHTML = `
+  <input type="checkbox" name="xoo_el_reg_terms" class="xoo-aff-required xoo-aff-checkbox_single" value="yes">
+  J'accepte les <a>Conditions d'utilisation de la license et la politique de confidentialité</a>.
+    `;
+  }
+
 
   const privacyLink = document.querySelector('.xoo-aff-checkbox_single a');
   if (privacyLink) {
     privacyLink.addEventListener('click', function (e) {
       e.preventDefault();
+      e.target.style.cursor = "pointer";
       togglePolicy();
     });
   }
@@ -168,6 +177,8 @@ domReady(async () => {
 
   // désactive le loading quand les éléments sont affichés correctement
   setTimeout(() => {
+    let appEl = document.getElementById('app');
+    appEl.style.opacity = 1;
     let loadingEl = document.getElementById('loading');
     loadingEl.style.opacity = "0";
     setTimeout(() => {

+ 43 - 1
resources/styles/admin_custom.css

@@ -10,7 +10,7 @@ html {
     background-color: #1e262e !important;
 }
 
-body.wp-admin, div:not(#tutorial_editor), .notice, table, th, td, tr, tr.active, tbody {
+body.wp-admin, div:not(#tutorial_editor):not(.chart__bar-section.is-bar), .notice, table, th, td, tr, tr.active, tbody {
     background-color: #26313b !important;
     background: #26313b !important;
     color: white !important;
@@ -205,4 +205,46 @@ div.row-actions {
 
 #bulk-revisions #bulk-action-selector-top > option[value="publish_revision"] {
     display: none !important;
+}
+
+.highlight-cards-heading .highlight-cards-heading__settings-action svg {
+    fill: white !important;
+}
+
+.highlight-cards-heading,
+.tooltip.popover.highlight-card-popover .popover__inner > button {
+    color: white !important;
+}
+
+.chart__bar-section.is-bar {
+    background: white !important;
+    background-color: white !important;
+}
+
+
+.chart__bar-section-inner {
+    background: green !important;
+    background-color: green !important;
+}
+
+.jetpack-connected header {
+    background-color: #26313b !important;
+}
+
+.jetpack-connected .stats-section-title,
+.jetpack-connected .date {
+    color: white !important;
+}
+
+.jetpack-connected .components-button {
+    color: white !important;
+}
+
+.jetpack-connected .stats-date-control-picker .components-button {
+    color: #26313b !important;
+}
+
+.stats-navigation-arrows__previous svg,
+.stats-navigation-arrows__next svg {
+    fill: white !important;
 }

+ 12 - 2
resources/styles/app.css

@@ -133,8 +133,18 @@
       }
 
       .xoo-el-sidebar p {
-        padding: 40px 40px;
-        color: 010d19;
+        padding: 0px 30px;
+        margin-top: 10px;
+        margin-bottom: 10px;
+        color: #010d19;
+      }
+
+      .xoo-el-sidebar p:first-of-type {
+        margin-top: 20px;
+      }
+
+      .xoo-el-sidebar p:last-of-type {
+        margin-bottom: 20px;
       }
 
       #about_popup {

+ 4 - 0
resources/styles/custom-editor-style.css

@@ -75,4 +75,8 @@ tfoot,
 
 .block-editor-block-card {
     display: none !important;
+}
+
+#toplevel_page_jetpack {
+    display: none !important;
 }

+ 0 - 24
resources/views/sections/footer.blade.php

@@ -20,30 +20,6 @@
   </div>
 </footer>
 
-<div id="loading" style="
-    width: 100vw;
-    height: 100vh;
-    background-color: #010d19;
-    z-index: 9999;
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-family: sans-serif;
-    color: white;
-    opacity: 1;
-    transition: opacity 0.2s ease-out;
-">
-  <p>
-    Chargement
-    <span class="dot-one">.</span>
-    <span class="dot-two">.</span>
-    <span class="dot-three">.</span>
-  </p>
-</div>
-
 <script>
   // Define the event listener function
   function closeAboutPopupHandler(event) {