From 1f4fa74fb1ea973487c3ca2fd8a4b256c6766674 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 21 Sep 2018 22:22:17 +0200
Subject: [PATCH] margins

---
 rowers/templates/menu_demo.html     | 77 ++++++++++++++++++++++++++++
 rowers/templates/menu_workouts.html | 19 +++++++
 rowers/templates/redesign.html      | 79 +----------------------------
 static/css/styles2.css              | 21 +++++++-
 4 files changed, 116 insertions(+), 80 deletions(-)
 create mode 100644 rowers/templates/menu_demo.html
 create mode 100644 rowers/templates/menu_workouts.html

diff --git a/rowers/templates/menu_demo.html b/rowers/templates/menu_demo.html
new file mode 100644
index 00000000..e742af16
--- /dev/null
+++ b/rowers/templates/menu_demo.html
@@ -0,0 +1,77 @@
+<ul class="cd-accordion-menu animated">
+  <li><a href="#0">Link</a></li>
+  <li class="has-children">
+    <input type="checkbox" name ="group-1" id="group-1" checked>
+    <label for="group-1">Group 1</label>
+    
+    <ul>
+      <li class="has-children">
+      	<input type="checkbox" name ="sub-group-1" id="sub-group-1">
+	<label for="sub-group-1">Sub Group 1</label>
+
+	<ul>
+	  <li><a href="#0">Link</a></li>
+	  <li><a href="#0">Link</a></li>
+	</ul>
+      </li>
+      <li class="has-children">
+      	<input type="checkbox" name ="sub-group-2" id="sub-group-2">
+	<label for="sub-group-2">Sub Group 2</label>
+        
+	<ul>
+	  <li class="has-children">
+	    <input type="checkbox" name ="sub-group-level-3" id="sub-group-level-3">
+	    <label for="sub-group-level-3">Sub Group Level 3</label>
+            
+	    <ul>
+	      <li><a href="#0">Link</a></li>
+	      <li><a href="#0">Link</a></li>
+	    </ul>
+	  </li>
+	  <li><a href="#0">Link</a></li>
+	</ul>
+      </li>
+      <li><a href="#0">Link</a></li>
+      <li><a href="#0">Link</a></li>
+    </ul>
+  </li>
+  
+  <li class="has-children">
+    <input type="checkbox" name ="group-2" id="group-2">
+    <label for="group-2">Group 2</label>
+    
+    <ul>
+      <li><a href="#0">Link</a></li>
+      <li><a href="#0">Link</a></li>
+    </ul>
+  </li>
+  
+  <li class="has-children">
+    <input type="checkbox" name ="group-3" id="group-3">
+    <label for="group-3">Group 3</label>
+    
+    <ul>
+      <li><a href="#0">Link</a></li>
+      <li><a href="#0">Link</a></li>
+    </ul>
+  </li>
+  
+  <li class="has-children">
+    <input type="checkbox" name ="group-4" id="group-4">
+    <label for="group-4">Group 4</label>
+    
+    <ul>
+      <li class="has-children">
+	<input type="checkbox" name ="sub-group-3" id="sub-group-3">
+	<label for="sub-group-3">Sub Group 3</label>
+        
+	<ul>
+	  <li><a href="#0">Link</a></li>
+	  <li><a href="#0">Link</a></li>
+	</ul>
+      </li>
+      <li><a href="#0">Link</a></li>
+      <li><a href="#0">Link</a></li>
+    </ul>
+  </li>
+</ul> <!-- cd-accordion-menu -->
diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html
new file mode 100644
index 00000000..c414ff5a
--- /dev/null
+++ b/rowers/templates/menu_workouts.html
@@ -0,0 +1,19 @@
+<ul class="cd-accordion-menu animated">
+  <li><a href="#0"><i class="fas fa-clipboard-list fa-fw"></i>&nbsp;Workouts List</a></li>
+  <li><a href="#0"><i class="fas fa-chart-pie fa-fw"></i>&nbsp;Charts</a></li>
+  <li><a href="#0"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a></li>  
+  <li><a href="#0"><i class="fas fa-file-upload fa-fw"></i>&nbsp;Upload</a></li>
+  <li class="has-children">
+    <input type="checkbox" name ="group-1" id="group-1">
+    <label for="group-1"><i class="fas fa-cloud-download fa-fw"></i>&nbsp;Import</label>
+    
+    <ul>
+      <li><a href="#0">Concept2</a></li>
+      <li><a href="#0">Strava</a></li>
+      <li><a href="#0">RunKeeper</a></li>
+      <li><a href="#0">SportTracks</a></li>
+      <li><a href="#0">MapMyFitness</a></li>
+      <li><a href="#0">Polar</a></li>
+    </ul>
+  </li>
+</ul> <!-- cd-accordion-menu -->
diff --git a/rowers/templates/redesign.html b/rowers/templates/redesign.html
index 48e496e5..79779d35 100644
--- a/rowers/templates/redesign.html
+++ b/rowers/templates/redesign.html
@@ -11,82 +11,5 @@
 {% endblock %}
 
 {% block sidebar %}
