From 7319cc4e1ddc3a1f9b0775f0c93d1ca17984fc09 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Mon, 24 Jul 2017 22:16:37 +0530 Subject: [PATCH 1/4] language options using bootstrap dropdown --- .../datacenterlight/css/landing-page.css | 36 +++++++++++++---- .../datacenterlight/includes/_navbar.html | 39 ++++++++++--------- 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 163ffd0e..bb5ef244 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -161,37 +161,59 @@ h6 { } .nav-language .drop-language{ - position: absolute; + /*position: absolute;*/ top: 45px; - left: -8px; - background: #fff; + left: auto !important; + /* background: #fff; */ width: 100px; + min-width: 100px; height: 40px; padding: 9px 10px; -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); - display: none; + /*display: none;*/ z-index: 100; /* margin-left: 10px; */ text-align: center; border-radius: 4px; } + +.nav-language .open .drop-language{ + width: 100px; + min-width: 100px; +} + .nav-language .drop-language a{ cursor: pointer; + padding: 5px 10px !important; font-family: 'Lato-Light', sans-serif; } + +/* Show the dropdown menu on hover */ +@media (min-width: 769px) { + .nav-language .dropdown:hover .dropdown-menu { + display: block; + } +} +@media (max-width: 767px){ + .nav-language .open .dropdown-menu>li>a { + line-height: 1.42857143; + } +} + .navbar-transparent .nav-language .drop-language{ background: transparent; border: 1px solid #fff; } .navbar-transparent .nav-language .drop-language a{ color: #fff; + padding: 5px 10px !important; font-family: 'Lato-Light', sans-serif; } -.nav-language:hover .drop-language{ +/* .nav-language:hover .drop-language{ display: block; -} +} */ .intro-header { height: 100vh; text-align: center; @@ -1025,7 +1047,7 @@ line-height: 40px; color: #777; } .nav-language:hover{ - height: 80px; + /*height: 80px;*/ } .navbar-transparent .nav-language .select-language { color: #777; diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index b5cfacfe..c23d1f96 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -18,7 +18,7 @@ {% endif %} - + From 1e55c6679aba05d724a99c08d0b2aab1f7998900 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Tue, 25 Jul 2017 18:17:59 +0530 Subject: [PATCH 2/4] removed the language dropdown, replaced with link to the only other language --- .../datacenterlight/css/landing-page.css | 9 ++ .../datacenterlight/includes/_navbar.html | 132 ++++++++++-------- 2 files changed, 79 insertions(+), 62 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index bb5ef244..1784b9b1 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -126,6 +126,15 @@ h6 { color: #fff; background-color: transparent; } + +.navbar-transparent .navbar-nav>li>.on-hover-border { + transition: all 0.3s linear; + box-shadow: none; +} +.navbar-transparent .navbar-nav>li>.on-hover-border:hover { + box-shadow: 0 0 0 1px #eee; + border-radius: 5px; +} .navbar-default .btn-link { box-shadow: none; } diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index c23d1f96..181f7cfb 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -1,65 +1,73 @@ -{% load staticfiles i18n%} -{% get_current_language as LANGUAGE_CODE %} -{% load custom_tags %} +{% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} {% load custom_tags %} + \ No newline at end of file From 391d123f31bc821be5485b801c7d5a0139be9970 Mon Sep 17 00:00:00 2001 From: ARvind Tiwari Date: Sat, 29 Jul 2017 18:37:56 +0530 Subject: [PATCH 3/4] nav js modified --- datacenterlight/static/datacenterlight/js/main.js | 8 ++------ .../templates/datacenterlight/includes/_navbar.html | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index 44b92a0c..5594fe11 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -91,16 +91,12 @@ var href = $(this).attr('data-url'); $('.navbar-collapse').removeClass('in'); $('.navbar-collapse').addClass('collapsing'); - var url = window.location.pathname; - var urlSplit = url.split('/'); - if (urlSplit.length === 3 && urlSplit[2] === 'datacenterlight') { + if ($(href).length) { $('html, body').animate({ scrollTop: $(href).offset().top }, 1000); } else { - var allUrl = window.location.href; - var redirect = allUrl.split('whydatacenterlight') - window.location.href = '/en-us/datacenterlight' + href; + window.location.href = '/datacenterlight' + href; } }); } diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index 84358b4d..b32fe10d 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -33,7 +33,7 @@
  • - {% trans "Why Data Center Light?" %} + {% trans "Why Data Center Light?" %}
  • {% trans "Contact" %} From b28cbdc9401c963b1c70110d0a601477ce853ebf Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 30 Jul 2017 15:24:22 +0530 Subject: [PATCH 4/4] Updated Changelog for 1.0.22 --- Changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index b592a355..5ab95416 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -1.0.22: 2017-07-28 +1.0.22: 2017-07-30 * #3593: [datacenterlight] Removed underbars between social icons in index * #3509: [datacenterlight, hosting] Made navbar transparent and removed mobile navbar bug in login/signup/reset-password * #3592: [datacenterlight] Changed “Order Now” button text to “Continue/weiter” @@ -8,6 +8,8 @@ * #3604: [datacenterlight, hosting] Font colour change for better visibility in signup/login/password request footer links [all] Introduced ENABLE_DEBUG_LOGGING * #3542: [datacenterlight, hosting] Fixed warning messages and deprecated url + * #3603: [datacenterlight] Removed navbar language option dropdown + * #3629: [datacenterlight] Fixed navbar language switching bug 1.0.21: 2017-07-21 * #3591: [datacenterlight, payment] Fixed card holder name to appear on Confirm Order page * #3558: [datacenterlight] Changed font family and background color for header