Merge pull request #133 from betadots/issues-115-and-131

Add logo and incorporate its colors #115 / #131
betadots · Jan 30, 2023 · 5735707 · 5735707
2 parents d4b751c + 1323ff4
commit 5735707
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # HDM - Hiera Data Manager
 
-Copyright 2022 betadots GmbH
+![Hiera Data Manager logo](/app/assets/images/logo_full.png)
+
+Copyright 2023 betadots GmbH
 
 This Rails application displays [Puppet](https://github.com/puppetlabs/puppet) Hiera data and offers a WebGUI to read/update/create that configuration.
 

diff --git a/app/assets/images/logo_full.png b/app/assets/images/logo_full.png
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -1,12 +1,10 @@
 $font-family-sans-serif: "Open Sans", "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 
-$blue: #0c71c3;
-$green: #6BBE6B;
-$cyan: #49bcc3;
-$yellow: #db9500;
-$red: #af0c26;
+$blue: #029a9b;
+$cyan: #4dbcc1;
+$dark: #1f2549;
 
-$navbar-light-brand-color: $red;
+$navbar-light-brand-color: $blue;
 
 $breadcrumb-padding-x: 0;
 $breadcrumb-font-size: .875em;

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -36,7 +36,7 @@
     <footer class="footer bg-light mt-auto py-4">
       <div class="container text-center">
         © <%= Date.today.year %>
-        <a href="https://betadots.de/" class="text-danger">
+        <a href="https://betadots.de/" class="text-dark">
           <%= image_tag "betadots.png", alt: "betadots logo", width: "32", height: "32" %>
           betadots GmbH
         </a>

diff --git a/app/views/page/index.html.erb b/app/views/page/index.html.erb
@@ -1,4 +1,4 @@
-<h1>HDM (Hiera Data Manager)</h1>
+<%= image_tag "logo_full.png", alt: "Hiera Data Manager logo", width: "50%" %>
 <p>HDM is a webfrontend for visualizing and managing Hiera data.</p>
 <% unless current_user %>
   <%= render template: "sessions/new" %>

diff --git a/app/views/shared/_top_navigation.html.erb b/app/views/shared/_top_navigation.html.erb
@@ -1,6 +1,8 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
   <div class="container">
-    <a class="navbar-brand font-weight-bold" href="/">HDM</a>
+    <a class="navbar-brand font-weight-bold" href="/">
+      <%= image_tag "logo_full.png", alt: "HDM", height: "48" %>
+    </a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>