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

Merge branch 'feature/newlogo' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2017-04-05 10:52:37 +02:00
parent 421ca7a877 6366c89911
commit 7190567b2f
14 changed files with 344 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
rowers/templates/base.html
View File

@@ -26,18 +26,21 @@
<body> <body>
{% analytical_body_top %} {% analytical_body_top %}
<div class="container_12"> <div class="container_12">
<div id="logo" class="grid_2"> <div class="grid_12">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} &nbsp;
<p><a href="/"><img src="/static/img/logocroppedpro.gif"
alt="Rowsandall logo" width="110" heigt="110"></a></p>
{% else %}
<p><a href="/"><img src="/static/img/logocropped.gif"
alt="Rowsandall logo" width="110" heigt="110"></a></p>
{% endif %}
</div> </div>
<div class="grid_10 omega"> <div class="grid_12">
<div class="grid_8 alpha"> <div id="logo" class="grid_6 alpha">
<div class="grid_1 prefix_4 alpha"> {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<p><a href="/"><img src="/static/img/logo3.jpg"
alt="Rowsandall logo" height="80"></a></p>
{% else %}
<p><a href="/"><img src="/static/img/logo3.jpg"
alt="Rowsandall logo" height="80"></a></p>
{% endif %}
</div>
<div class="grid_6 omega">
<div class="grid_1 prefix_2 alpha">
<p id="header"> <p id="header">
<a class="button gray small" href="/rowers/videos">Videos</a></p> <a class="button gray small" href="/rowers/videos">Videos</a></p>
</div> </div>
@@ -47,29 +50,21 @@
</div> </div>
<div class="grid_1 omega"> <div class="grid_1 omega">
<p id="header"> <p id="header">
<a class="button gray small" href="/rowers/email">Contact</a></p> <a class="button gray small" href="/rowers/email">Contact</a>
</p>
</div> </div>
</div> </div>
<div class="grid_2 omega">
{% if user.is_authenticated %}
<p><a class="button gray small" href="/password_change/">Password Change</a></p>
{% else %}
<p><a class="button gray small" href="/password_reset/">Forgot Password?</a></p>
{% endif %}
</div>
</div> </div>
<div class="grid_12">
<div class="grid_10 omega">
<div class="grid_4 suffix_2 alpha"> <div class="grid_4 suffix_2 alpha">
<p>Free Data and Analysis. For Rowers. By Rowers.</p> <p>Free Data and Analysis. For Rowers. By Rowers.</p>
</div> </div>
<div class="grid_3"> <div class="grid_3 prefix_2">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<h6>Pro Member</h6> <h6 class="graytext">Pro Member</h6>
{% else %} {% else %}
<div class="grid_2 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div> <div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
{% endif %} {% endif %}
</div> </div>
<div class="grid_1 omega"> <div class="grid_1 omega">
@@ -83,7 +78,7 @@
</div> </div>
</div> </div>
<div class="grid_10" omega> <div class="grid_12" omega>
<div class="grid_1 alpha tooltip"> <div class="grid_1 alpha tooltip">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<p><a class="button gray small" href="/rowers/workout/upload/">Upload</a></p> <p><a class="button gray small" href="/rowers/workout/upload/">Upload</a></p>
@@ -149,7 +144,7 @@
<p>&nbsp;</p> <p>&nbsp;</p>
{% endif %} {% endif %}
</div> </div>
<div class="grid_1 omega tooltip"> <div class="grid_1 prefix_2 omega tooltip">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<p> <p>
<a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a> <a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>

243
rowers/templates/basefront.html Normal file
View File

@@ -0,0 +1,243 @@
{% load cookielaw_tags %}
{% load analytical %}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="en">
<head>
<script src="/static/cookielaw/js/cookielaw.js"></script>
{% analytical_head_top %}
{% if GOOGLE_ANALYTICS_PROPERTY_ID %}
{% include "ga.html" %}
{% endif %}
<link rel="stylesheet" href="/static/css/bokeh-0.12.3.min.css" type="text/css" />
<link rel="stylesheet" href="/static/css/bokeh-widgets-0.12.3.min.css" type="text/css" />
<link rel="shortcut icon" href="/static/img/myicon.png" />
<link rel="shortcut icon" href="/static/img/favicon.ico" />
<meta charset="utf-8" />
<meta name="viewport" content="initial-scale=0.67">
<title>Rowsandall</title>
<link rel="stylesheet" href="/static/css/reset.css" />
<link rel="stylesheet" href="/static/css/text.css" />
<link rel="stylesheet" href="/static/css/960_12_col.css" />
<link rel="stylesheet" href="/static/css/rowsandall.css" />
{% block meta %} {% endblock %}
{% analytical_head_bottom %}
</head>
<body>
<style>
.splash {
background-color: transparent;
background-image: url("/static/img/henley.jpg");
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
min-height: 759px;
min-width: 1024px;
width: 100%;
height: auto;
}
.container_12 {background-color: rgba(255,255,255,0.5);}
</style>
<div class="splash">
{% analytical_body_top %}
<div class="container_12">
<div clas="grid_12">
&nbsp;
</div>
<div class="grid_12">
<div id="logo" class="grid_6 alpha">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<p><a href="/"><img src="/static/img/logo3.jpg"
alt="Rowsandall logo" height="80"></a></p>
{% else %}
<p><a href="/"><img src="/static/img/logo3.jpg"
alt="Rowsandall logo" height="80"></a></p>
{% endif %}
</div>
<div class="grid_6 omega">
<div class="grid_1 prefix_2 alpha">
<p id="header">
<a class="button gray small" href="/rowers/videos">Videos</a></p>
</div>
<div class="grid_2">
<p id="header">
<a class="button gray small" href="http://analytics.rowsandall.com/">Rowing Analytics BLOG</a></p>
</div>
<div class="grid_1 omega">
<p id="header">
<a class="button gray small" href="/rowers/email">Contact</a>
</p>
</div>
</div>
</div>
<div class="grid_12">
<div class="grid_4 suffix_2 alpha">
<p>Free Data and Analysis. For Rowers. By Rowers.</p>
</div>
<div class="grid_3 prefix_2">
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<h6 class="graytext">Pro Member</h6>
{% else %}
<div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
{% endif %}
</div>
<div class="grid_1 omega">
{% if user.is_authenticated %}
<p><a class="button gray small" href="{% url 'logout' %}">logout</a></p>
{% else %}
<p>&nbsp</p>
{% endif %}
</div>
</div>
<div class="grid_12" omega>
<div class="grid_1 alpha tooltip">
{% if user.is_authenticated %}
<p><a class="button gray small" href="/rowers/workout/upload/">Upload</a></p>
<span class="tooltiptext">Upload CSV, TCX, FIT data files to rowsandall.com</span>
{% else %}
<p><a class="button green small" href="/rowers/register">Register (free)</a></p>
{% endif %}
</div>
<div class="grid_1 tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/imports/">Import</a>
</p>
<span class="tooltiptext">Import workouts from Strava, SportTracks, and C2 logbook</span>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
<div class="grid_2 tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/list-workouts/">Workouts</a>
</p>
<span class="tooltiptext">See your list of workouts</span>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
<div class="grid_2 tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/list-graphs/">Graphs</a>
</p>
<span class="tooltiptext">See your most recent charts</span>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
<div class="grid_2 tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/analysis">Analysis</a>
</p>
<span class="tooltiptext">Analysis of workouts over a period of time</span>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
<div class="grid_1 tooltip">
{% if user.is_authenticated and user.rower.team.all %}
<div class="grid_1 alpha dropdown">
<button class="grid_1 alpha button gray small dropbtn">
Teams
</button>
<div class="dropdown-content">
{% for t in user.rower.team.all %}
<a class="button gray small" href="/rowers/list-workouts/team/{{ t.id }}/">{{ t.name }}</a>
{% endfor %}
</div>
</div>
<span class="tooltiptext">See recent workouts for your team</span>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
<div class="grid_1 prefix_2 omega tooltip">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
</p>
<span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>
{% else %}
<p><a class="button gray small" href="{% url 'login' %}">login</a> </p>
{% endif %}
</div>
</div>
<div class="clear"></div>
<div class="grid_12">
{% block message %}
{% if message %}
<p class="message">
{{ message }}
</p>
{% endif %}
{% if successmessage %}
<p class="successmessage">
{{ successmessage }}
</p>
{% endif %}
{% endblock %}
</div>
<div class="grid_12">
{% load tz %}
{% block content %}{% endblock %}
</div>
<div class="clear"></div>
<div class="grid_12 omega" >
{% block footer %}
<p id="footer">{{ versionstring }}</p>
<div class="grid_2 alpha">
<p id="footer"><a href="/rowers/email/">&copy; Sander Roosendaal</a></p>
</div>
<div class="grid_1">
<p id="footer">
<a href="/rowers/about">About</a></p>
</div>
<div class="grid_2">
<p id="footer">
<a href="/rowers/developers">Developers</a></p>
</div>
<div class="grid_1">
<p id="footer">
<a href="/rowers/legal">Legal</a></p>
</div>
<div class="grid_2">
<p id="footer">
<a href="/rowers/partners">Partners</a></p>
</div>
<div class="grid_1">
<p id="footer">
<a href="/rowers/physics">Physics</a></p>
</div>
<div class="grid_2">
<p id="footer">
<a href="http://analytics.rowsandall.com/">Rowing Analytics BLOG</a></p>
</div>
<div class="grid_1 omega">
<p id="footer">
<a href="/rowers/email">Contact</a></p>
</div>
{% endblock %}
</div>
{% cookielaw_banner %}
</div>
<!-- end container -->
{% analytical_body_bottom %}
</div>
</body>
</html>

8
rowers/templates/frontpage.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "basefront.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
@@ -6,11 +6,6 @@
{% block content %} {% block content %}
<div class="grid_12">
<p class="midden">
<a title="By Photoglob Zurich, reprinted by Detroit Publishing Co. [Public domain], via Wikimedia Commons" href="https://commons.wikimedia.org/wiki/File%3AHenley_Regatta%2C_Henley-on-Thames%2C_England%2C_1890s.jpg"><img width="512" alt="Henley Regatta, Henley-on-Thames, England, 1890s" src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d9/Henley_Regatta%2C_Henley-on-Thames%2C_England%2C_1890s.jpg/512px-Henley_Regatta%2C_Henley-on-Thames%2C_England%2C_1890s.jpg"/></a></p>
</div>
<div class="grid_12"> <div class="grid_12">
<p class="midden"> <p class="midden">
Compatible with: Compatible with:
@@ -27,4 +22,5 @@
</p> </p>
</div> </div>
{% endblock %} {% endblock %}

24
rowers/templates/list_workouts.html
View File

@@ -27,7 +27,7 @@
</table> </table>
{% csrf_token %} {% csrf_token %}
</div> </div>
<div class="grid_2 suffix_6 omega"> <div class="grid_2 suffix_6 alpha">
<input name='daterange' class="button green" type="submit" value="Submit"> </form> <input name='daterange' class="button green" type="submit" value="Submit"> </form>
</div> </div>
@@ -42,10 +42,10 @@
{% endif %} {% endif %}
{% if workouts %} {% if workouts %}
<table width="100%" class="listtable"> <table width="100%" class="listtable shortpadded">
<thead> <thead>
<tr> <tr>
<th> Date</th> <th style="width:80px"> Date</th>
<th> Time</th> <th> Time</th>
<th> Name</th> <th> Name</th>
<th> Type</th> <th> Type</th>
@@ -54,8 +54,8 @@
<th> Avg HR </th> <th> Avg HR </th>
<th> Max HR </th> <th> Max HR </th>
{% if not team %} {% if not team %}
<th> Delete</th> <th> &nbsp;</th>
<th> Export</th> <th> &nbsp;</th>
{% else %} {% else %}
<th colspan="2"> <th colspan="2">
Owner Owner
@@ -89,17 +89,17 @@
<td> {{ workout.maxhr }} </td> <td> {{ workout.maxhr }} </td>
{% if not team %} {% if not team %}
<td> <td>
<a class="button red small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete <a class="small" href="/rowers/workout/{{ workout.id }}/export">Export</a>
</td>
<td>
<a class="button blue small" href="/rowers/workout/{{ workout.id }}/export">Export</a>
</td> </td>
{% else %} {% else %}
<td colspan="2"> <td colspan="2">
{{ workout.user.user.first_name }} {{ workout.user.user.last_name }} {{ workout.user.user.first_name }} {{ workout.user.user.last_name }}
</td> </td>
{% endif %} {% endif %}
<td> <a class="button blue small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex</a> </td> <td> <a class="small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex</a> </td>
<td>
<a class="small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete
</td>
</tr> </tr>
@@ -116,7 +116,9 @@
{% if team %} {% if team %}
<div class="grid_4" id="teambuttons"> <div class="grid_4" id="teambuttons">
<div class="grid_3 alpha"> <div class="grid_3 alpha">
<a class="button gray small" href="/rowers/team-compare-select/team/{{ team.id }}/">Multi Workout Compare</a> <p>
&nbsp;
</p>
</div> </div>
</div> </div>
{% endif %} {% endif %}

2
rowers/templates/registration/login.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "basefront.html" %}
{% block content %} {% block content %}

