Merge remote-tracking branch 'upstream/dev' into wiki

4 files changed, 24 insertions, 5 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 26321ab3c..b68517e25 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -5,6 +5,7 @@
 nav .badge {
 	position: relative;
 	top: -49px;
+	left: 2px;
 	float: left;
 	font-size: 10px;
 	line-height: 20px;
@@ -59,7 +60,8 @@ aside .nav-pills > li > a,
 	padding: 6px 10px;
 }
 
-.wall-item-tools .dropdown-menu {
+.wall-item-tools .dropdown-menu,
+.section-title-wrapper .dropdown-menu {
 	min-width: auto;
 }
 
diff --git a/view/css/conversation.css b/view/css/conversation.css
index b6e316121..68aa8bfbe 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -121,7 +121,7 @@ a.wall-item-name-link {
 }
 
 .wall-item-content {
-	overflow: auto;
+	overflow: hidden;
 }
 
 .wall-item-content h1,
@@ -316,4 +316,4 @@ code.inline-code {
 img.smiley.emoji:hover {
 	width: 32px;
 	height: 32px;
-}
\ No newline at end of file
+}
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 9bfea856d..af89e597d 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -30,5 +30,5 @@
 }
 
 .directory-collapse {
-		overflow: auto;
+	overflow: hidden;
 }
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index e81d115d4..4236b3dff 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -7,5 +7,22 @@
 }
 
 .channel-menu {
-    margin-top: 24px;
+	margin-top: 24px;
+}
+
+.zat-example {
+	color: red;
+}
+
+#atoken-index {
+	width: 100%;
+}
+
+#atoken-index td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+.atoken-index-tool {
+	padding: 7px 10px;
 }