Merge branch 'release-1.0.1'

xmera-circle · May 22, 2024 · 2b9651a · 2b9651a
2 parents 101d5c7 + 53e7e0e
commit 2b9651a
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 14 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+== 1.0.1 - 2024-05-22
+
+=== Added
+
+* top and footer menu items jobs and blog
+
+=== Changed
+
+* background color of navbar-dropdown
+* copyright year to 2024
+
 == 1.0.0 - 2023-06-24
 
 === Changed

diff --git a/build/ui-bundle.zip b/build/ui-bundle.zip
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/_/css/site.css b/public/_/css/site.css
diff --git a/public/_/partials/footer-content.hbs b/public/_/partials/footer-content.hbs
@@ -22,6 +22,8 @@
           <div class="navbar-item"><a href="https://xmera.de/dokumentation/">Dokumentation</a></div>
           <div class="navbar-item"><a href="https://xmera.de/downloads/">Downloads</a></div>
           <div class="navbar-item"><a href="https://xmera.de/ueber-uns/">Über uns</a></div>
+          <div class="navbar-item"><a href="https://xmera.de/jobs/">Jobs</a></div>
+          <div class="navbar-item"><a href="https://xmera.de/blog/">Blog</a></div>
           <div class="navbar-item"><a href="https://xmera.de/kontakt/">Kontakt</a></div>
         </div>
       </nav>
@@ -39,6 +41,6 @@
       </div>
   </div>
   <div class="site-info">
-    <span>© 2021 - 2023 xmera Solutions.</span>
+    <span>© 2021 - 2024 xmera Solutions.</span>
   </div>
 </footer>
diff --git a/public/_/partials/header-content.hbs b/public/_/partials/header-content.hbs
@@ -32,6 +32,8 @@
           <a class="navbar-link main-item" href="#">Unternehmen</a>
           <div class="navbar-dropdown">
             <a class="navbar-item" href="https://xmera.de/ueber-uns/">Über uns</a>
+            <a class="navbar-item" href="https://xmera.de/jobs/">Jobs</a>
+            <a class="navbar-item" href="https://xmera.de/blog/">Blog</a>
             <a class="navbar-item" href="https://xmera.de/kontakt">Kontakt</a>
           </div>
         </div>

diff --git a/src/css/custom.css b/src/css/custom.css
@@ -53,7 +53,7 @@
   -webkit-box-shadow: 0 16px 48px 0 rgba(31, 32, 68, 0.08);
   padding: 20px 24px 16px 20px;
   border: none;
-  background-color: var(--color-xmr-light);
+  background-color: var(--color-white);
   border-radius: var(--border-radius-default);
 }
 
@@ -63,7 +63,7 @@
 }
 
 .navbar-dropdown a.navbar-item:hover {
-  background: var(--color-xmr-light);
+  background: var(--color-white);
   color: var(--color-xmr-accent);
 }
 

diff --git a/src/partials/footer-content.hbs b/src/partials/footer-content.hbs
@@ -22,6 +22,8 @@
           <div class="navbar-item"><a href="https://xmera.de/dokumentation/">Dokumentation</a></div>
           <div class="navbar-item"><a href="https://xmera.de/downloads/">Downloads</a></div>
           <div class="navbar-item"><a href="https://xmera.de/ueber-uns/">Über uns</a></div>
+          <div class="navbar-item"><a href="https://xmera.de/jobs/">Jobs</a></div>
+          <div class="navbar-item"><a href="https://xmera.de/blog/">Blog</a></div>
           <div class="navbar-item"><a href="https://xmera.de/kontakt/">Kontakt</a></div>
         </div>
       </nav>
@@ -39,6 +41,6 @@
       </div>
   </div>
   <div class="site-info">
-    <span>© 2021 - 2023 xmera Solutions.</span>
+    <span>© 2021 - 2024 xmera Solutions.</span>
   </div>
 </footer>
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
@@ -32,6 +32,8 @@
           <a class="navbar-link main-item" href="#">Unternehmen</a>
           <div class="navbar-dropdown">
             <a class="navbar-item" href="https://xmera.de/ueber-uns/">Über uns</a>
+            <a class="navbar-item" href="https://xmera.de/jobs/">Jobs</a>
+            <a class="navbar-item" href="https://xmera.de/blog/">Blog</a>
             <a class="navbar-item" href="https://xmera.de/kontakt">Kontakt</a>
           </div>
         </div>