diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 0d0729fb..7a339914 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -182,7 +182,11 @@ button, input, optgroup, select, textarea { .navbar-brand { padding: 10px 15px; - cursor: pointer; +} +@media (max-width: 767px) { + .navbar-brand { + padding: 10px 10px; + } } .navbar-right { @@ -1543,7 +1547,7 @@ tech-sub-sec h2 { } footer { - padding: 50px 0; + padding: 50px 20px; background-color: #f8f8f8; } diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html index 76c2c16e..d2a1d4ae 100644 --- a/datacenterlight/templates/datacenterlight/includes/_footer.html +++ b/datacenterlight/templates/datacenterlight/includes/_footer.html @@ -1,38 +1,39 @@ - {% load staticfiles i18n%} +{% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} - + diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 317caabc..2fb9a94e 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -18,7 +18,7 @@ } .content-dashboard{ - min-height: calc(100vh - 70px); + min-height: calc(100vh - 60px); width: 80%; margin: 0 auto; max-width: 1120px; @@ -66,7 +66,9 @@ width: 280px; } .content-dashboard { - width: 90%; + padding-left: 15px; + padding-right: 15px; + width: 100%; } } .btn:focus, .btn:active:focus { @@ -296,10 +298,6 @@ max-width: 360px; } -.btn-wide { - min-width: 100px; -} - .caps-link { font-weight: 600; color: #8da4c0; diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index acc488ac..3e18a566 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -22,6 +22,10 @@ h6 { /*font-weight: 300;*/ } +.allcaps { + text-transform: uppercase; +} + .topnav { font-size: 14px; } @@ -31,6 +35,11 @@ h6 { .navbar-brand { padding: 10px 15px; } +@media (max-width: 767px) { + .navbar-brand { + padding: 10px 0; + } +} .navbar-default { background: #fff; @@ -274,16 +283,15 @@ h6 { /*------Auth section---------*/ .auth-container { - min-height: calc(100vh - 120px); + min-height: calc(100vh - 180px); position: relative; - /* flex-grow: 1; */ display: flex; flex-direction: column; justify-content: center; } .auth-bg { - background: url(../img/auth-bg-sm.jpg); + background: url(../img/pattern.jpg) no-repeat center center; position: fixed; left: 0; top: 0; @@ -293,7 +301,6 @@ h6 { background-position: center center; background-size: cover; background-attachment: fixed; - } .auth-bg::before { @@ -303,7 +310,7 @@ h6 { bottom: 0; left: 0; right: 0; - background: rgba(75, 75, 101, 0.55); + background: rgba(90, 116, 175, 0.7); z-index: 1; } @@ -313,8 +320,12 @@ h6 { .auth-container .auth-content { width: 100%; - margin: 0 auto; - max-width: 390px; + margin: 0 auto 15px; + max-width: 360px; +} + +.auth-container .auth-content.wide { + max-width: 420px; } .auth-container .auth-center { @@ -351,31 +362,30 @@ h6 { } .auth-box { + position: relative; background: #fff; - padding: 0; - padding-bottom: 30px; + padding: 40px 20px 20px; box-sizing: border-box; - box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); - border-radius: 4px; + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.09), 0 5px 5px rgba(0, 0, 0, 0.23); + /* border-radius: 4px; */ z-index: 10; } .auth-box .section-heading { color: #5a5a5a; - padding-top: 30px; - padding-bottom: 5px; + font-weight: 300; text-align: center; - text-transform: uppercase; - letter-spacing: 3px; - font-size: 20px; + letter-spacing: 1px; + font-size: 36px; border-radius: 3px 3px 0px 0px; - margin: 0 auto; + margin: 0 auto 10px; } .auth-box .form { padding: 20px; - width: 80%; + /* width: 90%; */ margin: 0 auto; + max-width: 320px; } .auth-box .form .red { @@ -383,27 +393,58 @@ h6 { } .auth-box .form .btn { - box-shadow: 0 0px 9px rgba(0, 0, 0, 0.19), 0 3px 5px rgba(0, 0, 0, 0.23); - letter-spacing: 3px; - font-size: 17px; + letter-spacing: 2px; + font-size: 16px; + padding: 6px 12px; + min-width: 140px; + margin-top: 15px; text-transform: uppercase; + font-weight: 600; } .auth-box .form .form-control { - height: 44px; - font-size: 16px; + height: 48px; + font-size: 14px; + padding: 10px 17px; + line-height: 30px; + border-color: #aaa; + font-weight: bold; +} + +.auth-box .form .form-control:focus, +.auth-box .form .form-control:active { + box-shadow: none; + border-radius: 0; +} + +.auth-box .form-control::-webkit-input-placeholder { + color: #aaa; +} + +.auth-box .form-control:-moz-placeholder{ + /* Firefox 18- */ + color: #aaa; +} + +.auth-box .form-control::-moz-placeholder{ + /* Firefox 19+ */ + color: #aaa; +} + +.auth-box .form-control:-ms-input-placeholder { + color: #aaa; } .auth-box .auth-footer { text-align: center; - padding: 10px; + padding: 5px; } -.auth-box .auth-footer .text { +.auth-box .auth-footer { color: #777; } -.auth-box .auth-footer .links a { +.auth-box .auth-footer a { color: #1e94cc; } @@ -411,20 +452,11 @@ h6 { color: #1e94cc; } -.auth-box.sign-up { - padding-bottom: 5px; -} - -.auth-box.sign-up .form { - padding: 15px 20px 0 20px; -} - .sign-up-message { padding: 25px 30px 25px 30px; text-align: center; font-size: 18px; line-height: 30px; - /*font-family: 'Lato' !important;*/ font-weight: 300 !important; } @@ -466,8 +498,8 @@ h6 { } .auth-box .form .form-control { - height: 44px; - font-size: 13px; + /* height: 44px; */ + /* font-size: 13px; */ } .auth-container .auth-title { @@ -802,10 +834,23 @@ a.unlink:hover { } } - +.footer-light { + position: relative; +} +.footer-light footer { + background: transparent; + color: #eee; +} +.footer-light a, +.footer-light .text-muted { + color: #ccc; +} .footer-light a:hover, .footer-light a:focus, .footer-light a:active { color: #ddd; } +.footer-vm p.copyright { + margin-top: 4px; +} .visible-mobile { display: none !important; diff --git a/hosting/static/hosting/img/pattern.jpg b/hosting/static/hosting/img/pattern.jpg new file mode 100644 index 00000000..8ae4c0f2 Binary files /dev/null and b/hosting/static/hosting/img/pattern.jpg differ diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index ee4a82eb..1d58bd3b 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -62,11 +62,11 @@ {% if request.user.is_authenticated %} - + {% else %}
{% include "datacenterlight/includes/_footer.html" %} diff --git a/hosting/templates/hosting/confirm_reset_password.html b/hosting/templates/hosting/confirm_reset_password.html index d7942455..ec22c2cf 100644 --- a/hosting/templates/hosting/confirm_reset_password.html +++ b/hosting/templates/hosting/confirm_reset_password.html @@ -1,21 +1,17 @@ {% extends "hosting/base_short.html" %} -{% load staticfiles bootstrap3%} -{% load i18n %} +{% load staticfiles bootstrap3 i18n %} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} {% block content %} -
-
+
+
-
-

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

-
-
-
-
+
{% endblock %} diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html index eda3fffa..7832ec7d 100644 --- a/hosting/templates/hosting/login.html +++ b/hosting/templates/hosting/login.html @@ -1,49 +1,43 @@ {% extends "hosting/base_short.html" %} -{% load i18n %} -{% load staticfiles bootstrap3%} +{% load i18n staticfiles bootstrap3%} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} {% block content %} -
-
-
-
-

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

-
-
-
-

{% trans "Login"%}

- {% include 'hosting/includes/_messages.html' %} -
- {% csrf_token %} - {% for field in form %} - {% bootstrap_field field show_label=False type='fields'%} - {% endfor %} -

{{form.non_field_errors|striptags}}

- {% buttons %} - - {% endbuttons %} - -
-
-
- {% trans "Don't have an account yet ? "%} -
-
- {% trans "Sign up"%} - or - {% trans "Forgot your password ? "%} - or
- {% trans "Resend activation link"%} +
+
+
+
+
+

{% trans "Log in" %}

+ {% include 'hosting/includes/_messages.html' %} +
+ {% csrf_token %} + {% for field in form %} + {% bootstrap_field field show_label=False type='fields'%} + {% endfor %} +

{{form.non_field_errors|striptags}}

+
+ +
+ +
+
+
+ {% trans "Don't have an account yet ?" %}  + {% trans "Sign up" %} +
+
-
{% endblock %} diff --git a/hosting/templates/hosting/resend_activation_link.html b/hosting/templates/hosting/resend_activation_link.html index c3f76f76..b9fe6f49 100644 --- a/hosting/templates/hosting/resend_activation_link.html +++ b/hosting/templates/hosting/resend_activation_link.html @@ -1,37 +1,40 @@ {% extends "hosting/base_short.html" %} -{% load staticfiles bootstrap3%} -{% load i18n %} +{% load staticfiles bootstrap3 i18n %} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} - {% block content %} -
-
+
+
-
-

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

-
-
-
-
+
{% endblock %} diff --git a/hosting/templates/hosting/reset_password.html b/hosting/templates/hosting/reset_password.html index a4986b5b..62d56385 100644 --- a/hosting/templates/hosting/reset_password.html +++ b/hosting/templates/hosting/reset_password.html @@ -1,44 +1,37 @@ {% extends "hosting/base_short.html" %} -{% load staticfiles bootstrap3%} -{% load i18n %} +{% load i18n staticfiles bootstrap3%} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} - {% block content %} -
-
-
-
-

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

-
-
-