Merge branch 'module_blog' into dev

2016-09-20 15:34:44 +02:00
parent 8bd30d0301 65e9ca1c32
commit bbffbd5616
64 changed files with 692 additions and 357 deletions
@@ -14191,7 +14191,6 @@ img {

 .timeline > li {
 	position: relative;
-
 }

 .timeline > li:before,
@@ -14204,7 +14203,6 @@ img {
 	clear: both;
 }

-
 .timeline > li > .timeline-panel {
 	width: 46%;
 	float: left;
@@ -14250,7 +14248,7 @@ img {
 	top: 26px;
 	left: 50%;
 	margin-left: -14px;
-	background-color: #ddd;
+	background-color: #DDD;
 	z-index: 100;
 	border-radius: 50%;
 }
@@ -14349,6 +14347,7 @@ img {
 .ace-editor-container {
 	position: relative;
 }
+
 .ace-editor {
 	position: absolute !important;
 	width: 100%;
@@ -14365,6 +14364,10 @@ img {
 	padding: .5em;
 }

+.header-block img {
+	margin-right: 10px;
+}
+
 .truncate {
 	width: 90%;
 	white-space: nowrap;