From 4e090781fd67706689c13ef15b266c902e8b2eaa Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 18 Sep 2018 19:14:43 +0200
Subject: [PATCH] first cut at nav bar

---
 rowers/templates/.#list_workouts.html |  1 -
 rowers/templates/redesign.html        |  6 +----
 static/css/rowsandall2.css            | 32 ++++++++++++++++++++++++++-
 static/css/styles2.css                |  2 +-
 static/css/text2.css                  |  6 +++++
 templates/newbase.html                | 29 +++++++++++++-----------
 6 files changed, 55 insertions(+), 21 deletions(-)
 delete mode 100644 rowers/templates/.#list_workouts.html

diff --git a/rowers/templates/.#list_workouts.html b/rowers/templates/.#list_workouts.html
deleted file mode 100644
index 00ba3850..00000000
--- a/rowers/templates/.#list_workouts.html
+++ /dev/null
@@ -1 +0,0 @@
-E408191@CZ27LT9RCGN72.11332:1537209963
\ No newline at end of file
diff --git a/rowers/templates/redesign.html b/rowers/templates/redesign.html
index 26944ae8..4898c27e 100644
--- a/rowers/templates/redesign.html
+++ b/rowers/templates/redesign.html
@@ -8,9 +8,5 @@
 {% endblock %}
 
 {% block sidebar %}
-<ul>
-  <li><a href="">Link 1</a></li>
-  <li><a href="">Link 2</a></li>
-  <li><a href="">Link 3</a></li>
-</ul>
+Context Related Links
 {% endblock %}
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index 60036977..49634e36 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -401,6 +401,30 @@ a.button {
 	color: #ffffff;
 }
 
+.rbluetext {
+    color: #27aae1;
+}
+
+.rdarkbluetext {
+    color: #1c75bc;
+}
+
+.rblue {
+    color: #fae7e9;
+    border: solid 1px #27aae1;
+    background: #27aae1;
+}
+
+.rblue:active {
+    color: #ffffff;
+}
+
+.rblue:hover {
+    background: #1c75bc;
+    border: solid 1px #27aae1;
+}
+
+
 /* rosy */
 .rosy {
 	color: #fae7e9;
@@ -845,6 +869,12 @@ a.wh:hover {
 
 }
 
-.icon-link a:hover, a:visited, a:link, a:active {
+.icon-link a {
+    text-decoration: none;
+    color: #27aae1;
+}
+
+.icon-link a:hover, a:active, a:visited, a:link {
+    color: #1c75bc;
     text-decoration: none;
 }
diff --git a/static/css/styles2.css b/static/css/styles2.css
index b40f6c95..5ce8298c 100644
--- a/static/css/styles2.css
+++ b/static/css/styles2.css
@@ -1,7 +1,7 @@
 * {box-sizing: border-box;}
 
     .wrapper {
-        max-width: 1024px;
+        max-width: 1400px;
         margin: 0 auto;
         font: 1.2em Helvetica, arial, sans-serif;
     }
diff --git a/static/css/text2.css b/static/css/text2.css
index f0cda6b7..c8331066 100644
--- a/static/css/text2.css
+++ b/static/css/text2.css
@@ -149,5 +149,11 @@ p {
 }
 
 i {
+    text-decoration: none;
     font-size: 2em;
+    color: #27aae1;
+}
+
+i:hover {
+    color: #1c75bc;
 }
diff --git a/templates/newbase.html b/templates/newbase.html
index 83533660..8beeca71 100644
--- a/templates/newbase.html
+++ b/templates/newbase.html
@@ -112,29 +112,31 @@
       <user class="main-user">
         <ul>
           <li>
-            <a  href="/rowers/help" title="Help">
-              <i class="bluetext fas fa-question">&nbsp;</i>
+            <a href="/rowers/help" title="Help">
+              <i class="fas fa-question"></i>
             </a>
 	    {% if user.is_authenticated %}
             <a class="icon-link" href="/rowers/me/edit" title="Account">
-              <i class="bluetext fas fa-user">&nbsp;</i>
+              <i class="fas fa-user"></i>
+            </a>
+            <a href="{% url 'logout' %}?next=/login" title="Log Out">
+              <i class="fas fa-sign-out-alt"></i>
             </a>
-            <a class="icon-link" href="{% url 'logout' %}?next=/login" title="Log Out">
-              <i class="bluetext fas fa-sign-out-alt">&nbsp;</i></a>
 	    {% else %}
-	    <a class="icon-link" href="{% url 'login' %}" title="Log In">
-              <i class="bluetext fas fa-sign-in-alt"></i></a>
+	    <a href="{% url 'login' %}" title="Log In">
+              <i class="fas fa-sign-in-alt"></i>
+            </a>
 	    {% endif %}
           </li>
         </ul>
       </user>
       <nav class="main-nav">
         <ul>
-          <li><a href="">Nav 1</a></li>
-          <li><a href="">Nav 2</a></li>
-          <li><a href="">Nav 3</a></li>
-          <li><a href="">Nav 4</a></li>
-          <li><a href="">Nav 5</a></li>
+          <li><p><a href=""><i class="fas fa-file-upload"></i>&nbsp;Upload</a></p></li>
+          <li><p><a href=""><i class="fas fa-clipboard-list"></i>&nbsp;Workouts</a></p></li>
+          <li><p><a href=""><i class="fas fa-calendar-alt"></i>&nbsp;Plan</a></p></li>
+          <li><p><a href=""><i class="fas fa-flag-checkered"></i>&nbsp;Racing</a></p></li>
+          <li><p><a href=""><i class="fas fa-bullhorn"></i>&nbsp;Team</a></p></li>
         </ul>
    </nav>
    <main class="content">
@@ -144,7 +146,8 @@
    <aside class="side">
      {% block sidebar %}
      Related links
-   {% endblock %}</aside>
+     {% endblock %}
+   </aside>
    <div class="ad">
      {% block ad %}
      Advertising