v2: more spacing stuff. #318

lemon24 · Jan 1, 2025 · b8cfb57 · b8cfb57
1 parent bd41af8
commit b8cfb57
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/src/reader/_app/v2/static/style.css b/src/reader/_app/v2/static/style.css
@@ -8,14 +8,6 @@
   color: var(--bs-navbar-active-color);
 }
 
-.mark-as .btn-sm {
-  --bs-btn-padding-x: 0.125rem;
-  --bs-btn-padding-y: 0.125rem;
-}
-
-.list-inline-item.link {
+.list-inline-item.title {
   font-size: 1.125rem;
 }
-.list-inline-item.link .external {
-  font-size: 0.875rem;
-}
diff --git a/src/reader/_app/v2/templates/v2/entries.html b/src/reader/_app/v2/templates/v2/entries.html
@@ -46,17 +46,19 @@
 
 
 {% for entry in entries %}
-  <ul class="list-inline mb-2">
+<div class="mb-4">
 
-    <h2 class="list-inline-item d-inline link">
+  <ul class="list-inline mb-1">
+
+    <h2 class="list-inline-item d-inline title">
       {# TODO: entry.link or url for entry view #}
       <a class="text-decoration-none" href="{{ url_for('reader.entry', feed=entry.feed.url, entry=entry.id) }}">
         {{ (entry.title or 'untitled') | striptags | truncate(95) }}
       </a>
 
       {% if entry.link %}
       {# TODO: aria stuff #}
-      <a class="text-decoration-none mx-1 external" href="{{ entry.link }}">
+      <a class="text-decoration-none mx-1 small" href="{{ entry.link }}">
         <i class="bi bi-box-arrow-up-right"></i>
       </a>
       {% endif %}
@@ -90,30 +92,34 @@ <h2 class="list-inline-item d-inline link">
 
   </ul>
 
-  <form class="mb-2 mark-as">
+  {% set summary = entry.get_content(prefer_summary=True).value | striptags | trim %}
+  {% if summary %}
+  <p class="small">
+    {{ summary | truncate(223) }}
+  </p>
+  {% endif %}
+
+  <form class="my-2">
     {# TODO: aria stuff #}
 
-    <button type="submit" class="btn btn-outline-secondary btn-sm" style="width: 5rem">
+    <button type="submit" class="btn btn-outline-secondary btn-sm" style="width: 4rem">
       <i class="bi bi-check-lg"></i>
     </button>
 
     <div class="btn-group" role="group" aria-label="importance">
-      <button type="submit" class="btn btn-outline-secondary btn-sm" style="width: 3rem">
+      <button type="submit" class="btn btn-outline-secondary btn-sm" style="width: 2rem">
         <i class="bi bi-star"></i>
       </button>
 
-      <button type="submit" class="btn btn-outline-secondary btn-sm" style="width: 3rem">
+      <button type="submit" class="btn btn-outline-secondary btn-sm" style="width: 2rem">
         <i class="bi bi-arrow-down"></i>
       </button>
 
     </div>
 
   </form>
 
-  <p class="small">
-    {{ entry.get_content(prefer_summary=True).value | striptags | truncate(223) }}
-  </p>
-
+</div>
 
 {% else %}
   <p>no entries found</p>