From 70aaff899524a8a795751a43472e53b8cf19a519 Mon Sep 17 00:00:00 2001
From: Simran <simransia07@gmail.com>
Date: Wed, 13 Apr 2022 19:16:23 +0000
Subject: [PATCH 1/3] GIT CHECKOUT

---
 app/views/layouts/_header.html.erb | 6 +++---
 config/locales/en.yml              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index b748e1fe3b..ac66353d38 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -79,7 +79,7 @@
           </div>
         </li>
 
-        <li class="nav-item dropdown" style="min-width:80px;">
+        <li class="nav-item dropdown" style="min-width:80px; margin-left:-25px;">
           <div class="nav-link" data-toggle="dropdown" onclick="location.href='#'">
             <!-- <a > -->
             <%= t('layout._header.about.about_title') %>
@@ -94,10 +94,10 @@
           </div>
         </li>
 
-        <li class="nav-item d-sm-none d-lg-inline" style="padding:0 10px;">
+        <li class="nav-item d-sm-none d-lg-inline" style="padding:0 10px; width:90px;">
           <a class="nav-link btn btn-outline-secondary" target="_blank" href="//store.publiclab.org"><%= t('layout._header.store') %></a>
         </li>
-        <li class="nav-item d-sm-none d-lg-inline" style="padding:0 10px;">
+        <li class="nav-item d-sm-none d-lg-inline" style="padding:0 10px; width:90px;">
           <a class="nav-link btn btn-outline-secondary" href="/donate"><%= t('layout._header.donate') %></a>
         </li>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 06461123a2..7e6195e88c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -725,7 +725,7 @@ en:
         spectral_workbench: "Spectral Workbench"
         code_community: "Code Community"
       about:
-        about_title: "About us"
+        about_title: "About Us"
         stories: "Stories"
         blog: "Blog"
         about_public_lab: "About Public Lab"

From e4d8840ed4b8b27771288d5445d892d03c9c9bd6 Mon Sep 17 00:00:00 2001
From: Simran <simransia07@gmail.com>
Date: Fri, 15 Apr 2022 01:48:28 +0000
Subject: [PATCH 2/3] Improved responsiveness

---
 app/views/layouts/_header.html.erb | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index ac66353d38..80f1c4b5ae 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -79,7 +79,7 @@
           </div>
         </li>
 
-        <li class="nav-item dropdown" style="min-width:80px; margin-left:-25px;">
+        <li class="nav-item dropdown about" style="min-width:80px;">
           <div class="nav-link" data-toggle="dropdown" onclick="location.href='#'">
             <!-- <a > -->
             <%= t('layout._header.about.about_title') %>
@@ -94,10 +94,10 @@
           </div>
         </li>
 
-        <li class="nav-item d-sm-none d-lg-inline" style="padding:0 10px; width:90px;">
+        <li class="nav-item d-sm-none d-lg-inline store" style="padding:0 10px;">
           <a class="nav-link btn btn-outline-secondary" target="_blank" href="//store.publiclab.org"><%= t('layout._header.store') %></a>
         </li>
-        <li class="nav-item d-sm-none d-lg-inline" style="padding:0 10px; width:90px;">
+        <li class="nav-item d-sm-none d-lg-inline donate" style="padding:0 10px;">
           <a class="nav-link btn btn-outline-secondary" href="/donate"><%= t('layout._header.donate') %></a>
         </li>
 
@@ -259,6 +259,20 @@
       overflow-y: auto;
       -webkit-overflow-scrolling:touch;
     }
+    .store{
+      margin-bottom:5px;
+    }
+  }
+  @media (min-width:768px){
+    .about{
+      margin-left:-25px;
+    }
+    .store{
+      width:90px;
+    }
+    .donate{
+      width:90px;
+    }
   }
 </style>
 

From 2606e613dd27bf8b296f4e8f3c00c73937dd8446 Mon Sep 17 00:00:00 2001
From: Simran <simransia07@gmail.com>
Date: Sat, 16 Apr 2022 12:27:10 +0000
Subject: [PATCH 3/3] third commit

---
 app/views/layouts/_header.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 80f1c4b5ae..978b3a228e 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -94,10 +94,10 @@
           </div>
         </li>
 
-        <li class="nav-item d-sm-none d-lg-inline store" style="padding:0 10px;">
+        <li class="nav-item d-md-none d-lg-inline store" style="padding:0 10px;">
           <a class="nav-link btn btn-outline-secondary" target="_blank" href="//store.publiclab.org"><%= t('layout._header.store') %></a>
         </li>
-        <li class="nav-item d-sm-none d-lg-inline donate" style="padding:0 10px;">
+        <li class="nav-item d-md-none d-lg-inline donate" style="padding:0 10px;">
           <a class="nav-link btn btn-outline-secondary" href="/donate"><%= t('layout._header.donate') %></a>
         </li>
 
@@ -274,6 +274,7 @@
       width:90px;
     }
   }
+ 
 </style>
 
 <%= render :partial => "map/mapDependencies" %>