diff --git a/Changelog b/Changelog
index 8442789d..46b2534b 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+next:
+ * bgfix: [all] Make /blog available on all domains
+ * #4367: [dcl] email logo resolution fix
+ * #4376: [cms] dcl promo section plugin link color changed to brighter shade
1.6.5: 2018-04-08
* #4396: [ungleich] add favicon to ungleich blog
* #4327: [dcl] fix navbar logo repeat
diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index 33bf6425..8e9f2c2d 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -1231,6 +1231,15 @@ footer {
background-position: center;
}
+.promo-section.promo-with-bg a {
+ color: #87B6EA;
+}
+
+.promo-section.promo-with-bg a:hover,
+.promo-section.promo-with-bg a:focus {
+ color: #77a6da;
+}
+
.promo-section h3 {
font-weight: 700;
font-size: 36px;
diff --git a/datacenterlight/static/datacenterlight/img/datacenterlight.png b/datacenterlight/static/datacenterlight/img/datacenterlight.png
index 1ae6ff53..9097af9b 100644
Binary files a/datacenterlight/static/datacenterlight/img/datacenterlight.png and b/datacenterlight/static/datacenterlight/img/datacenterlight.png differ
diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html
index 6e70100f..403482a4 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.html
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html
@@ -14,7 +14,7 @@
-
+
|
diff --git a/datacenterlight/templates/datacenterlight/emails/welcome_user.html b/datacenterlight/templates/datacenterlight/emails/welcome_user.html
index e947ac97..f18f9750 100644
--- a/datacenterlight/templates/datacenterlight/emails/welcome_user.html
+++ b/datacenterlight/templates/datacenterlight/emails/welcome_user.html
@@ -14,7 +14,7 @@
-
+
|
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index ec43d1a5..edb7e3b7 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -67,6 +67,7 @@ urlpatterns += i18n_patterns(
include('ungleich_page.urls',
namespace='ungleich_page'),
name='ungleich_page'),
+ url(r'^blog/', include('djangocms_blog.urls', namespace='djangocms_blog')),
)
urlpatterns += [
diff --git a/hosting/templates/hosting/emails/new_booked_vm.html b/hosting/templates/hosting/emails/new_booked_vm.html
index b80aebe0..7bc0cf3a 100644
--- a/hosting/templates/hosting/emails/new_booked_vm.html
+++ b/hosting/templates/hosting/emails/new_booked_vm.html
@@ -14,7 +14,7 @@
-
+
|
diff --git a/hosting/templates/hosting/emails/password_reset_email.html b/hosting/templates/hosting/emails/password_reset_email.html
index 57831228..c7c1310a 100644
--- a/hosting/templates/hosting/emails/password_reset_email.html
+++ b/hosting/templates/hosting/emails/password_reset_email.html
@@ -14,7 +14,7 @@
-
+
|
diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html
index 3142f6bc..9c2ec4c2 100644
--- a/hosting/templates/hosting/emails/vm_canceled.html
+++ b/hosting/templates/hosting/emails/vm_canceled.html
@@ -14,7 +14,7 @@
-
+
|
diff --git a/hosting/templates/hosting/emails/vm_charged.html b/hosting/templates/hosting/emails/vm_charged.html
index 33568d05..3a6c4f95 100644
--- a/hosting/templates/hosting/emails/vm_charged.html
+++ b/hosting/templates/hosting/emails/vm_charged.html
@@ -74,7 +74,7 @@
@@ -100,7 +100,7 @@
- Your virtual machine {{vm.name}} subscription has been charged, you can view your invoice clicking on the button below.
+ Your virtual machine {{vm.name}} subscription has been charged, you can view your invoice clicking on the button below.
|