Do not use the rounded box layout

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

Hide file tree

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

diff --git a/src/views/frequency.rs b/src/views/frequency.rs
@@ -33,7 +33,11 @@ async fn show_page(
     Query(params): Query<FormParams>,
 ) -> Result<impl IntoResponse> {
     let freq_def = if let Some(query) = params.query {
-        default_frequency_definition(&query, &state, &session).await
+        if query.is_empty() {
+            Ok(Vec::default())
+        } else {
+            default_frequency_definition(&query, &state, &session).await
+        }
     } else {
         Ok(Vec::default())
     };

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
@@ -8,16 +8,18 @@ expression: body
     <link rel="shortcut icon" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/icons/favicon.ico">
     <link rel="stylesheet" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/fonts.css" />
     <link rel="stylesheet" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/annis.min.css" />
-    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/htmx-1.9.4.min.js"></script>
-    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/hyperscript-0.9.11.min.js"></script>
+    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/htmx-1.9.11.min.js"></script>
+    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/hyperscript-0.9.12.min.js"></script>
     <title>ANNIS experiments:
 
   Login
 
     </title>
   </head>
   <body>
-    <nav class="navbar" role="navigation" aria-label="main navigation">
+    <nav class="navbar is-light"
+         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"
@@ -45,6 +47,7 @@ expression: body
              href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;corpora">Corpora  <span class="ml-1 tag is-small is-warning"
         title=''>0</span></a>
           <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;export">Export</a>
+          <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;frequency">Frequency</a>
           <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;about">About</a>
         </div>
         <div class="navbar-end">
@@ -63,14 +66,14 @@ expression: body
         </div>
       </div>
     </nav>
-    <div class="box">
+    <section class="section">
 
 
 
       <div class="notification is-info">Logged in as user "testuser"</div>
 
 
 
-    </div>
+    </section>
   </body>
 </html>
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
@@ -8,16 +8,18 @@ expression: body
     <link rel="shortcut icon" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/icons/favicon.ico">
     <link rel="stylesheet" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/fonts.css" />
     <link rel="stylesheet" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/annis.min.css" />
-    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/htmx-1.9.4.min.js"></script>
-    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/hyperscript-0.9.11.min.js"></script>
+    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/htmx-1.9.11.min.js"></script>
+    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/hyperscript-0.9.12.min.js"></script>
     <title>ANNIS experiments:
 
   Login
 
     </title>
   </head>
   <body>
-    <nav class="navbar" role="navigation" aria-label="main navigation">
+    <nav class="navbar is-light"
+         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"
@@ -45,6 +47,7 @@ expression: body
              href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;corpora">Corpora  <span class="ml-1 tag is-small is-warning"
         title=''>0</span></a>
           <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;export">Export</a>
+          <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;frequency">Frequency</a>
           <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;about">About</a>
         </div>
         <div class="navbar-end">
@@ -62,14 +65,14 @@ expression: body
         </div>
       </div>
     </nav>
-    <div class="box">
+    <section class="section">
 
 
 
       <div class="notification is-error">Empty authorization request.</div>
 
 
 
-    </div>
+    </section>
   </body>
 </html>
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
@@ -8,16 +8,18 @@ expression: body
     <link rel="shortcut icon" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/icons/favicon.ico">
     <link rel="stylesheet" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/fonts.css" />
     <link rel="stylesheet" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/annis.min.css" />
-    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/htmx-1.9.4.min.js"></script>
-    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/hyperscript-0.9.11.min.js"></script>
+    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/htmx-1.9.11.min.js"></script>
+    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/hyperscript-0.9.12.min.js"></script>
     <title>ANNIS experiments:
 
   Login
 
     </title>
   </head>
   <body>
-    <nav class="navbar" role="navigation" aria-label="main navigation">
+    <nav class="navbar is-light"
+         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"
@@ -45,6 +47,7 @@ expression: body
              href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;corpora">Corpora  <span class="ml-1 tag is-small is-warning"
         title=''>0</span></a>
           <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;export">Export</a>
+          <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;frequency">Frequency</a>
           <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;about">About</a>
         </div>
         <div class="navbar-end">
@@ -62,14 +65,14 @@ expression: body
         </div>
       </div>
     </nav>
-    <div class="box">
+    <section class="section">
 
 
 
       <div class="notification is-info">Logged out</div>
 
 
 
-    </div>
+    </section>
   </body>
 </html>
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
@@ -8,16 +8,18 @@ expression: body
     <link rel="shortcut icon" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/icons/favicon.ico">
     <link rel="stylesheet" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/fonts.css" />
     <link rel="stylesheet" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/annis.min.css" />
-    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/htmx-1.9.4.min.js"></script>
-    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/hyperscript-0.9.11.min.js"></script>
+    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/htmx-1.9.11.min.js"></script>
+    <script src="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;static/hyperscript-0.9.12.min.js"></script>
     <title>ANNIS experiments:
 
   Login
 
     </title>
   </head>
   <body>
-    <nav class="navbar" role="navigation" aria-label="main navigation">
+    <nav class="navbar is-light"
+         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"
@@ -45,6 +47,7 @@ expression: body
              href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;corpora">Corpora  <span class="ml-1 tag is-small is-warning"
         title=''>0</span></a>
           <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;export">Export</a>
+          <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;frequency">Frequency</a>
           <a class="navbar-item" href="http:&#x2f;&#x2f;127.0.0.1:3000&#x2f;about">About</a>
         </div>
         <div class="navbar-end">
@@ -62,14 +65,14 @@ expression: body
         </div>
       </div>
     </nav>
-    <div class="box">
+    <section class="section">
 
 
 
       <div class="notification is-error">this is an error</div>
 
 
 
-    </div>
+    </section>
   </body>
 </html>
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/static/icons/Infinity-1s-28px.apng b/static/icons/Infinity-1s-28px.apng
diff --git a/static/icons/progress-clock.png b/static/icons/progress-clock.png
diff --git a/templates/base.html b/templates/base.html
@@ -12,7 +12,9 @@
     </title>
   </head>
   <body>
-    <nav class="navbar" role="navigation" aria-label="main navigation">
+    <nav class="navbar is-light"
+         role="navigation"
+         aria-label="main navigation">
       <div class="navbar-brand">
         <img src="{{ url_prefix }}static/icons/annis_192.png"
              width="52px"
@@ -65,9 +67,9 @@
         </div>
       </div>
     </nav>
-    <div class="box">
+    <section class="section">
       {% block content %}
       {% endblock content %}
-    </div>
+    </section>
   </body>
 </html>