From c1b7015a5a6ebd7382706b16c7e6d4101bba081c Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Thu, 25 Feb 2016 21:14:56 +0500
Subject: Multiple UI Improvements

---
 web/react/components/rename_channel_modal.jsx | 1 -
 web/react/utils/utils.jsx                     | 2 +-
 web/sass-files/sass/partials/_modal.scss      | 5 -----
 web/sass-files/sass/partials/_post.scss       | 4 ++++
 web/sass-files/sass/partials/_post_right.scss | 3 +--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx
index 49ebccdbb..e96ff0db2 100644
--- a/web/react/components/rename_channel_modal.jsx
+++ b/web/react/components/rename_channel_modal.jsx
@@ -229,7 +229,6 @@ export default class RenameChannelModal extends React.Component {
         let readOnlyHandleInput = false;
         if (this.state.channelName === Constants.DEFAULT_CHANNEL) {
             handleInputLabel += formatMessage(holders.defaultError);
-            handleInputClass += ' disabled-input';
             readOnlyHandleInput = true;
         }
 
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 41d93174e..38516fae2 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -737,7 +737,7 @@ export function applyTheme(theme) {
         changeCss('.post:hover, .modal .more-table tbody>tr:hover td, .settings-modal .settings-table .settings-content .section-min:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
         changeCss('.date-separator.hovered--before:after, .date-separator.hovered--after:before, .new-separator.hovered--after:before, .new-separator.hovered--before:after', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
         changeCss('.command-name:hover, .mentions-name:hover, .suggestion--selected, .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover, .bot-indicator', 'background:' + changeOpacity(theme.centerChannelColor, 0.15), 1);
-        changeCss('code', 'background:' + changeOpacity(theme.centerChannelColor, 0.1), 1);
+        changeCss('code, .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control', 'background:' + changeOpacity(theme.centerChannelColor, 0.1), 1);
         changeCss('@media(min-width: 960px){.post.current--user:hover .post__body ', 'background: none;', 1);
         changeCss('.sidebar--right', 'color:' + theme.centerChannelColor, 2);
         changeCss('.search-help-popover .search-autocomplete__item:hover, .settings-modal .settings-table .settings-content .appearance-section .theme-elements__body', 'background:' + changeOpacity(theme.centerChannelColor, 0.05), 1);
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 9d4e62bc3..2136b9ffb 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -9,7 +9,6 @@
 }
 .more-table {
 	margin: 0;
-	table-layout: fixed;
 	p {
 		font-size: 0.9em;
 		overflow: hidden;
@@ -57,12 +56,8 @@
 				&.td--action {
 					text-align: right;
 					padding: 8px 15px 8px 8px;
-					width: 80px;
 					vertical-align: middle;
 					position: relative;
-					&.lg {
-						width: 110px;
-					}
 				}
 			}
 		}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 5d0985fc0..710560181 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -383,6 +383,10 @@ body.ios {
 			min-height: 25px;
 			display: block;
 			@include opacity(0.7);
+			white-space: nowrap;
+			width: 80%;
+			overflow: hidden;
+			text-overflow: ellipsis;
 		}
 	}
 }
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index 01be9e288..2b48fd2c2 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -75,8 +75,7 @@
 			min-width: 1px;
 			display: block;
 			height: 20px;
-			max-width: 200px;
-			@include clearfix;
+			max-width: 230px;
 		}
 		.post-create-footer {
 			width: 100%;
-- 
cgit v1.2.3-1-g7c22


From 7b82203a71253928ceb43bbd838b8edd4b5e7db3 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Thu, 25 Feb 2016 21:45:39 +0500
Subject: Adding scrollbar back again

---
 web/sass-files/sass/partials/_post.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 710560181..0847318c1 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -225,9 +225,6 @@ body.ios {
 		position: absolute;
 		height: 100%;
 		-webkit-overflow-scrolling: touch;
-		&::-webkit-scrollbar {
-			width: 0px !important;
-		}
 		&.active {
 			display: inline;
 		}
-- 
cgit v1.2.3-1-g7c22