diff --git a/Changelog b/Changelog index 537af052..088f7ab1 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +1.5.5: 2018-03-22 + * #4278: [dcl cms] edit options for cms navbar and header plugins + * bgfix: [dcl cms] fix link plugin issues and section image alignment 1.5.4: 2018-03-17 * bgfix: [dcl cms] update DCLNavbarPlugin to allow change of brand logo and url 1.5.3: 2018-03-16 diff --git a/datacenterlight/cms_models.py b/datacenterlight/cms_models.py index df54589e..627c49ba 100644 --- a/datacenterlight/cms_models.py +++ b/datacenterlight/cms_models.py @@ -132,6 +132,10 @@ class DCLNavbarPluginModel(CMSPlugin): related_name="dcl_navbar_logo_dark", ) logo_url = models.URLField(max_length=300, null=True, blank=True) + language_dropdown = models.BooleanField( + default=True, + help_text='Select to include the language selection dropdown.' + ) def get_logo_dark(self): # used only if atleast one logo exists diff --git a/datacenterlight/migrations/0014_dclnavbarpluginmodel_language_dropdown.py b/datacenterlight/migrations/0014_dclnavbarpluginmodel_language_dropdown.py new file mode 100644 index 00000000..2c5e6306 --- /dev/null +++ b/datacenterlight/migrations/0014_dclnavbarpluginmodel_language_dropdown.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2018-03-19 20:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('datacenterlight', '0013_dclnavbarpluginmodel'), + ] + + operations = [ + migrations.AddField( + model_name='dclnavbarpluginmodel', + name='language_dropdown', + field=models.BooleanField(default=True, help_text='Select to include the language selection dropdown.'), + ), + ] diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 2779b8c7..5ff6ed1d 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -58,6 +58,16 @@ textarea { min-width: 180px; } +.lead { + font-size: 18px; +} + +@media (min-width: 768px) { + .lead { + font-size: 21px; + } +} + /* Top navbar */ @@ -435,17 +445,20 @@ textarea { } .split-section.left .split-description { -/* width: 90%; */ margin-right: auto; } .split-section .split-description .lead { color: #3a3a3a; - font-size: 21px; } -.split-section .space .split-description .lead { - font-size: 20px; +@media (min-width: 768px) { + .split-section .split-description .lead { + font-size: 21px; + } + .split-section .space .split-description .lead { + font-size: 20px; + } } .split-section.right .split-description { @@ -542,6 +555,7 @@ textarea { padding-top: 20px; display: inline-block; color: #999 !important; + word-break: break-all; } .price-calc-section .card { @@ -770,17 +784,11 @@ textarea { .ssdimg { margin: 0 15px; - /* vertical-align: middle; */ - /* display: inline-block; */ -} - -.ssdimg img { - max-width: 125px; } @media (max-width: 767px) { .ssdimg img { - width: 100px; + max-height: 120px; } } @@ -1196,7 +1204,7 @@ footer { max-width: 430px; } .flex-row-rev .desc-text { - max-width: 710px; + max-width: 600px; text-align: left; } .flex-row-rev .percent-text { diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index 10412824..5e919045 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -107,10 +107,14 @@ var href = $(this).attr('href'); $('.navbar-collapse').removeClass('in'); $('.navbar-collapse').addClass('collapsing'); - if ($(href).length) { - $('html, body').animate({ - scrollTop: $(href).offset().top - 50 - }, 1000); + if (href[0] === "#") { + if ($(href).length) { + $('html, body').animate({ + scrollTop: $(href).offset().top - 50 + }, 1000); + } + } else if (href) { + window.location = href; } }); } diff --git a/datacenterlight/templates/datacenterlight/cms/contact.html b/datacenterlight/templates/datacenterlight/cms/contact.html index 2cf77efb..33dc9034 100644 --- a/datacenterlight/templates/datacenterlight/cms/contact.html +++ b/datacenterlight/templates/datacenterlight/cms/contact.html @@ -1,4 +1,4 @@ -
+
@@ -40,4 +40,4 @@
-
\ No newline at end of file +
diff --git a/datacenterlight/templates/datacenterlight/cms/navbar.html b/datacenterlight/templates/datacenterlight/cms/navbar.html index fdb28529..bfa3e086 100644 --- a/datacenterlight/templates/datacenterlight/cms/navbar.html +++ b/datacenterlight/templates/datacenterlight/cms/navbar.html @@ -10,13 +10,12 @@ - {% url 'datacenterlight:index' as default_logo_url %} {% if instance.logo_dark or instance.logo_light %} - - + + {% else %} - - + + {% endif %}