Merge branch 'master' into PLT-2115

4 files changed, 36 insertions, 23 deletions

diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss
index f782da36b..76081710f 100644
--- a/web/sass-files/sass/partials/_admin-console.scss
+++ b/web/sass-files/sass/partials/_admin-console.scss
@@ -145,12 +145,27 @@
             .form-group {
                 margin-bottom: 25px;
             }
+            .file__upload {
+                position: relative;
+                margin: 0 10px 10px 0;
+                display: inline-block;
+                input {
+                    position: absolute;
+                    @include opacity(0);
+                    width: 100%;
+                    height: 100%;
+                    z-index: 5;
+                    top: 0;
+                    left: 0;
+                }
+            }
             .help-text {
+                &.no-margin {
+                    margin: 0;
+                }
                 ul, ol {
                     padding-left: 23px;
                 }
-            }
-            .help-text {
                 margin: 10px 0 0 15px;
                 color: #777;
                 .help-link {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 39cebe856..209f8e27f 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -58,23 +58,27 @@ body.ios {
 		box-shadow: none;
 		white-space: normal;
 	}
-	.textbox-help-link {
+	.help__text {
+		right: 0;
 		position: absolute;
 		z-index: 3;
 		bottom: -23px;
 		font-size: 13px;
 		cursor: pointer;
 	}
-	.textbox-help-link {
-		right: 0;
+	.textbox-preview-link {
+		margin-right: 8px;
 	}
 	min-height:36px;
 }
 
 .help_format_text {
+	display: none !important;
 	position: absolute;
 	bottom: -23px;
-	right: 40px;
+	left: 0px;
+	overflow: hidden;
+	text-overflow: ellipsis;
 	font-size: 0.85em;
 	@include opacity(0);
 	@include single-transition(all 0.2s ease);
@@ -391,15 +395,16 @@ body.ios {
 			top: -5px;
 			position: relative;
 		}
-		.msg-typing {
-			min-height: 25px;
-			display: block;
-			@include opacity(0.7);
-			white-space: nowrap;
-			width: 80%;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
+	}
+	.msg-typing {
+		display: block;
+		@include opacity(0.7);
+		white-space: nowrap;
+		margin-bottom: 5px;
+		overflow: hidden;
+		font-size: 0.95em;
+		text-overflow: ellipsis;
+		height: 20px;
 	}
 }
 
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index a9a572768..06ce17041 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -573,8 +573,7 @@
             .glyphicon-refresh-animate {
                 right: 33px;
                 top: 15px;
-                color: #fff;
-                color: rgba(255,255,255,0.5);
+                color: #aaa;
             }
             .form-control {
                 border: none;
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 5e7f04724..44681291c 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -24,12 +24,6 @@
         padding: 1em 1em 0;
         display: none;
     }
-    > div {
-        height: 100%;
-        position: absolute;
-        padding-bottom: 70px;
-        width: 100%;
-    }
     .badge {
         background-color: $primary-color;
         position: absolute;