From 1734910d10735dad804e2458bcaa896fd1cc2dd3 Mon Sep 17 00:00:00 2001
From: cryptogopher <git6453hub@michalczyk.pro>
Date: Sat, 2 May 2020 14:50:42 +0200
Subject: [PATCH] Styling changes

---
 app/views/meals/_index.html.erb      | 15 ++++++---------
 app/views/meals/_show.html.erb       |  4 ++--
 assets/stylesheets/body_tracking.css |  3 +--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/views/meals/_index.html.erb b/app/views/meals/_index.html.erb
index 2a68ccb..c240ae6 100644
--- a/app/views/meals/_index.html.erb
+++ b/app/views/meals/_index.html.erb
@@ -10,7 +10,8 @@
       <% total_width = 4 + @quantities.length %>
       <% @meals_by_date.reverse_each do |date, meals| %>
         <tr id="date-<%= date.strftime('%Y%m%d') %>" class="date">
-          <td colspan="2" rowspan="2" style="width:<%= 3 * 100/total_width %>%"></td>
+          <td colspan="2" rowspan="2"
+              style="width:<%= 3 * 100/total_width %>%; border: none;"></td>
           <td class="quantityhead" style="width:<%= 100/total_width %>%;">
             <%= l(:field_amount) %>
           </td>
@@ -20,7 +21,7 @@
               <%= q.name %>
             </td>
           <% end %>
-          <td style="width:<%= 100/total_width %>%"></td>
+          <td rowspan="2" style="width:<%= 100/total_width %>%; border: none;"></td>
         </tr>
 
         <tr>
@@ -31,8 +32,8 @@
           <% end %>
         </tr>
 
-        <tr style="border: solid 2px #d9ead3;">
-          <td class="date" colspan="2" style="background-color: #d9ead3;">
+        <tr style="background-color: #fff2cc;">
+          <td class="date" colspan="2">
             <h3 style="margin: 0;">
               <%= date == Date.current ? 'Today' : date.strftime('%F') %>
             </h3>
@@ -47,12 +48,8 @@
         </tr>
 
         <% meals.each_with_index do |m, index| %>
-          <%= render partial: 'meals/show', locals: {
-            m: m, index: index,
-            color: cycle('#d0e0e3', '#c9daf8', '#cfe2f3', '#d9d2e9', '#ead1dc')
-          } %>
+          <%= render partial: 'meals/show', locals: {m: m, index: index, color: '#d0e0e3'} %>
         <% end %>
-        <% reset_cycle %>
       <% end %>
     </tbody>
   </table>
diff --git a/app/views/meals/_show.html.erb b/app/views/meals/_show.html.erb
index db53ce4..67224a9 100644
--- a/app/views/meals/_show.html.erb
+++ b/app/views/meals/_show.html.erb
@@ -1,6 +1,6 @@
 <tr id="meal-<%= m.id %>" class="primary meal project idnt idnt-1"
-    style="border: solid 2px <%= color %>;">
-  <td class="name unwrappable" style="background-color: <%= color %>;">
+    style="background-color: <%= color %>;">
+  <td class="name unwrappable">
     <b><%= "#{t '.label_meal'} ##{index+1}" %></b>
     <% if m.eaten_at %>
       <%= " at #{m.eaten_at.strftime('%R')}" %>
diff --git a/assets/stylesheets/body_tracking.css b/assets/stylesheets/body_tracking.css
index e28fc5f..6857d4b 100644
--- a/assets/stylesheets/body_tracking.css
+++ b/assets/stylesheets/body_tracking.css
@@ -11,6 +11,7 @@ table.list .quantityhead {
   vertical-align: bottom;
   position: relative;
   padding: 2px 0;
+  border: none;
 }
 
 table.list .action,
@@ -31,8 +32,6 @@ table.list td.form {
   text-align: left;
 }
 
-table#meals, table#meals td {border: none;}
-
 fieldset#filters table.filter td {padding-left: 8px;}
 
 a.icon:not(.icon-move) {margin-left: 0.3em;}