From 10e784bc561eee5250a1988af3132c4d81d41b86 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 23 Sep 2018 17:19:57 +0200
Subject: [PATCH] changes

---
 rowers/templates/menu_teams.html   |  12 +++-
 rowers/templates/menu_workout.html | 111 ++++++++++++++++++++++++-----
 static/css/rowsandall2.css         |   2 +-
 static/css/styles2.css             |  24 +++++--
 static/css/text2.css               |   2 +-
 5 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/rowers/templates/menu_teams.html b/rowers/templates/menu_teams.html
index cd3c948e..e03b0f23 100644
--- a/rowers/templates/menu_teams.html
+++ b/rowers/templates/menu_teams.html
@@ -1,12 +1,20 @@
 <ul class="cd-accordion-menu animated">
-  <li id="manage"><a href="">Manage</a></li>
+  <li id="manage">
+    <a href="">
+      <i class="fas fa-cog fa-fw"></i>&nbsp;Manage
+    </a>
+  </li>
   {% if teams %}
   <li class="has-children" id="teams">
     <input type="checkbox" name="group-teams" id="group-teams">
     <label for="group-teams">Teams</label>
     <ul>
       {% for team in teams %}
-      <li id="team-{{ team.id }}"><a href="">{{ team.name }}</a></li>
+      <li id="team-{{ team.id }}">
+        <a href="">
+          <i class="fas fa-user-friends fa-fw"></i>&nbsp;{{ team.name }}
+        </a>
+      </li>
       {% endfor %}
     </ul>
   </li>
diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html
index eb429c92..1f3b8b3f 100644
--- a/rowers/templates/menu_workout.html
+++ b/rowers/templates/menu_workout.html
@@ -1,23 +1,70 @@
+<h1>Workout</h1>
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="workout">
     <input type="checkbox" name="group-workout" id="group-workout">
     <label for="group-workout">Workout</label>
     <ul>
-      <li id="workout-edit"><a href="">Edit</a></li>
-      <li id="workout-intervals"><a href="">Intervals</a></li>
-      <li id="workout-stats"><a href="">Statistics</a></li>
-      <li id="workout-delete"><a href="">Delete</a></li>
+      <li id="workout-dashboard">
+        <a href="">
+          <i class="fas fa-tachometer-alt fa-fw"></i>&nbsp;View
+        </a>
+      </li>
+      <li id="workout-edit">
+        <a href="">
+          <i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Edit
+        </a>
+      </li>
+      <li id="workout-intervals">
+        <a href="">
+          <i class="fas fa-pause fa-fw"></i>&nbsp;Intervals
+        </a>
+      </li>
+      <li id="workout-stats">
+        <a href="">
+          <i class="fal fa-table fa-fw"></i>&nbsp;Statistics
+        </a>
+      </li>
+      <li id="compare">
+        <a href="#0">
+          <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare
+        </a>
+      </li>  
+      <li id="workout-delete">
+        <a href="">
+          <i class="fas fa-trash-alt fa-fw"></i>&nbsp;Delete
+        </a>
+      </li>
     </ul>
   </li>
   <li class="has-children" id="chart">
     <input type="checkbox" name="group-chart" id="group-chart">
     <label for="group-chart">Charts</label>
     <ul>
-      <li id="chart-time"><a href="">Time</a></li>
-      <li id="chart-distance"><a href="">Distance</a></li>
-      <li id="chart-powerpie"><a href="">Power (Pie)</a></li>
-      <li id="chart-hrpie"><a href="">Heart Rate (Pie)</a></li>
-      <li id="chart-otwpower"><a href="">OTW Power</a></li>
+      <li id="chart-time">
+        <a href="">
+          <i class="fas fa-stopwatch fa-fw"></i>&nbsp;Time
+        </a>
+      </li>
+      <li id="chart-distance">
+        <a href="">
+          <i class="fas fa-ruler fa-fw"></i>&nbsp;Distance
+        </a>
+      </li>
+      <li id="chart-powerpie">
+        <a href="">
+          <i class="far fa-chart-pie fa-fw"></i>&nbsp;Power (Pie)
+        </a>
+      </li>
+      <li id="chart-hrpie">
+        <a href="">
+          <i class="fas fa-heartbeat fa-fw"></i>&nbsp;Heart Rate (Pie)
+        </a>
+      </li>
+      <li id="chart-otwpower">
+        <a href="">
+          <i class="fas fa-chart-area fa-fw"></i>&nbsp;OTW Power
+        </a>
+      </li>
     </ul>
   </li>
   <li class="has-children" id="export">
@@ -39,20 +86,50 @@
     <input type="checkbox" name="group-data" id="group-data">
     <label for="group-data">Data</label>
     <ul>
