summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorAsaad Mahmood <asaad@spinpunch.com>2016-02-08 20:29:04 +0500
committerAsaad Mahmood <asaad@spinpunch.com>2016-02-08 20:29:04 +0500
commit22656ac1ae003c47e8f16c79467dddc1b0ea9d12 (patch)
treefb0eeba6b3694167b895deca1882d993cc4a3d1d /web
parent96cb7345dafbf07027acb9dc05fc7d0808a4ac38 (diff)
downloadchat-22656ac1ae003c47e8f16c79467dddc1b0ea9d12.tar.gz
chat-22656ac1ae003c47e8f16c79467dddc1b0ea9d12.tar.bz2
chat-22656ac1ae003c47e8f16c79467dddc1b0ea9d12.zip
Multiple UI Improvements
Diffstat (limited to 'web')
-rw-r--r--web/react/components/user_settings/manage_command_hooks.jsx26
-rw-r--r--web/sass-files/sass/partials/_base.scss4
-rw-r--r--web/sass-files/sass/partials/_post.scss9
3 files changed, 27 insertions, 12 deletions
diff --git a/web/react/components/user_settings/manage_command_hooks.jsx b/web/react/components/user_settings/manage_command_hooks.jsx
index 948ab7885..d23d2957e 100644
--- a/web/react/components/user_settings/manage_command_hooks.jsx
+++ b/web/react/components/user_settings/manage_command_hooks.jsx
@@ -530,17 +530,19 @@ export default class ManageCommandCmds extends React.Component {
/>
</label>
<div className='padding-top'>
- <label>
- <input
- type='checkbox'
- checked={this.state.cmd.auto_complete}
- onChange={this.updateAutoComplete}
- />
- <FormattedMessage
- id='user.settings.cmds.auto_complete_help'
- defaultMessage='Show this command in autocomplete list'
- />
- </label>
+ <div className='checkbox'>
+ <label>
+ <input
+ type='checkbox'
+ checked={this.state.cmd.auto_complete}
+ onChange={this.updateAutoComplete}
+ />
+ <FormattedMessage
+ id='user.settings.cmds.auto_complete_help'
+ defaultMessage=' Show this command in autocomplete list'
+ />
+ </label>
+ </div>
</div>
</div>
<div className='padding-top x2'>
@@ -637,7 +639,7 @@ export default class ManageCommandCmds extends React.Component {
</div>
{addError}
</div>
- <div className='padding-top padding-bottom'>
+ <div className='padding-top x2 padding-bottom'>
<a
className={'btn btn-sm btn-primary'}
href='#'
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index a13689382..ee6a6b955 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -25,6 +25,10 @@ body {
}
}
+b, strong {
+ font-weight: 600;
+}
+
.inner__wrap {
height: 100%;
> .row.main {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index a018315e3..61eb636bc 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -570,11 +570,20 @@ body.ios {
li {
display: inline-block;
+ vertical-align: top;
}
.col__name {
margin-right: 7px;
font-weight: 600;
+
+ .user-popover {
+ max-width: 130px;
+ @include clearfix;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
}
.col__reply {