Merge pull request #2404 from asaadmahmoodspin/ui-improvements

Disabling help stuff and moving preview out of the help text.

2 files changed, 31 insertions, 24 deletions

diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 46900e436..c8c0c071e 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -194,7 +194,6 @@ export default class Textbox extends React.Component {
                         defaultMessage='>quote'
                     />
                 </span>
-                {previewLink}
             </div>
         );
 
@@ -230,16 +229,19 @@ export default class Textbox extends React.Component {
                 >
                 </div>
                 {helpText}
-                <a
-                    target='_blank'
-                    href='http://docs.mattermost.com/help/getting-started/messaging-basics.html'
-                    className='textbox-help-link'
-                >
-                    <FormattedMessage
-                        id='textbox.help'
-                        defaultMessage='Help'
-                    />
-                </a>
+                <div className='help__text'>
+                    {previewLink}
+                    <a
+                        target='_blank'
+                        href='http://docs.mattermost.com/help/getting-started/messaging-basics.html'
+                        className='textbox-help-link'
+                    >
+                        <FormattedMessage
+                            id='textbox.help'
+                            defaultMessage='Help'
+                        />
+                    </a>
+                </div>
             </div>
         );
     }
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;
 	}
 }