-      <li id="data-smoothen"><a href="">Smoothen</a></li>
-      <li id="data-raw"><a href="">Restore Raw</a></li>
-      <li id="data-fusion"><a href="">Sensor Fusion</a></li>
-      <li id="data-split"><a href="">Split Workout</a></li>
+      <li id="data-smoothen">
+        <a href="">
+          <i class="fas fa-magic fa-fw"></i>&nbsp;Smoothen
+        </a>
+      </li>
+      <li id="data-raw">
+        <a href="">
+          <i class="fas fa-undo fa-fw"></i>&nbsp;Restore Raw
+        </a>
+      </li>
+      <li id="data-fusion">
+        <a href="">
+          <i class="fas fa-blender fa-fw"></i>&nbsp;Sensor Fusion
+        </a>
+      </li>
+      <li id="data-split">
+        <a href="">
+          <i class="fas fa-cut fa-fw"></i>&nbsp;Split Workout
+        </a>
+      </li>
     </ul>
   </li>
   <li class="has-children" id="advanced">
     <input type="checkbox" name="group-advanced" id="group-advanced">
     <label for="group-advanced">Advanced</label>
     <ul>
-      <li id="advanced-wind"><a href="">Wind</a></li>
-      <li id="advanced-stream"><a href="">Stream</a></li>
-      <li id="advanced-otwpower"><a href="">OTW Power</a></li>
-      <li id="advanced-instroke"><a href="">In-Stroke Metrics</a></li>
+      <li id="advanced-wind">
+        <a href="">
+          <i class="fas fa-pennant fa-fw"></i>&nbsp;Wind
+        </a>
+      </li>
+      <li id="advanced-stream">
+        <a href="">
+          <i class="fas fa-stream fa-fw"></i>&nbsp;Stream
+        </a>
+      </li>
+      <li id="advanced-otwpower">
+        <a href="">
+          <i class="fas fa-calculator-alt fa-fw"></i>&nbsp;OTW Power
+        </a>
+      </li>
+      <li id="advanced-instroke">
+        <a href="">
+          <i class="fas fa-search-plus fa-fw"></i>&nbsp;In-Stroke Metrics</a></li>
     </ul>
   </li>
 </ul><!-- cd-accordion-menu -->
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index 719d573f..1d72ba77 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -53,7 +53,7 @@ body {
   color: #333;
   font-size: 1.2em;
   height: auto;
-  padding-bottom: 20px;
+/*  padding-bottom: 20px; */
 }
 
 .notyellow {
diff --git a/static/css/styles2.css b/static/css/styles2.css
index 6cee6ed5..00c2282b 100644
--- a/static/css/styles2.css
+++ b/static/css/styles2.css
@@ -65,6 +65,14 @@
         left: 15px;
     }
 
+    aside h1 {
+        font-weight: bold;
+        text-align: left;
+        font-size: 1.4em;
+        color: #dddddd;
+        padding: 15px;
+    }
+
     aside ul label,
     aside ul a {
         padding-left: 15px;
@@ -150,11 +158,11 @@
         position: relative;
         display: block;
         color: #dddddd;
-        font-size: 1.2em; 
+        font-size: 1.0em; 
     }
 
     aside i {
-        font-size: 1.2em;
+        font-size: 1.0em;
     }
 
     aside a::before {
@@ -170,7 +178,7 @@
     aside .cd-accordion-menu label::before
     {
         /* icons */
-        font:  normal normal normal 1.2em/1 FontAwesome;
+        font:  normal normal normal 1.0em/1 FontAwesome;
         font-size: inherit;
         text-rendering: auto;
         content: '\f0da';
@@ -224,19 +232,22 @@
     }
 
     nav li {
-        padding: 0.2em 0.0em 0.2em 0.0em;
+        margin: 0.2em;
     }
 
     nav a {
         color: white;
+        transition: all .2s ease-in-out;
     }
     
     nav a i {
         color: white;
     }
+    
 
 .main-head {
     grid-area: header;
+    background: #ededed;
 }
 .main-user {
     grid-area: user;
@@ -305,7 +316,7 @@
 
   nav ul {
       display: flex;
-      justify-content: space-between;
+      justify-content: space-between;  
   }
 
   header ul {
@@ -327,13 +338,12 @@
         "nav nav  nav"
       "sidebar     content content"
       "sidebar     content content"
+      "sidebar  footer footer"
       "ad  footer footer"
    }
 
   nav ul {
       flex-direction: row;
-/*      display: flex;
-      justify-content: space-between; */
   }
 
    header ul {
diff --git a/static/css/text2.css b/static/css/text2.css
index a0cc72e8..9380c7ba 100644
--- a/static/css/text2.css
+++ b/static/css/text2.css
@@ -131,6 +131,6 @@ p {
 
 
 i {
-    font-size: 2em;
+    font-size: 1.5em;
 }