10
rowers/templates/rower_form.html
View File

@@ -80,6 +80,14 @@
<div class="grid_6 alpha"> <div class="grid_6 alpha">
<p> <p>
<h2>Account Information</h2> <h2>Account Information</h2>
<div class="grid_6 alpha">
<div class="grid_2 suffix_4 alpha">
<p>
<a class="button gray small" href="/password_change/">Password Change</a>
</p>
</div>
</div>
</p>
{% if userform.errors %} {% if userform.errors %}
<p style="color: red;"> <p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below. Please correct the error{{ form.errors|pluralize }} below.
@@ -113,6 +121,8 @@
<input class="button green" type="submit" value="Save"> <input class="button green" type="submit" value="Save">
</form> </form>
</div> </div>
</p> </p>
</div> </div>
<div class="grid_6 omega"> <div class="grid_6 omega">

4
rowers/templates/team_compare_select.html
View File

@@ -7,8 +7,8 @@
{% block content %} {% block content %}
<div class="grid_12"> <div class="grid_12 alpha">
<div class="grid_8 suffix_4"> <div class="grid_8 suffix_4 alpha">
{% include "teambuttons.html" with teamid=team.id %} {% include "teambuttons.html" with teamid=team.id %}
</div> </div>
</div> </div>

12
rowers/templates/teambuttons.html
View File

