Merge pull request #264 from geoadmin/geocat_new_home_logo

[geocat] change logo to newer version, hide link to new version in login screen
geoadmin · Jun 21, 2024 · d38ed55 · d38ed55
2 parents 17f94b4 + 8c1ef64
commit d38ed55
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/web-ui/src/main/resources/catalog/style/gn_search.less b/web-ui/src/main/resources/catalog/style/gn_search.less
@@ -19,9 +19,10 @@
     margin-right: -60px;
   }
   .gcat-logo {
+    height: 100px;
     display: flex;
     flex-direction: row;
-    justify-content: space-between;
+    justify-content: center;
     padding: 0px 16px;
     & > div {
       flex-shrink: 1;
@@ -31,6 +32,10 @@
         max-width: 100%;
       }
     }
+
+    @media (min-width: @screen-sm-max) {
+      height: 168px;
+    }
   }
 }
 //GEOCAT

diff --git a/web-ui/src/main/resources/catalog/templates/top-toolbar-accessible.html b/web-ui/src/main/resources/catalog/templates/top-toolbar-accessible.html
@@ -203,7 +203,7 @@
           <span class="hidden-sm" translate>documentation</span>
         </a>
       </li>
-      <li class="gn-menuitem-xs" data-ng-show="!authenticated || !user.isEditorOrMore()">
+      <li class="gn-menuitem-xs" data-ng-show="(!authenticated || !user.isEditorOrMore()) && service !== 'catalog.signin' && service !== 'new.account'">
         <a
           href="https://www.geocat.ch/datahub/search/"
           target="_blank"

diff --git a/web-ui/src/main/resources/catalog/views/default/images/cat-logo.png b/web-ui/src/main/resources/catalog/views/default/images/cat-logo.png
diff --git a/web-ui/src/main/resources/catalog/views/default/images/geocat_logo.png b/web-ui/src/main/resources/catalog/views/default/images/geocat_logo.png
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/home.html b/web-ui/src/main/resources/catalog/views/default/templates/home.html
@@ -2,12 +2,7 @@
 <div class="container" style="margin-bottom: 20px">
   <div class="row gcat-header">
     <div class="gcat-logo">
-      <div>
-        <img src="../../images/harvesting/geocat_banner.png" />
-      </div>
-      <div class="hidden-xs">
-        <img src="../../catalog/views/default/images/cat-logo.png" />
-      </div>
+      <img src="../../images/harvesting/geocat_banner.png" />
     </div>
   </div>
 </div>