diff options
| author | Corey Hulen <corey@hulen.com> | 2016-02-25 11:17:14 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-02-25 11:17:14 -0800 |
| commit | db6f4cb4c3c7336094cdb693e28e7d91d674ae1f (patch) | |
| tree | 12e0324005e576bf35d5dbdb2fdb203e6e432d4d /web/react | |
| parent | 3797ebdac72681c6815493e4791d7e2bb8adfa63 (diff) | |
| parent | 7b82203a71253928ceb43bbd838b8edd4b5e7db3 (diff) | |
| download | chat-db6f4cb4c3c7336094cdb693e28e7d91d674ae1f.tar.gz chat-db6f4cb4c3c7336094cdb693e28e7d91d674ae1f.tar.bz2 chat-db6f4cb4c3c7336094cdb693e28e7d91d674ae1f.zip | |
Merge pull request #2255 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/rename_channel_modal.jsx | 1 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 2 |
2 files changed, 1 insertions, 2 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); |