@@ -1,9 +1,15 @@
<div class="grid_2 alpha"> <div class="grid_2 alpha">
<a class="button gray small" href="/rowers/list-workouts/team/{{ teamid }}/">Team Workouts</a> <p>
<a class="button gray small" href="/rowers/list-workouts/team/{{ teamid }}/">Team Workouts</a>
</p>
</div> </div>
<div class="grid_2"> <div class="grid_2">
<a class="button gray small" href="/rowers/team-compare-select/team/{{ teamid }}/">Multi Compare</a> <p>
<a class="button gray small" href="/rowers/team-compare-select/team/{{ teamid }}/">Multi Compare</a>
</p>
</div> </div>
<div class="grid_2 suffix_2 omega"> <div class="grid_2 suffix_2 omega">
<p>
<a class="button gray small" href="/rowers/team/{{ teamid }}/">Team Page</a> <a class="button gray small" href="/rowers/team/{{ teamid }}/">Team Page</a>
</p>
</div> </div>

2
static/css/960.css
View File

@@ -650,4 +650,4 @@ body {
.container_12, .container_12,
.container_16 { .container_16 {
zoom: 1; zoom: 1;
} }

4
static/css/960_12_col.css
View File

@@ -14,7 +14,7 @@
*/ */
body { body {
min-width: 960px; min-width: 960px;
} }
/* `Container /* `Container
@@ -354,4 +354,4 @@ body {
.clearfix, .clearfix,
.container_12 { .container_12 {
zoom: 1; zoom: 1;
} }

2
static/css/demo.css
View File

@@ -52,4 +52,4 @@ p {
.container_24 { .container_24 {
background-image: url(../img/24_col.gif); background-image: url(../img/24_col.gif);
} }

146
static/css/rowsandall.css
View File

@@ -5,13 +5,14 @@ html {
} }
body { body {
background: #edc; /* background: #edc; */
color: #333; color: #333;
font-size: 1.2em; font-size: 1.2em;
height: auto; height: auto;
padding-bottom: 20px; padding-bottom: 20px;
} }
a { a {
/* color: #fff; */ /* color: #fff; */
text-decoration: none; text-decoration: none;
@@ -58,6 +59,9 @@ th {
.listtable thead th { .listtable thead th {
font-weight: bold; font-weight: bold;
} }
.shortpadded td { padding: 3px 3px }
.paddedtable td { padding: 1px 20px } .paddedtable td { padding: 1px 20px }
.cortable { .cortable {
@@ -155,6 +159,11 @@ th.rotate > div > span {
text-align: center; text-align: center;
} }
.transparentbutton {
padding: 1px;
text-align: center;
}
.tooltip { .tooltip {
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -208,13 +217,13 @@ th.rotate > div > span {
color: white; color: white;
padding: 0.2em 0.0em 0.2em 0.0em; padding: 0.2em 0.0em 0.2em 0.0em;
zoom: 1; zoom: 1;
border-radius: .5em; /* border-radius: .5em; */
-moz-border-radius: .5em; /* -moz-border-radius: .5em; */
-webkit-border-radius: .5em; /* -webkit-border-radius: .5em; */
-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* -box-shadow: 0 1px 3px rgba(0,0,0,0.5); */
-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); */
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /*
text-shadow: 0 -1px 1px rgba(0,0,0,0.25); /* text-shadow: 0 -1px 1px rgba(0,0,0,0.25); */
text-align: center; text-align: center;
} }
@@ -229,10 +238,10 @@ th.rotate > div > span {
border-radius: .5em; border-radius: .5em;
-moz-border-radius: .5em; -moz-border-radius: .5em;
-webkit-border-radius: .5em; -webkit-border-radius: .5em;
-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* -box-shadow: 0 1px 3px rgba(0,0,0,0.5); */
-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); */
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); /* -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); */
text-shadow: 0 -1px 1px rgba(0,0,0,0.25); /* text-shadow: 0 -1px 1px rgba(0,0,0,0.25); */
text-align: center; text-align: center;
} }
@@ -242,9 +251,6 @@ a.button {
.button:hover { .button:hover {
background: #d8e6ff; /* old browsers */ background: #d8e6ff; /* old browsers */
background: -moz-linear-gradient(top, #d8e6ff 0%, #8da8d7 100%); /* firefox */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d8e6ff), color-stop(100%,#8da8d7)); /* webkit */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d8e6ff', endColorstr='#8da8d7',GradientType=0 ); /* ie */
text-decoration: none; text-decoration: none;
} }
@@ -270,43 +276,25 @@ a.button {
color: #d7d7d7; color: #d7d7d7;
border: solid 1px #333; border: solid 1px #333;
background: #333; background: #333;
background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#000));
background: -moz-linear-gradient(top, #666, #000);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#666666', endColorstr='#000000');
} }
.black:hover { .black:hover {
background: #000; background: #000;
background: -webkit-gradient(linear, left top, left bottom, from(#444), to(#000));
background: -moz-linear-gradient(top, #444, #000);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#000000');
} }
.black:active { .black:active {
color: #666; color: #666;
background: -webkit-gradient(linear, left top, left bottom, from(#000), to(#444));
background: -moz-linear-gradient(top, #000, #444);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#666666');
} }
/* gray */ /* gray */
.gray { .blue {
color: #e9e9e9; color: #e9e9e9;
border: solid 1px #555; border: solid 1px #555;
background: #6e6e6e; background: #6e6e6e;
background: -webkit-gradient(linear, left top, left bottom, from(#888), to(#575757));
background: -moz-linear-gradient(top, #888, #575757);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#888888', endColorstr='#575757');
} }
.gray:hover { .blue:hover {
background: #616161; background: #616161;
background: -webkit-gradient(linear, left top, left bottom, from(#757575), to(#4b4b4b));
background: -moz-linear-gradient(top, #757575, #4b4b4b);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#757575', endColorstr='#4b4b4b');
} }
.gray:active { .blue:active {
color: #afafaf; color: #afafaf;
background: -webkit-gradient(linear, left top, left bottom, from(#575757), to(#888));
background: -moz-linear-gradient(top, #575757, #888);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#575757', endColorstr='#888888');
} }
/* white */ /* white */
@@ -314,21 +302,12 @@ a.button {
color: #606060; color: #606060;
border: solid 1px #b7b7b7; border: solid 1px #b7b7b7;
background: #fff; background: #fff;
background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
background: -moz-linear-gradient(top, #fff, #ededed);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed');
} }
.white:hover { .white:hover {
background: #ededed; background: #ededed;
background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#dcdcdc));
background: -moz-linear-gradient(top, #fff, #dcdcdc);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dcdcdc');
} }
.white:active { .white:active {
color: #999; color: #999;
background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
background: -moz-linear-gradient(top, #ededed, #fff);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff');
} }
/* orange */ /* orange */
@@ -336,21 +315,12 @@ a.button {
color: #fef4e9; color: #fef4e9;
border: solid 1px #da7c0c; border: solid 1px #da7c0c;
background: #f78d1d; background: #f78d1d;
background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20));
background: -moz-linear-gradient(top, #faa51a, #f47a20);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20');
} }
.orange:hover { .orange:hover {
background: #f47c20; background: #f47c20;
background: -webkit-gradient(linear, left top, left bottom, from(#f88e11), to(#f06015));
background: -moz-linear-gradient(top, #f88e11, #f06015);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f88e11', endColorstr='#f06015');
} }
.orange:active { .orange:active {
color: #fcd3a5; color: #fcd3a5;
background: -webkit-gradient(linear, left top, left bottom, from(#f47a20), to(#faa51a));
background: -moz-linear-gradient(top, #f47a20, #faa51a);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f47a20', endColorstr='#faa51a');
} }
/* red */ /* red */
@@ -358,43 +328,30 @@ a.button {
color: #faddde; color: #faddde;
border: solid 1px #980c10; border: solid 1px #980c10;
background: #d81b21; background: #d81b21;
background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
background: -moz-linear-gradient(top, #ed1c24, #aa1317);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed1c24', endColorstr='#aa1317');
} }
.red:hover { .red:hover {
background: #b61318; background: #b61318;
background: -webkit-gradient(linear, left top, left bottom, from(#c9151b), to(#a11115));
background: -moz-linear-gradient(top, #c9151b, #a11115);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#c9151b', endColorstr='#a11115');
} }
.red:active { .red:active {
color: #de898c; color: #de898c;
background: -webkit-gradient(linear, left top, left bottom, from(#aa1317), to(#ed1c24));
background: -moz-linear-gradient(top, #aa1317, #ed1c24);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1317', endColorstr='#ed1c24');
} }
/* blue */ /* blue */
.blue { .graytext {
color: #d9eef7; color: #27aae2;
border: solid 1px #0076a3;
background: #0095cd;
background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5));
background: -moz-linear-gradient(top, #00adee, #0078a5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');
} }
.blue:hover {
background: #007ead; .gray {
background: -webkit-gradient(linear, left top, left bottom, from(#0095cc), to(#00678e)); color: #fae7e9;
background: -moz-linear-gradient(top, #0095cc, #00678e); border: solid 1px #27aae2;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0095cc', endColorstr='#00678e'); background: #27aae2;
} }
.blue:active { .gray:hover {
color: #80bed6; background: #1c74bb;
background: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00adee)); border: solid 1px #27aae2;
background: -moz-linear-gradient(top, #0078a5, #00adee); }
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00adee'); .gray:active {
color: #ffffff;
} }
/* rosy */ /* rosy */
@@ -402,21 +359,12 @@ a.button {
color: #fae7e9; color: #fae7e9;
border: solid 1px #b73948; border: solid 1px #b73948;
background: #da5867; background: #da5867;
background: -webkit-gradient(linear, left top, left bottom, from(#f16c7c), to(#bf404f));
background: -moz-linear-gradient(top, #f16c7c, #bf404f);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f16c7c', endColorstr='#bf404f');
} }
.rosy:hover { .rosy:hover {
background: #ba4b58; background: #ba4b58;
background: -webkit-gradient(linear, left top, left bottom, from(#cf5d6a), to(#a53845));
background: -moz-linear-gradient(top, #cf5d6a, #a53845);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf5d6a', endColorstr='#a53845');
} }
.rosy:active { .rosy:active {
color: #dca4ab; color: #dca4ab;
background: -webkit-gradient(linear, left top, left bottom, from(#bf404f), to(#f16c7c));
background: -moz-linear-gradient(top, #bf404f, #f16c7c);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bf404f', endColorstr='#f16c7c');
} }
/* green */ /* green */
@@ -424,21 +372,12 @@ a.button {
color: #e8f0de; color: #e8f0de;
border: solid 1px #538312; border: solid 1px #538312;
background: #64991e; background: #64991e;
background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e));
background: -moz-linear-gradient(top, #7db72f, #4e7d0e);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e');
} }
.green:hover { .green:hover {
background: #538018; background: #538018;
background: -webkit-gradient(linear, left top, left bottom, from(#6b9d28), to(#436b0c));
background: -moz-linear-gradient(top, #6b9d28, #436b0c);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6b9d28', endColorstr='#436b0c');
} }
.green:active { .green:active {
color: #a9c08c; color: #a9c08c;
background: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#7db72f));
background: -moz-linear-gradient(top, #4e7d0e, #7db72f);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e7d0e', endColorstr='#7db72f');
} }
/* pink */ /* pink */
@@ -446,21 +385,12 @@ a.button {
color: #feeef5; color: #feeef5;
border: solid 1px #d2729e; border: solid 1px #d2729e;
background: #f895c2; background: #f895c2;
background: -webkit-gradient(linear, left top, left bottom, from(#feb1d3), to(#f171ab));
background: -moz-linear-gradient(top, #feb1d3, #f171ab);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#feb1d3', endColorstr='#f171ab');
} }
.pink:hover { .pink:hover {
background: #d57ea5; background: #d57ea5;
background: -webkit-gradient(linear, left top, left bottom, from(#f4aacb), to(#e86ca4));
background: -moz-linear-gradient(top, #f4aacb, #e86ca4);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4aacb', endColorstr='#e86ca4');
} }
.pink:active { .pink:active {
color: #f3c3d9; color: #f3c3d9;
background: -webkit-gradient(linear, left top, left bottom, from(#f171ab), to(#feb1d3));
background: -moz-linear-gradient(top, #f171ab, #feb1d3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f171ab', endColorstr='#feb1d3');
} }
@@ -509,7 +439,7 @@ a.button {
display: none; display: none;
position: absolute; position: absolute;
min-width: 160px; min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); /* box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); */
z-index: 999; z-index: 999;
} }

BIN
static/img/henley.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 KiB

BIN
static/img/logo3.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 429 KiB