Use ANNIS color for navigation bar

korpling · Mar 28, 2024 · cf55e51 · cf55e51
1 parent 85ef340
commit cf55e51
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 23 deletions.
diff --git a/bulma-annis/sass/annis.scss b/bulma-annis/sass/annis.scss
@@ -4,6 +4,7 @@ $annis-color: #ecf0f6;
 
 @use "../bulma/sass" with ($family-primary: '"Alegreya Sans", sans-serif',
     $family-monospace: "Roboto Mono",
+    $navbar-background-color: $annis-color,
     // https://colordesigner.io/color-scheme-builder#ECF0F6-FFE11A-e53935-0D6986-07485B
     $link: #45a0a3,
     $primary: #07485B,

diff --git a/src/views/oauth/snapshots/annis_web__views__oauth__tests__callback_sets_login_info.snap b/src/views/oauth/snapshots/annis_web__views__oauth__tests__callback_sets_login_info.snap
@@ -17,9 +17,7 @@ expression: body
     </title>
   </head>
   <body>
-    <nav class="navbar is-light"
-         role="navigation"
-         aria-label="main navigation">
+    <nav class="navbar" role="navigation" aria-label="main navigation">
       <div class="navbar-brand">
         <img src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/icons/annis_192.png"
              width="52px"
@@ -57,7 +55,7 @@ expression: body
 
                   <span class="navbar-item">Logged in as "testuser"</span>
                   <div class="buttons">
-                    <a class="button is-light"  href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;oauth/logout"">Log Out</a>
+                    <a class="button"  href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;oauth/logout"">Log Out</a>
                   </div>
                 
               

diff --git a/src/views/oauth/snapshots/annis_web__views__oauth__tests__callback_without_params.snap b/src/views/oauth/snapshots/annis_web__views__oauth__tests__callback_without_params.snap
@@ -17,9 +17,7 @@ expression: body
     </title>
   </head>
   <body>
-    <nav class="navbar is-light"
-         role="navigation"
-         aria-label="main navigation">
+    <nav class="navbar" role="navigation" aria-label="main navigation">
       <div class="navbar-brand">
         <img src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/icons/annis_192.png"
              width="52px"
@@ -56,7 +54,7 @@ expression: body
 
 
                   <div class="buttons">
-                    <a class="button is-light"  href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;oauth/login"">Log in</a>
+                    <a class="button"  href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;oauth/login"">Log in</a>
                   </div>
                 
               

diff --git a/src/views/oauth/snapshots/annis_web__views__oauth__tests__logout_removes_login_info.snap b/src/views/oauth/snapshots/annis_web__views__oauth__tests__logout_removes_login_info.snap
@@ -17,9 +17,7 @@ expression: body
     </title>
   </head>
   <body>
-    <nav class="navbar is-light"
-         role="navigation"
-         aria-label="main navigation">
+    <nav class="navbar" role="navigation" aria-label="main navigation">
       <div class="navbar-brand">
         <img src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/icons/annis_192.png"
              width="52px"
@@ -56,7 +54,7 @@ expression: body
 
 
                   <div class="buttons">
-                    <a class="button is-light"  href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;oauth/login"">Log in</a>
+                    <a class="button"  href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;oauth/login"">Log in</a>
                   </div>
                 
               

diff --git a/src/views/oauth/snapshots/annis_web__views__oauth__tests__show_callback_error.snap b/src/views/oauth/snapshots/annis_web__views__oauth__tests__show_callback_error.snap
@@ -17,9 +17,7 @@ expression: body
     </title>
   </head>
   <body>
-    <nav class="navbar is-light"
-         role="navigation"
-         aria-label="main navigation">
+    <nav class="navbar" role="navigation" aria-label="main navigation">
       <div class="navbar-brand">
         <img src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/icons/annis_192.png"
              width="52px"
@@ -56,7 +54,7 @@ expression: body
 
 
                   <div class="buttons">
-                    <a class="button is-light"  href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;oauth/login"">Log in</a>
+                    <a class="button"  href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;oauth/login"">Log in</a>
                   </div>
                 
               

diff --git a/static/annis.min.css b/static/annis.min.css
diff --git a/static/annis.min.css.map b/static/annis.min.css.map
diff --git a/templates/base.html b/templates/base.html
@@ -12,9 +12,7 @@
     </title>
   </head>
   <body>
-    <nav class="navbar is-light"
-         role="navigation"
-         aria-label="main navigation">
+    <nav class="navbar" role="navigation" aria-label="main navigation">
       <div class="navbar-brand">
         <img src="{{ url_prefix }}static/icons/annis_192.png"
              width="52px"
@@ -54,11 +52,11 @@
                 {% if current_username is defined %}
                   <span class="navbar-item">Logged in as "{{ current_username }}"</span>
                   <div class="buttons">
-                    <a class="button is-light"  href="{{ url_prefix }}oauth/logout"">Log Out</a>
+                    <a class="button"  href="{{ url_prefix }}oauth/logout"">Log Out</a>
                   </div>
                 {% else %}
                   <div class="buttons">
-                    <a class="button is-light"  href="{{ url_prefix }}oauth/login"">Log in</a>
+                    <a class="button"  href="{{ url_prefix }}oauth/login"">Log in</a>
                   </div>
                 {% endif %}
               {% endwith %}