-<ul class="cd-accordion-menu animated">
-  <li><a href="#0">Link</a></li>
-  <li class="has-children">
-    <input type="checkbox" name ="group-1" id="group-1" checked>
-    <label for="group-1">Group 1</label>
-    
-    <ul>
-      <li class="has-children">
-      	<input type="checkbox" name ="sub-group-1" id="sub-group-1">
-	<label for="sub-group-1">Sub Group 1</label>
-
-	<ul>
-	  <li><a href="#0">Link</a></li>
-	  <li><a href="#0">Link</a></li>
-	</ul>
-      </li>
-      <li class="has-children">
-      	<input type="checkbox" name ="sub-group-2" id="sub-group-2">
-	<label for="sub-group-2">Sub Group 2</label>
-        
-	<ul>
-	  <li class="has-children">
-	    <input type="checkbox" name ="sub-group-level-3" id="sub-group-level-3">
-	    <label for="sub-group-level-3">Sub Group Level 3</label>
-            
-	    <ul>
-	      <li><a href="#0">Link</a></li>
-	      <li><a href="#0">Link</a></li>
-	    </ul>
-	  </li>
-	  <li><a href="#0">Link</a></li>
-	</ul>
-      </li>
-      <li><a href="#0">Link</a></li>
-      <li><a href="#0">Link</a></li>
-    </ul>
-  </li>
-  
-  <li class="has-children">
-    <input type="checkbox" name ="group-2" id="group-2">
-    <label for="group-2">Group 2</label>
-    
-    <ul>
-      <li><a href="#0">Link</a></li>
-      <li><a href="#0">Link</a></li>
-    </ul>
-  </li>
-  
-  <li class="has-children">
-    <input type="checkbox" name ="group-3" id="group-3">
-    <label for="group-3">Group 3</label>
-    
-    <ul>
-      <li><a href="#0">Link</a></li>
-      <li><a href="#0">Link</a></li>
-    </ul>
-  </li>
-  
-  <li class="has-children">
-    <input type="checkbox" name ="group-4" id="group-4">
-    <label for="group-4">Group 4</label>
-    
-    <ul>
-      <li class="has-children">
-	<input type="checkbox" name ="sub-group-3" id="sub-group-3">
-	<label for="sub-group-3">Sub Group 3</label>
-        
-	<ul>
-	  <li><a href="#0">Link</a></li>
-	  <li><a href="#0">Link</a></li>
-	</ul>
-      </li>
-      <li><a href="#0">Link</a></li>
-      <li><a href="#0">Link</a></li>
-    </ul>
-  </li>
-</ul> <!-- cd-accordion-menu -->
-
+{% include 'menu_workouts.html' %}
 {% endblock %}
diff --git a/static/css/styles2.css b/static/css/styles2.css
index 74acb81a..b60a3658 100644
--- a/static/css/styles2.css
+++ b/static/css/styles2.css
@@ -34,6 +34,8 @@
 
     aside ul {
         margin-bottom: 0;
+        margin-top: 15px;
+        margin-bottom: 15px;
         left: 15px;
     }
 
@@ -87,6 +89,7 @@
     aside a {
         color: #a0f6aa;
         text-decoration: none;
+        padding: 0.2em 0em 0.2em 0em;
     }
 
 
@@ -120,10 +123,24 @@
     aside .cd-accordion-menu a {
         position: relative;
         display: block;
-        color: #ffffff;
+        color: #dddddd;
         font-size: 1.2em; 
     }
 
+    aside i {
+        font-size: 1.2em;
+    }
+
+    aside a::before {
+        content: '\00a0';
+        width: 16px;
+        height: 16px;
+        display: inline-block;
+        font-size: inherit;
+        text-rendering: auto;
+    }
+                 
+
     aside .cd-accordion-menu label::before
     {
         /* icons */
@@ -222,7 +239,7 @@
 
 .wrapper {
   display: grid;
-  grid-gap: 2px;
+/*  grid-gap: 2px; */
   grid-template-areas: 
   "header"
    "user"