From eb1b3b6eb581afe7dd15d9f072d6179ec403111f Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Mon, 24 Jul 2017 19:43:03 +0530 Subject: [PATCH 1/3] new transparent navbar include in login,signup,reset-password --- hosting/static/hosting/css/landing-page.css | 28 +++- hosting/templates/hosting/base_short.html | 144 +++++++++--------- .../hosting/includes/_navbar_transparent.html | 72 +++++++++ hosting/templates/hosting/login.html | 13 +- hosting/templates/hosting/reset_password.html | 7 +- hosting/templates/hosting/signup.html | 6 +- 6 files changed, 191 insertions(+), 79 deletions(-) create mode 100644 hosting/templates/hosting/includes/_navbar_transparent.html diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index b1972eed..63a2f54a 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -39,6 +39,30 @@ h6 { font-size: 14px; } +.navbar-transparent { + background: transparent; + border: none; + padding: 20px; +} + +.navbar-transparent .navbar-nav>li>a { + color: #fff; + cursor: pointer; + font-family: 'Lato-Regular', sans-serif; +} +.navbar-transparent .navbar-nav>li>a:hover { + color: #fff; +} +.navbar-transparent .navbar-nav>li>a:focus, .navbar-transparent .navbar-nav>li>a:hover { + color: #fff; + background-color: transparent; +} + +.navbar-transparent #logoWhite{ + display: block; + width: 220px; +} + .lead { font-size: 18px; font-weight: 400; @@ -634,11 +658,11 @@ a.unlink:hover { .card-cvc-element { padding-left: 10px; } - + .hide-mobile{ display:none; } - + #billing-form .form-control { box-shadow: none !important; font-weight: 400; diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index 6a08b97b..b5e19238 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -48,78 +48,80 @@ - - - + {% block navbar %} + + + + {% endblock navbar %}
diff --git a/hosting/templates/hosting/includes/_navbar_transparent.html b/hosting/templates/hosting/includes/_navbar_transparent.html new file mode 100644 index 00000000..d3befe60 --- /dev/null +++ b/hosting/templates/hosting/includes/_navbar_transparent.html @@ -0,0 +1,72 @@ +{% load static i18n %} + + + \ No newline at end of file diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html index 3ae7b7c2..12c9eba6 100644 --- a/hosting/templates/hosting/login.html +++ b/hosting/templates/hosting/login.html @@ -1,18 +1,23 @@ {% extends "hosting/base_short.html" %} {% load i18n %} {% load staticfiles bootstrap3%} + +{% block navbar %} + {% include 'hosting/includes/_navbar_transparent.html' %} +{% endblock navbar %} + {% block content %}
- +

{% trans "Your VM hosted in Switzerland"%}

- +

{% trans "Login"%}

@@ -26,8 +31,8 @@ {% trans "Login"%} {% endbuttons %} - - + +
diff --git a/hosting/templates/hosting/reset_password.html b/hosting/templates/hosting/reset_password.html index be9fb82b..b24546c5 100644 --- a/hosting/templates/hosting/reset_password.html +++ b/hosting/templates/hosting/reset_password.html @@ -2,6 +2,11 @@ {% load staticfiles bootstrap3%} {% load i18n %} +{% block navbar %} + {% include 'hosting/includes/_navbar_transparent.html' %} +{% endblock navbar %} + + {% block content %}
@@ -10,7 +15,7 @@

{% trans "Your VM hosted in Switzerland"%}

- +
- +
{% endblock %} From 3c5cd50a4738df6470d164d0c13c343f15de0b40 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 25 Jul 2017 18:26:56 +0530 Subject: [PATCH 2/3] commented markup removed from navbar --- hosting/templates/hosting/base_short.html | 61 +++++++------------ .../hosting/includes/_navbar_transparent.html | 61 +++++++------------ 2 files changed, 42 insertions(+), 80 deletions(-) diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index b5e19238..21aa93db 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -68,52 +68,33 @@ {% endif %} diff --git a/hosting/templates/hosting/includes/_navbar_transparent.html b/hosting/templates/hosting/includes/_navbar_transparent.html index d3befe60..01d39e52 100644 --- a/hosting/templates/hosting/includes/_navbar_transparent.html +++ b/hosting/templates/hosting/includes/_navbar_transparent.html @@ -1,6 +1,5 @@ {% load static i18n %} -
From c511ede2c79252f54a7c908e36483622a59d2048 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 25 Jul 2017 19:12:28 +0530 Subject: [PATCH 3/3] removed collapse button from navbar on login/signup/reset-password --- .../hosting/includes/_navbar_transparent.html | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/hosting/templates/hosting/includes/_navbar_transparent.html b/hosting/templates/hosting/includes/_navbar_transparent.html index 01d39e52..31bbe6bf 100644 --- a/hosting/templates/hosting/includes/_navbar_transparent.html +++ b/hosting/templates/hosting/includes/_navbar_transparent.html @@ -4,50 +4,8 @@
-
- {% if request.user.is_authenticated %} - - - {% endif %} -
\ No newline at end of file