update style

OxfordDemSci · Nov 18, 2024 · f1a7536 · f1a7536
1 parent f1617b8
commit f1a7536
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 15 deletions.
diff --git a/www/public_html/css/style.css b/www/public_html/css/style.css
@@ -9,7 +9,30 @@ html, body, #map {
 }
 
 .navbar{
- background-color: #002147;    
+/* background-color: #002147;  #1c0d5a */ 
+ background-color: #eff7fb; 
+}
+
+.nav-link {
+    color: #1c0d5a;
+    font-style: normal;
+    font-weight: 600;
+    font-size: 16px;
+    font-family: "Questrial", sans-serif;
+}
+
+.nav-link:hover {
+    color: #295cff;
+}
+
+.sidebar-header {
+    margin: -10px -20px 0;
+    height: 40px;
+    padding: 0 20px;
+    line-height: 40px;
+    font-size: 12pt;
+    color: #fff;
+    background-color: #0074d9;
 }
 
 .mousechangeHand:hover {

diff --git a/www/public_html/img/LogoDGG.png b/www/public_html/img/LogoDGG.png
diff --git a/www/public_html/index.html b/www/public_html/index.html
@@ -25,7 +25,10 @@
 
         <link rel="stylesheet" type="text/css" href="./utils/DataTables/datatables.min.css"/>
         <link rel="stylesheet" type="text/css" href="./utils/Scroller-2.0.7/css/scroller.bootstrap5.min.css"/>
-
+
+        <link rel="preconnect" href="https://fonts.googleapis.com">
+        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+        <link href="https://fonts.googleapis.com/css2?family=Questrial&display=swap" rel="stylesheet">
 
         <style>
 
@@ -77,35 +80,34 @@
 
 <div class="navbar navbar-dark shadow-sm navbar-expand-lg" style="z-index: 2100" id="topNavbarDiv">
 <div class="container-fluid">
-    <a class="navbar-brand" href="#">Digital Gender Gaps</a>
+    <img id="img-header" src="./img/LogoDGG.png" style="height:17px;" />
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
-    <div class="collapse navbar-collapse justify-content-end" id="navbarText">
-
-<!--      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+    <div class="collapse navbar-collapse justify-content-end" id="navbarText" style="height:40px;">
+      <ul class="navbar-nav mb-2 mb-lg-0" style="padding-right: 50px">
         <li class="nav-item">
-          <a class="nav-link" href="#" id="aBtnQuickStart">Quick Start</a>
+          <a class="nav-link" href="http://3.11.85.207" >Home</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link " aria-current="page" href="#" id="aBtnAbout">About</a>
+          <a class="nav-link " aria-current="page" href="http://3.11.85.207/about/">About</a>
         </li>
           <li class="nav-item">
-          <a class="nav-link " aria-current="page" href="#" id="aBtnResearch">Research</a>
+          <a class="nav-link " aria-current="page" href="http://3.11.85.207/research/">Research</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="#" id="aBtnTeam">Team</a>
+          <a class="nav-link" href="http://3.11.85.207/team/" >Team</a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" href="./api/v1" target="_blank">API</a>
+            <a class="nav-link" href="http://3.11.85.207/contact/" >Contact</a>
         </li>        
-      </ul>-->
-      <span class="navbar-text p-0 m-0 ">
+      </ul>
+<!--     <span class="navbar-text p-0 m-0 ">
         <img id="img-header" src="./img/university_of_oxford_logo.png" style="height:40px;" />
-      </span>
+      </span>-->
     </div>
   </div>
-            </div>            
+</div>            
 
 
 

diff --git a/www/public_html/js/bottom_table.js b/www/public_html/js/bottom_table.js
@@ -121,6 +121,8 @@ export function load_data_BottomTable(data,
         <tbody>`;
 
     for (var k in data) {
+
+       if (data_sub[k] === undefined || data_sub[k] === null) continue;
 
        if  (!(_utils.isContains(countriesList, k))) continue;
 

diff --git a/www/public_html/js/main.js b/www/public_html/js/main.js
@@ -156,6 +156,10 @@ legendLayer.addTo(map);
 var scaleLayer = L.control.scale({position: 'bottomleft'});
 scaleLayer.addTo(map);
 
+L.control.zoom({
+    position: 'topleft'
+}).addTo(map);
+
 
 var worldLayer = L.geoJson(null, {
     style: function (feature){