From e990a17cce38f7faf7f13a5aeeaca43770f59207 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 Oct 2018 08:46:12 +0200 Subject: [PATCH] using grid better on front page --- rowers/templates/frontpage.html | 111 ++++++++++------------- rowers/templates/registration/login.html | 64 +++++++------ static/css/rowsandall2.css | 8 ++ 3 files changed, 90 insertions(+), 93 deletions(-) diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html index d97447a7..e4e3f7f6 100644 --- a/rowers/templates/frontpage.html +++ b/rowers/templates/frontpage.html @@ -14,51 +14,6 @@

For Rowers. By Rowers.

- {% if user.is_anonymous %} -
  • -   -
    • -
  • -   -
    • -
  • - -

    -
    SIGN UP FREE
    -

    -     -
    • -
  • -   -
    • -
  • -   -
    • -
  • -   -
    • -
  • -   -
    • -
  • -
    {% csrf_token %} - -

    Sign In

     - {{ form.as_p }} - -
    -
    • -
  • -   -
    • -
  • -   -
    • - {% endif %}

  • There is no shortage of training advice for rowers.

    @@ -69,10 +24,49 @@ you are, set objectives, make a plan, track progress, and adjust based on the results you are getting.

    -

    WHAT WE OFFER

    + +

    This site is more than a rowing log book. It enables you + and your coach + to plan and track all your rowing, indoor and on the water, with a large + number of devices and apps. On top of that, it offers the best in + rowing data analytics. Train smart.

    • +
  • +
    + horizontal line +
    +
    • + {% if user.is_anonymous %}
  • -   + +

    +
    SIGN UP FREE
    +

    +     +
    • +
  • +
    {% csrf_token %} + +

    Sign In

     + Forgot password? + {{ form.as_p }} + +
    +
    • +
  • +
    + horizontal line +
    +
    • + {% endif %} +
  • +

    WHAT WE OFFER

  • LOG

    @@ -105,15 +99,6 @@ Compare your results between workouts and with other rowers in your team

    • -
  • -   -
    • -
  • -   -
    • -
  • -   -

  • and more

    @@ -131,15 +116,15 @@ alt="horizontal line">
    • -
  • -

    - - Follow @rowsandall -

    -
    • +

    + + Follow @rowsandall +

    + +

    Local Time: {% now "jS F Y H:i" %}

    diff --git a/rowers/templates/registration/login.html b/rowers/templates/registration/login.html index 4b4a1698..354a5918 100644 --- a/rowers/templates/registration/login.html +++ b/rowers/templates/registration/login.html @@ -1,39 +1,43 @@ -{% extends "basefront.html" %} +{% extends "newbasefront.html" %} -{% block content %} +{% block main %} {% if form.errors %}

    Your username and password didn't match. Please try again.

    {% endif %} -
    -{% csrf_token %} - - - - - - - - - - - - - - - - -
    {{ form.username.label_tag }}{{ form.username }}
    {{ form.password.label_tag }}{{ form.password }}
    Forgot password?
    - - - -
    - -

    - Follow @rowsandall -

    +
      +
    • +
      + {% csrf_token %} + + + + + + + + + + + + + + + + +
      {{ form.username.label_tag }}{{ form.username }}
      {{ form.password.label_tag }}{{ form.password }}
      Forgot password?
      + + + +
      +
      • +
    + +

    + Follow @rowsandall +

    {% endblock %} diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css index 358440c6..84c31376 100644 --- a/static/css/rowsandall2.css +++ b/static/css/rowsandall2.css @@ -288,6 +288,14 @@ th.rotate > div > span { color: black; } +.frontitem label { + color: black; +} + +.frontitem a { + color: #1c75bc; +} + .vignet { border-radius: 50%; display: block;