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

Merge branch 'feature/redesign' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-27 17:38:17 +02:00
parent f998031776 c6c0b98a5e
commit 7abf144e17
18 changed files with 98 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/templates/menu_analytics.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Analysis</h1>
<ul class="cd-accordion-menu animated">
<li class="has-children" id="fitness">
<input type="checkbox" name="group-fitness" id="group-fitness">
rowers/templates/menu_demo.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Demo</h1>
<ul class="cd-accordion-menu animated">
<li><a href="#0">Link</a></li>
<li class="has-children">
rowers/templates/menu_help.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Help</h1>
<ul class="cd-accordion-menu animated">
<li id="gettingstarted">
<a href="">
rowers/templates/menu_plan.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Plan</h1>
<ul class="cd-accordion-menu animated">
<li class="has-children" id="sessions">
<input type="checkbox" name="group-sessions" id="group-sessions">
rowers/templates/menu_profile.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Profile</h1>
<ul class="cd-accordion-menu animated">
<li id="manage-account">
<a href="">
rowers/templates/menu_racing.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Racing</h1>
<ul class="cd-accordion-menu animated">
<li id="races-list">
<a href="#0">
rowers/templates/menu_teams.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Teams</h1>
<ul class="cd-accordion-menu animated">
<li id="manage">
<a href="">
rowers/templates/menu_workout.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Workout</h1>
<ul class="cd-accordion-menu animated">
<li class="has-children" id="workout">
<input type="checkbox" name="group-workout" id="group-workout">
rowers/templates/menu_workouts.html
+1
View File
@@ -1,3 +1,4 @@
<h1>Workouts</h1>
<ul class="cd-accordion-menu animated">
<li id="workouts-list">
<a href="#0"><i class="fas fa-clipboard-list fa-fw"></i>&nbsp;Workouts List</a>
rowers/templates/redesign_analysis.html
+23 -7
View File
@@ -4,14 +4,30 @@
{% block main %}
<h1>Main</h1>
<p>Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh <a href="">fermentum</a> in.
</p>
<p>Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sideheader %}
<h1>Analysis</h1>
<ul class="main-content">
<li class="grid_4"><img src="http://placehold.it/1200x1000" alt="placeholder"></li>
<li class="grid_2"><img src="http://placehold.it/350x200" alt="placeholder"></li>
<li class="grid_2"><img src="http://placehold.it/350x200" alt="placeholder"></li>
<li><img src="http://placehold.it/350x200" alt="placeholder"></li>
<li><img src="http://placehold.it/350x200" alt="placeholder"></li>
<li><img src="http://placehold.it/200x300" alt="placeholder"></li>
<li><img src="http://placehold.it/200x300" alt="placeholder"></li>
<li><img src="http://placehold.it/350x200" alt="placeholder"></li>
<li><img src="http://placehold.it/200x300" alt="placeholder"></li>
<li><img src="http://placehold.it/200x300" alt="placeholder"></li>
<li><img src="http://placehold.it/200x300" alt="placeholder"></li>
<li class="grid_4">
<p>Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh <a href="">fermentum</a> in.
<ul>
<li>One</li>
<li>Two</li>
</ul>
</p>
<p>Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh <a href="">fermentum</a> in.
</p>
</li>
</ul>
{% endblock %}
{% block sidebar %}
rowers/templates/redesign_plan.html
-3
View File
@@ -10,9 +10,6 @@
</p>
{% endblock %}
{% block sideheader %}
<h1>Plan</h1>
{% endblock %}
{% block sidebar %}
{% include 'menu_plan.html' %}
rowers/templates/redesign_profile.html
-4
View File
@@ -10,10 +10,6 @@
</p>
{% endblock %}
{% block sideheader %}
<h1>Profile</h1>
{% endblock %}
{% block sidebar %}
{% include 'menu_profile.html' %}
{% endblock %}
rowers/templates/redesign_racing.html
-3
View File
@@ -10,9 +10,6 @@
</p>
{% endblock %}
{% block sideheader %}
<h1>Racing</h1>
{% endblock %}
{% block sidebar %}
{% include 'menu_racing.html' %}
rowers/templates/redesign_teams.html
-4
View File
@@ -10,10 +10,6 @@
</p>
{% endblock %}
{% block sideheader %}
<h1>Teams</h1>
{% endblock %}
{% block sidebar %}
{% include 'menu_teams.html' %}
{% endblock %}
rowers/templates/redesign_workout.html
-3
View File
@@ -10,9 +10,6 @@
</p>
{% endblock %}
{% block sideheader %}
<h1>Workout</h1>
{% endblock %}
{% block sidebar %}
{% include 'menu_workout.html' %}
rowers/templates/redesign_workouts.html
-3
View File
@@ -10,9 +10,6 @@
</p>
{% endblock %}
{% block sideheader %}
<h1>Workouts</h1>
{% endblock %}
{% block sidebar %}
{% include 'menu_workouts.html' %}
static/css/styles2.css
+61 -9
View File
@@ -292,10 +292,16 @@
grid-area: nav;
background: #1c75bc;
}
.side-nav {
grid-area: side-nav;
background: #1c75bc;
}
.side {
grid-area: sidebar;
background: #35383d;
border-top: 1px solid #dddddd;
/* border-top: 1px solid #dddddd; */
padding: 0;
}
@@ -334,14 +340,33 @@
grid-template-areas:
"header"
"user"
"nav"
"nav"
"content"
"side-header"
"sidebar"
"ad"
"footer";
}
.main-content {
list-style: none;
margin: 0;
}
.main-content li.grid_2 {
grid-column-end: span 2;
}
.main-content li.grid_4 {
grid-column-end: span 4;
}
.main-content li img {
display: block;
width: 100%;
height: auto;
padding: 5px;
}
@media (max-width: 449px) {
nav a {
font-size: 0px;
@@ -358,7 +383,8 @@
grid-template-areas:
"header header"
"user user"
"side-header nav"
"side-nav nav"
"sidebar content"
"sidebar content"
"ad footer";
}
@@ -374,6 +400,19 @@
justify-content: space-between;
}
.main-content {
display: grid;
grid-template-columns: repeat(2,1fr);
grid-gap: 10px;
}
.main-content li.grid_2 {
grid-column-end: span 2;
}
.main-content li.grid_4 {
grid-column-end: span 2;
}
}
@@ -384,11 +423,12 @@
grid-template-columns: 1fr 4fr 1fr;
grid-template-areas:
"header header user"
"side-header nav nav"
"sidebar content content"
"sidebar content content"
"sidebar footer footer"
"ad footer footer"
"side-nav nav nav"
"sidebar content content"
"sidebar content content"
"sidebar content content"
"sidebar footer footer"
"ad footer footer"
}
nav ul {
@@ -399,7 +439,19 @@
flex-direction: row;
}
.main-content {
display: grid;
grid-template-columns: repeat(4,1fr);
grid-gap: 10px;
}
.main-content li.grid_2 {
grid-column-end: span 2;
}
.main-content li.grid_4 {
grid-column-end: span 4;
}
}
templates/newbase.html
+5 -7
View File
@@ -131,7 +131,7 @@
<li>
<a href="/" title="Home">
<img src="/static/img/logo7.png"
alt="Rowsandall logo" width="300px">
alt="Rowsandall logo" width="200px">
</a>
</li>
<li>
@@ -182,6 +182,10 @@
</ul>
</user>
<side-nav class="side-nav">
&nbsp;
</side-nav>
<nav class="main-nav">
<ul>
<li id="nav-workouts">
@@ -217,12 +221,6 @@
{% endblock %}
</main>
<side-header class="sideheader">
{% block sideheader %}
<h1>Workouts</h1>
{% endblock %}
</side-header>
<aside class="side">
{% block sidebar %}
Related links