diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 97599738..9b02420c 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 { @@ -1544,7 +1548,7 @@ tech-sub-sec h2 { } footer { - padding: 50px 0; + padding: 50px 20px; background-color: #f8f8f8; } diff --git a/datacenterlight/static/datacenterlight/img/pattern.jpg b/datacenterlight/static/datacenterlight/img/pattern.jpg index 8ae4c0f2..7c66e007 100755 Binary files a/datacenterlight/static/datacenterlight/img/pattern.jpg and b/datacenterlight/static/datacenterlight/img/pattern.jpg differ diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html index 76c2c16e..edb7f8aa 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/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index cf76d0b3..60090cb6 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -155,9 +155,6 @@ msgstr "Ich möchte einen existierenden SSH-Key nutzen" msgid "Upload" msgstr "Hochladen" -msgid "Your VM hosted in Switzerland" -msgstr "Deine VM in der Schweiz" - msgid "Set your new password" msgstr "Setze Dein neues Passwort" @@ -277,13 +274,16 @@ msgstr "Dashboard" msgid "Logout" msgstr "Abmelden" -msgid "Don't have an account yet ? " +msgid "Log in" +msgstr "Anmelden" + +msgid "Don't have an account yet ?" msgstr "Besitzt du kein Benutzerkonto?" msgid "Sign up" msgstr "Registrieren" -msgid "Forgot your password ? " +msgid "Forgot your password ?" msgstr "Passwort vergessen?" msgid "Resend activation link" @@ -455,7 +455,7 @@ msgstr "Deine Kreditkartennummer" msgid "Submit" msgstr "Absenden" -msgid "Reset your password" +msgid "Password reset" msgstr "Passwort zurücksetzen" msgid "UPDATE" @@ -713,6 +713,9 @@ msgstr "" "Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es " "noch einmal." +#~ msgid "Reset your password" +#~ msgstr "Passwort zurücksetzen" + #~ msgid "My VM page" #~ msgstr "Meine VM page" @@ -821,9 +824,6 @@ msgstr "" #~ msgid "Keys" #~ msgstr "Keys" -#~ msgid "Log in" -#~ msgstr "Anmelden" - #~ msgid "You haven been logged out" #~ msgstr "Du wurdest abgemeldet" diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index cdf078a0..74896a4b 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..f989d479 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -17,9 +17,11 @@ h3, h4, h5, h6 { - /*font-family: 'Lato-Regular', sans-serif;*/ font-family: 'Lato', sans-serif; - /*font-weight: 300;*/ +} + +.allcaps { + text-transform: uppercase; } .topnav { @@ -31,6 +33,11 @@ h6 { .navbar-brand { padding: 10px 15px; } +@media (max-width: 767px) { + .navbar-brand { + padding: 10px 0; + } +} .navbar-default { background: #fff; @@ -46,7 +53,7 @@ h6 { .navbar-transparent { background: transparent; border: none; - padding: 20px; + padding: 20px 0; box-shadow: none; } @@ -72,7 +79,6 @@ h6 { .navbar-transparent #logoWhite{ display: block; width: 220px; - /* color: #fff; */ } .navbar-right .highlights-dropdown .dropdown-menu { @@ -92,16 +98,6 @@ h6 { border-color: #e7e7e7; box-shadow: -8px 14px 20px -5px rgba(77, 77, 77, 0.5); } -/* .navbar-right .highlights-dropdown .dropdown-menu:before { - content: ''; - display: block; - height: 1px; - background: #e7e7e7; - position: absolute; - top: -1px; - left: -1px; - right: -1px; - } */ } .navbar-right .highlights-dropdown .dropdown-menu > li > a{ font-size: 13px; @@ -274,16 +270,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 +288,6 @@ h6 { background-position: center center; background-size: cover; background-attachment: fixed; - } .auth-bg::before { @@ -303,7 +297,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,69 +307,38 @@ h6 { .auth-container .auth-content { width: 100%; - margin: 0 auto; - max-width: 390px; + margin: 0 auto 15px; + max-width: 400px; + padding: 0 15px; } -.auth-container .auth-center { - /* position: absolute; */ - /* left: 50%; */ - /* top: 50%; */ - /* transform: translate(-50%, -50%); */ - /* width: 100%; */ -} - -.auth-container .auth-title { - margin-bottom: 50px; -} - -.auth-container .auth-title h2 { - color: #fff; - font-size: 44px; - text-align: center; - width: 425px; - margin: 0 auto; - margin-bottom: 30px; - position: relative; -} - -.auth-container .auth-title h2::after { - content: ""; - position: absolute; - bottom: -20px; - background: #fff; - height: 7px; - width: 70px; - left: 50%; - transform: translate(-50%, 0); +.auth-container .auth-content.wide { + max-width: 480px; } .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); 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%; margin: 0 auto; + max-width: 360px; } .auth-box .form .red { @@ -383,27 +346,56 @@ 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; } .auth-box .form .form-control { - height: 44px; - font-size: 16px; + height: 48px; + font-size: 14px; + padding: 10px 17px; + line-height: 30px; + border-color: #aaa; +} + +.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 +403,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; } @@ -458,16 +441,7 @@ h6 { } .auth-box .form { - padding: 15px 0px 0 0; - } - - .auth-box.sign-up .form { - padding: 15px 0px 0 0; - } - - .auth-box .form .form-control { - height: 44px; - font-size: 13px; + padding: 15px 0 15px 0; } .auth-container .auth-title { @@ -476,7 +450,7 @@ h6 { } .auth-box .msg-list { - padding: 15px 25px 5px; + padding: 20px 25px 0; text-align: center; } @@ -493,19 +467,14 @@ h6 { margin-bottom: 50px; } - .auth-box .form { - width: 90%; - } - .auth-box .section-heading { - font-size: 15px; + font-size: 32px; } } footer { - padding: 20px; + padding: 20px 0; background-color: #f8f8f8; -/* position: absolute */ right: 0; bottom: 0; left: 0; @@ -537,7 +506,6 @@ a.unlink:hover { /***** DCL payment page **********/ .dcl-order-container { - /*font-family: Lato;*/ font-weight: 300; } @@ -580,9 +548,7 @@ a.unlink:hover { } .dcl-place-order-text{ - /* font-size: 13px; */ color: #808080; - /* margin-bottom: 15px; */ } .dcl-order-table-total .tbl-total { @@ -610,7 +576,6 @@ a.unlink:hover { } .card-warning-content { - /*font-family: Lato;*/ font-weight: 300; border: 1px solid #a1a1a1; border-radius: 3px; @@ -638,18 +603,6 @@ a.unlink:hover { right: 0; } -.brand { -} - -.brand #brand-icon { -} - -.card-number-element { -} - -.card-expiry-element { -} - .card-cvc-element label { padding-left: 10px; } @@ -735,9 +688,6 @@ a.unlink:hover { margin-bottom: 30px; } - .brand { - } - .card-expiry-element { padding-right: 10px; } @@ -802,10 +752,23 @@ a.unlink:hover { } } - -.footer-light a:hover, .footer-light a:focus, .footer-light a:active { +.footer-light { + position: relative; +} +.footer-light footer { + background: transparent; + color: #eee; +} +.footer-light a, +.footer-light .text-muted { color: #ddd; } +.footer-light a:hover, .footer-light a:focus, .footer-light a:active { + color: #fff; +} +.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..7c66e007 Binary files /dev/null and b/hosting/static/hosting/img/pattern.jpg differ diff --git a/hosting/static/hosting/img/pattern_original.jpg b/hosting/static/hosting/img/pattern_original.jpg new file mode 100644 index 00000000..8ae4c0f2 Binary files /dev/null and b/hosting/static/hosting/img/pattern_original.jpg differ diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index ee4a82eb..613d67a9 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -54,19 +54,18 @@ {% include "hosting/includes/_navbar_user.html" %} {% endblock navbar %} - -
+
{% block content %} {% endblock %}
{% 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..a3c8d030 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/includes/_messages.html b/hosting/templates/hosting/includes/_messages.html index 13500fdb..12540558 100644 --- a/hosting/templates/hosting/includes/_messages.html +++ b/hosting/templates/hosting/includes/_messages.html @@ -1,8 +1,7 @@ {% if messages %} {% endif %} \ No newline at end of file diff --git a/hosting/templates/hosting/includes/_navbar_transparent.html b/hosting/templates/hosting/includes/_navbar_transparent.html index dec9cd49..8a97ae11 100644 --- a/hosting/templates/hosting/includes/_navbar_transparent.html +++ b/hosting/templates/hosting/includes/_navbar_transparent.html @@ -1,11 +1,13 @@ {% load static i18n %} \ No newline at end of file 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..87cb24e4 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"%}

-
-
-
+
{% endblock %} diff --git a/hosting/templates/hosting/signup.html b/hosting/templates/hosting/signup.html index a6f6f592..59d0957a 100644 --- a/hosting/templates/hosting/signup.html +++ b/hosting/templates/hosting/signup.html @@ -2,41 +2,36 @@ {% load staticfiles bootstrap3 i18n %} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} {% block content %} -