diff --git a/Changelog b/Changelog index efd6190f..423517ee 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,12 @@ +1.2.2: 2017-09-08 + * #3704: [hosting] Added my settings page + * #3771: [datacenterlight] Fixed the inconsistency in navbar style in billing page and onward + * #3769: [datacenterlight] Fixed EN dashboard url redirecting to the wrong page + * #3775: [hosting] Made the dashboard as the default start page for hosting app + * #3779: [hosting] Changed signup validation and activation page navbar transparent + * #3759: [hosting] Made the navbar style consistent to the dcl navbar and changed font weight from 300 to 400 for mobile navbar text + * #3644: [datacenterlight] Added a login button on landing + * #3659: [hosting] Changed hosting navbar design 1.2.1: 2017-09-06 * #3757: [datacenterlight] Added /l route for linkedin 1.2: 2017-09-01 diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9025473e..6537dd0d 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -122,7 +122,7 @@ button, input, optgroup, select, textarea { .navbar-default { background: #fff; - border: none; + /* border: none; */ padding: 5px; } @@ -143,15 +143,19 @@ button, input, optgroup, select, textarea { .navbar-default .navbar-nav>li>a { cursor: pointer; - /*font-family: 'Lato-Light', sans-serif;*/ - font-weight: 300; + font-weight: 400; } .navbar-transparent .navbar-nav>li>a { color: #fff; cursor: pointer; - /*font-family: 'Lato-Light', sans-serif;*/ - font-weight: 300; +} + +@media (min-width: 768px) { + .navbar-default .navbar-nav>li>a, + .navbar-transparent .navbar-nav>li>a { + font-weight: 300; + } } .navbar-transparent .navbar-nav>li>a:hover { @@ -924,7 +928,7 @@ tech-sub-sec h2 { border: 1px solid #fff; -webkit-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); -moz-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); - box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); + box-shadow: -8px 14px 20px -5px rgba(77, 77, 77, 0.5); display: none; text-align: center; border-radius: 4px !important; @@ -976,8 +980,12 @@ tech-sub-sec h2 { .dropdown-menu>li>a { font-size: 13px; - font-weight: 300; - /*font-family: 'Lato-Light', sans-serif;*/ +} + +@media (min-width: 768px) { + .dropdown-menu>li>a { + font-weight: 300; + } } .navbar-default .navbar-nav>.active>a, diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index ee791648..e2f1edc0 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -1,10 +1,12 @@ -{% load staticfiles i18n%} {% load custom_tags %} {% get_current_language as LANGUAGE_CODE %} +{% load staticfiles i18n%} +{% load custom_tags %} +{% get_current_language as LANGUAGE_CODE %} + {% include "hosting/includes/_navbar_user.html" %} {% endblock navbar %} diff --git a/hosting/templates/hosting/includes/_navbar_user.html b/hosting/templates/hosting/includes/_navbar_user.html new file mode 100644 index 00000000..d06477ca --- /dev/null +++ b/hosting/templates/hosting/includes/_navbar_user.html @@ -0,0 +1,52 @@ +{% load staticfiles %} +{% load i18n %} +{% load custom_tags %} + + + + \ No newline at end of file diff --git a/hosting/urls.py b/hosting/urls.py index 455aa97f..10e09dd0 100644 --- a/hosting/urls.py +++ b/hosting/urls.py @@ -11,6 +11,7 @@ from .views import ( SSHKeyChoiceView, DashboardView, SettingsView) + urlpatterns = [ url(r'index/?$', IndexView.as_view(), name='index'), url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'),