sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

changes

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-23 17:19:57 +02:00
parent eccb3233ea
commit 10e784bc56
5 changed files with 123 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/templates/menu_teams.html
View File

@@ -1,12 +1,20 @@
<ul class="cd-accordion-menu animated"> <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 %} {% if teams %}
<li class="has-children" id="teams"> <li class="has-children" id="teams">
<input type="checkbox" name="group-teams" id="group-teams"> <input type="checkbox" name="group-teams" id="group-teams">
<label for="group-teams">Teams</label> <label for="group-teams">Teams</label>
<ul> <ul>
{% for team in teams %} {% 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 %} {% endfor %}
</ul> </ul>
</li> </li>

111
rowers/templates/menu_workout.html
View File

@@ -1,23 +1,70 @@
<h1>Workout</h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li class="has-children" id="workout"> <li class="has-children" id="workout">
<input type="checkbox" name="group-workout" id="group-workout"> <input type="checkbox" name="group-workout" id="group-workout">
<label for="group-workout">Workout</label> <label for="group-workout">Workout</label>
<ul> <ul>
<li id="workout-edit"><a href="">Edit</a></li> <li id="workout-dashboard">
<li id="workout-intervals"><a href="">Intervals</a></li> <a href="">
<li id="workout-stats"><a href="">Statistics</a></li> <i class="fas fa-tachometer-alt fa-fw"></i>&nbsp;View
<li id="workout-delete"><a href="">Delete</a></li> </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> </ul>
</li> </li>
<li class="has-children" id="chart"> <li class="has-children" id="chart">
<input type="checkbox" name="group-chart" id="group-chart"> <input type="checkbox" name="group-chart" id="group-chart">
<label for="group-chart">Charts</label> <label for="group-chart">Charts</label>
<ul> <ul>
<li id="chart-time"><a href="">Time</a></li> <li id="chart-time">
<li id="chart-distance"><a href="">Distance</a></li> <a href="">
<li id="chart-powerpie"><a href="">Power (Pie)</a></li> <i class="fas fa-stopwatch fa-fw"></i>&nbsp;Time
<li id="chart-hrpie"><a href="">Heart Rate (Pie)</a></li> </a>
<li id="chart-otwpower"><a href="">OTW Power</a></li> </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> </ul>
</li> </li>
<li class="has-children" id="export"> <li class="has-children" id="export">
@@ -39,20 +86,50 @@
<input type="checkbox" name="group-data" id="group-data"> <input type="checkbox" name="group-data" id="group-data">
<label for="group-data">Data</label> <label for="group-data">Data</label>
<ul> <ul>
<li id="data-smoothen"><a href="">Smoothen</a></li> <li id="data-smoothen">
<li id="data-raw"><a href="">Restore Raw</a></li> <a href="">
<li id="data-fusion"><a href="">Sensor Fusion</a></li> <i class="fas fa-magic fa-fw"></i>&nbsp;Smoothen
<li id="data-split"><a href="">Split Workout</a></li> </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> </ul>
</li> </li>
<li class="has-children" id="advanced"> <li class="has-children" id="advanced">
<input type="checkbox" name="group-advanced" id="group-advanced"> <input type="checkbox" name="group-advanced" id="group-advanced">
<label for="group-advanced">Advanced</label> <label for="group-advanced">Advanced</label>
<ul> <ul>
<li id="advanced-wind"><a href="">Wind</a></li> <li id="advanced-wind">
<li id="advanced-stream"><a href="">Stream</a></li> <a href="">
<li id="advanced-otwpower"><a href="">OTW Power</a></li> <i class="fas fa-pennant fa-fw"></i>&nbsp;Wind
<li id="advanced-instroke"><a href="">In-Stroke Metrics</a></li> </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> </ul>
</li> </li>
</ul><!-- cd-accordion-menu --> </ul><!-- cd-accordion-menu -->

2
static/css/rowsandall2.css
View File

@@ -53,7 +53,7 @@ body {
color: #333; color: #333;
font-size: 1.2em; font-size: 1.2em;
height: auto; height: auto;
padding-bottom: 20px; /* padding-bottom: 20px; */
} }
.notyellow { .notyellow {

24
static/css/styles2.css
View File

@@ -65,6 +65,14 @@
left: 15px; left: 15px;
} }
aside h1 {
font-weight: bold;
text-align: left;
font-size: 1.4em;
color: #dddddd;
padding: 15px;
}
aside ul label, aside ul label,
aside ul a { aside ul a {
padding-left: 15px; padding-left: 15px;
@@ -150,11 +158,11 @@
position: relative; position: relative;
display: block; display: block;
color: #dddddd; color: #dddddd;
font-size: 1.2em; font-size: 1.0em;
} }
aside i { aside i {
font-size: 1.2em; font-size: 1.0em;
} }
aside a::before { aside a::before {
@@ -170,7 +178,7 @@
aside .cd-accordion-menu label::before aside .cd-accordion-menu label::before
{ {
/* icons */ /* icons */
font: normal normal normal 1.2em/1 FontAwesome; font: normal normal normal 1.0em/1 FontAwesome;
font-size: inherit; font-size: inherit;
text-rendering: auto; text-rendering: auto;
content: '\f0da'; content: '\f0da';
@@ -224,19 +232,22 @@
} }
nav li { nav li {
padding: 0.2em 0.0em 0.2em 0.0em; margin: 0.2em;
} }
nav a { nav a {
color: white; color: white;
transition: all .2s ease-in-out;
} }
nav a i { nav a i {
color: white; color: white;
} }
.main-head { .main-head {
grid-area: header; grid-area: header;
background: #ededed;
} }
.main-user { .main-user {
grid-area: user; grid-area: user;
@@ -305,7 +316,7 @@
nav ul { nav ul {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
header ul { header ul {
@@ -327,13 +338,12 @@
"nav nav nav" "nav nav nav"
"sidebar content content" "sidebar content content"
"sidebar content content" "sidebar content content"
"sidebar footer footer"
"ad footer footer" "ad footer footer"
} }
nav ul { nav ul {
flex-direction: row; flex-direction: row;
/* display: flex;
justify-content: space-between; */
} }
header ul { header ul {

2
static/css/text2.css
View File

@@ -131,6 +131,6 @@ p {
i { i {
font-size: 2em; font-size: 1.5em;
} }