axiologic-pla/dev#38

Fix EPI-253 JIRA
drajcan · Feb 7, 2023 · 919f47d · 919f47d
1 parent b45fd1f
commit 919f47d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/apihub-root/lightweight-pwa/css/main.css b/apihub-root/lightweight-pwa/css/main.css
@@ -44,8 +44,8 @@
 
 body {
     padding: 0;
-    width: 21.6%;
-    min-width: 414px;
+    width: 24%;
+    min-width: 435px;
     margin-right: auto;
     margin-left: auto;
     background-image: url("./../images/background.jpg");
@@ -90,7 +90,6 @@ b {
 .page-container {
     background: var(--olivegreen);
     color: #fff;
-    padding: 0px 35px;
     border-radius: 30px;
     align-self: center;
     max-height: 94%;
@@ -107,26 +106,27 @@ b {
     background: url(../images/app-icon.svg) no-repeat center;
     height: 13.5%;
     background-size: 25%;
+    margin: 0 35px;
 }
 
 .welcome-container {
     align-self: center;
     font-family: 'DM Sans bold';
-    width: 100%;
     height: auto;
     text-align: center;
     line-height: 1.5em;
     font-size: calc(100% + 0.8vmin);
     padding-bottom: 14px;
+    margin: 0 35px;
 }
 
 .terms-content-container {
     flex-grow: 1;
-    margin-bottom: 24px;
     display: flex;
     flex-direction: column;
     justify-content: center;
     max-height: 70%;
+    margin: 0 35px 24px;
 }
 
 .extra-text {
@@ -175,7 +175,10 @@ b {
 
 .scan-button.terms-button {
     border: 1px solid #516266;
-    position: unset;
+    position: relative;
+    bottom: 0;
+    right: 0;
+    padding: 1vh 2vh;
 }
 
 .terms-button.agree {
@@ -288,7 +291,7 @@ b {
     -o-animation: animatedBackground 5s linear infinite;
     animation-delay: 1s;
     animation-direction: alternate;
-    margin: 12% auto 6%;
+    margin: 12% 90px 6%;
     border-radius: 15px;
 }
 
@@ -314,6 +317,7 @@ b {
     align-self: center;
     text-align: center;
     font-size: calc(100% + 0.1vmin);
+    margin: 0 35px;
 }
 
 .scan-button-container {
@@ -546,8 +550,8 @@ b {
     justify-content: center;
     border-radius: 30px 30px 0px 0px;
     height: fit-content;
-    padding: 1.5vh;
-    min-height: 12%;
+    padding: 2.5rem 1.5rem;
+    min-height: 7%;
     height: fit-content;
 }
 
@@ -571,7 +575,7 @@ b {
 .leaflet-page .product-name,
 .modal-header .header-title,
 .modal-header .modal-title {
-    font-size: 3.5vh;
+    font-size: calc(100% + 1.7vh);
     font-family: 'DM Sans bold';
 }
 
@@ -588,16 +592,11 @@ b {
 .modal-header.left-aligned-header .modal-title {
     text-align: left;
     margin-right: 12px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 }
 
 #settings-modal .modal-header {
     background-color: var(--olivegreen);
     color: #fff;
-    padding: 1.5vh 1.5vh 0vh;
-    min-height: 14%;
 }
 
 #settings-modal .modal-header .close-modal {
@@ -613,12 +612,11 @@ b {
     justify-content: center;
     align-self: center;
     z-index: 100;
-    width: 100%;
     height: 94%;
     min-height: 960px;
     border-radius: 30px;
-    max-width: 21.6vw;
-    min-width: 414px;
+    width: 24%;
+    min-width: 435px;
 }
 
 .modal-header .modal-icon {
@@ -1045,8 +1043,8 @@ b {
 @media only screen and (orientation: landscape) {
     body {
         min-height: 1000px;
-        min-width: 414px;
-        width: 21.6%;
+        min-width: 435px;
+        width: 24%;
         margin: auto;
     }
 }
diff --git a/apihub-root/lightweight-pwa/js/controllers/LeafletController.js b/apihub-root/lightweight-pwa/js/controllers/LeafletController.js
@@ -113,9 +113,9 @@ function LeafletController() {
     // document.querySelector(".product-name").innerText = translations[window.currentLanguage]["select_lang_title"];
     // document.querySelector(".product-description").innerText = translations[window.currentLanguage]["select_lang_subtitle"];
     // let langList = `<div class="select-lang-text">${translations[window.currentLanguage]["select_lang_text"]}</div><select class="languages-list">`;
-    document.querySelector("#leaflet-lang-select").setAttribute('style', 'display:flex !important');
     document.querySelector(".loader").setAttribute('style', 'display:none');
     if (result.availableLanguages.length >= 1) {
+      document.querySelector("#leaflet-lang-select").setAttribute('style', 'display:flex !important');
       document.querySelector(".proceed-button.no-leaflet").setAttribute('style', 'display:none');
     //  document.querySelector(".text-section.no-leaflet").setAttribute('style', 'display:none');
       let languagesContainer = document.querySelector(".languages-container");

diff --git a/apihub-root/lightweight-pwa/js/controllers/MainController.js b/apihub-root/lightweight-pwa/js/controllers/MainController.js
@@ -65,6 +65,7 @@ function MainController() {
 
   this.closeModal = function () {
     document.querySelector("#settings-modal").setAttribute('style', 'display:none !important');
+    document.querySelector(".page-container").setAttribute('style', 'display:flex !important');
   }
   this.showModal = function (key) {
     this.toggleMenu();
@@ -74,7 +75,9 @@ function MainController() {
         }*/
 
     let modal = document.querySelector("#settings-modal");
+
     modal.setAttribute('style', 'display:flex !important');
+    document.querySelector(".page-container").setAttribute('style', 'display:none !important');
     let titleKey = key + "_modal_title";
     let subtitleKey = key + "_modal_subtitle";
     let contentKey = key + "_content";