LOCAL: post-merge minimalist style tweaks

WildMeOrg · Sep 25, 2024 · 498b89d · 498b89d
1 parent e90bcfa
commit 498b89d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/src/main/resources/bundles/en/header.properties b/src/main/resources/bundles/en/header.properties
@@ -1,5 +1,5 @@
 
-siteName = Wildbook
+siteName = 
 manageUsers = Manage My Accounts
 searchPlaceholder = nickname, id, site, encounter nr., etc.
 home = Home

diff --git a/src/main/resources/bundles/es/header.properties b/src/main/resources/bundles/es/header.properties
@@ -1,5 +1,5 @@
 
-siteName = Wildbook
+siteName = African Carnivore Wildbook
 manageUsers = Administrar mis cuentas
 searchPlaceholder = Apodo, id, sitio, encuentro...
 home = Inicio

diff --git a/src/main/resources/bundles/fr/header.properties b/src/main/resources/bundles/fr/header.properties
@@ -1,5 +1,5 @@
 
-siteName = Wildbook
+siteName = 
 manageUsers = G\u00E9rer mes comptes
 searchPlaceholder = surnom, id, site, rencontre, n\u00b0, etc.
 home = Accueil

diff --git a/src/main/webapp/cust/mantamatcher/styles/_wildbook.less b/src/main/webapp/cust/mantamatcher/styles/_wildbook.less
@@ -16,7 +16,9 @@
 }
 
 .maincontent {
+/*
 	padding-top: 30px;
+*/
 }
 
 .flexbox {

diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp
@@ -413,7 +413,7 @@ if(request.getUserPrincipal()!=null){
             <div class="nav-bar-wrapper" style="background-color: transparent">
               <div class="container " style="height: 100%; display: flex; flex-direction: row; align-items: center; justify-content: space-between">
                 <a class="nav-brand" target="_blank" href="<%=urlLoc %>">                
-                  <img src="<%=urlLoc %>/cust/mantamatcher/img/flukebook_logo_white.svg" alt="Logo">                
+                  <img src="<%=urlLoc %>/cust/mantamatcher/img/acw_puppy_logo_stacked_left.svg" alt="Logo" style="height:45px;">                
                 </a>
                 <a class="site-name" target="_blank" href="<%=urlLoc %>">
                     <%= props.getProperty("siteName") != null ? props.getProperty("siteName") : "Wildbook" %>
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,9 @@ @@
     }
     .maincontent {
+    /*
     	padding-top: 30px;
+    */
     }
     .flexbox {
@@ Expand Down @@