diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-21 08:25:41 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-21 08:25:41 -0400 |
| commit | 4578138d578791cb1d403cb0fe4c0282a26e1a3a (patch) | |
| tree | c795200278f4772f426d9dd33a30de51e7555200 | |
| parent | f75777ac6f6eec77809e893329b125deaab15e0c (diff) | |
| parent | 5dbdc0ff763b971e782311ca11b1105fad90f0b1 (diff) | |
| download | chat-4578138d578791cb1d403cb0fe4c0282a26e1a3a.tar.gz chat-4578138d578791cb1d403cb0fe4c0282a26e1a3a.tar.bz2 chat-4578138d578791cb1d403cb0fe4c0282a26e1a3a.zip | |
Merge pull request #731 from asaadmahmoodspin/new-channel
Updating new channel UI
| -rw-r--r-- | web/react/components/new_channel_modal.jsx | 10 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_forms.scss | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx index fc7b8c183..1488a1431 100644 --- a/web/react/components/new_channel_modal.jsx +++ b/web/react/components/new_channel_modal.jsx @@ -107,8 +107,8 @@ export default class NewChannelModal extends React.Component { {channelSwitchText} </div> <div className={displayNameClass}> - <label className='col-sm-2 form__label control-label'>{'Name'}</label> - <div className='col-sm-10'> + <label className='col-sm-3 form__label control-label'>{'Name'}</label> + <div className='col-sm-9'> <input onChange={this.handleChange} type='text' @@ -121,7 +121,7 @@ export default class NewChannelModal extends React.Component { tabIndex='1' /> {displayNameError} - <p className='input__help'> + <p className='input__help dark'> {'Channel URL: ' + prettyTeamURL + this.props.channelData.name + ' ('} <a href='#' @@ -134,11 +134,11 @@ export default class NewChannelModal extends React.Component { </div> </div> <div className='form-group less'> - <div className='col-sm-2'> + <div className='col-sm-3'> <label className='form__label control-label'>{'Description'}</label> <label className='form__label light'>{'(optional)'}</label> </div> - <div className='col-sm-10'> + <div className='col-sm-9'> <textarea className='form-control no-resize' ref='channel_desc' diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss index 268576a98..c8b08f44d 100644 --- a/web/sass-files/sass/partials/_forms.scss +++ b/web/sass-files/sass/partials/_forms.scss @@ -5,9 +5,10 @@ .form__label { text-align: left; padding-right: 3px; - font-weight: bold; + font-weight: 600; font-size: 1.1em; &.light { + font-weight: normal; color: #999; font-size: 1.05em; font-style: italic; @@ -17,6 +18,9 @@ .input__help { color: #777; margin: 10px 0 0 10px; + &.dark { + color: #222; + } &.error { color: #a94442; } |