From 10e9a536adb992ad476a3bc33e26347e1e2c9689 Mon Sep 17 00:00:00 2001 From: leonjohannessen Date: Sat, 21 Sep 2013 12:48:44 +0200 Subject: [PATCH] Active menu markings --- bandpage/templates/bandpage/base.html | 15 +++++++------- landingpage/templates/landingpage/index.html | 2 ++ static/styles/bootstrap.css | 21 ++++++++++++++------ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/bandpage/templates/bandpage/base.html b/bandpage/templates/bandpage/base.html index a587b2f..ce0d492 100644 --- a/bandpage/templates/bandpage/base.html +++ b/bandpage/templates/bandpage/base.html @@ -1,5 +1,6 @@ {% load staticfiles %} -{% load i18n %} +{% load i18n %} +{% load activelink %} @@ -33,16 +34,16 @@ - {{ band_name }} + {{ band_name }}
diff --git a/landingpage/templates/landingpage/index.html b/landingpage/templates/landingpage/index.html index 7f8aec0..7635232 100644 --- a/landingpage/templates/landingpage/index.html +++ b/landingpage/templates/landingpage/index.html @@ -5,6 +5,8 @@ {% block body_id %} id="landingpage" class="{{ landingpage.theme }}"{% endblock body_id %} +{% block frontpageActiveHack %} active {% endblock %} + {% block content %} {% if landingpage %} diff --git a/static/styles/bootstrap.css b/static/styles/bootstrap.css index d5adf63..bb54757 100644 --- a/static/styles/bootstrap.css +++ b/static/styles/bootstrap.css @@ -5449,12 +5449,10 @@ body.modal-open, padding-top: 0; } } -/* Animations --------------------------- */ /* Generic styles -------------------------- */ body { - background: #e8e8e8; + background: #f5f5f5; } a { text-decoration: none; @@ -5489,6 +5487,9 @@ header .navbar a { -o-transition: color 0.2s ease-out; transition: color 0.2s ease-out; } +header .navbar a.active { + color: white; +} /* Page -------------------------- */ section { @@ -5497,9 +5498,10 @@ section { color: #404040; } footer { - background: #e8e8e8; + background: #f5f5f5; padding: 40px 0; - color: #292929; + color: #363636; + border-top: 2px solid #e8e8e8; } footer #contact-info { margin-left: -15px; @@ -5538,6 +5540,13 @@ footer #contact-info #promo { padding-left: 15px; padding-right: 15px; } +footer #contact-info #booking h3, +footer #contact-info #promo h3 { + font-size: 1em; + font-weight: bold; + line-height: 1.375em; + margin: 0; +} /* Page specific: Landingpage -------------------------- */ @-webkit-keyframes scaleFade { @@ -5661,7 +5670,7 @@ body#landingpage.dark { } body#landingpage.dark h1, body#landingpage.dark p { - color: #e8e8e8; + color: #f5f5f5; text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); } body#landingpage.dark header {