diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-02-23 14:56:23 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-02-23 14:56:23 -0500 |
commit | 6e0ce387a35cccb0ecc849936acab62e75e90128 (patch) | |
tree | b85e15766584ee479282d9e9a9e670758fe1e28e /web | |
parent | 0031c6fd1a4df621cbecfd2a2b3efe9a40cd49ce (diff) | |
parent | c907edde1ba97601d97fec8a86d7b307fc86e491 (diff) | |
download | chat-6e0ce387a35cccb0ecc849936acab62e75e90128.tar.gz chat-6e0ce387a35cccb0ecc849936acab62e75e90128.tar.bz2 chat-6e0ce387a35cccb0ecc849936acab62e75e90128.zip |
Merge pull request #2231 from asaadmahmoodspin/ui-improvements
Ui Improvements
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/login.jsx | 10 | ||||
-rw-r--r-- | web/react/components/setting_item_min.jsx | 6 | ||||
-rw-r--r-- | web/react/components/signup_user_complete.jsx | 10 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_signup.scss | 2 |
5 files changed, 15 insertions, 16 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 380790b8f..581b8e0b5 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -101,12 +101,10 @@ export default class Login extends React.Component { <div> {loginMessage} <div className='or__container'> - <span> - <FormattedMessage - id='login.or' - defaultMessage='or' - /> - </span> + <FormattedMessage + id='login.or' + defaultMessage='or' + /> </div> </div> ); diff --git a/web/react/components/setting_item_min.jsx b/web/react/components/setting_item_min.jsx index 868b7e1b2..cb2ee0d8f 100644 --- a/web/react/components/setting_item_min.jsx +++ b/web/react/components/setting_item_min.jsx @@ -8,7 +8,7 @@ export default class SettingItemMin extends React.Component { let editButton = null; if (!this.props.disableOpen) { editButton = ( - <li className='col-sm-2 section-edit'> + <li className='col-sm-3 section-edit'> <a className='theme' href='#' @@ -29,9 +29,9 @@ export default class SettingItemMin extends React.Component { className='section-min' onClick={this.props.updateSection} > - <li className='col-sm-10 section-title'>{this.props.title}</li> + <li className='col-sm-9 section-title'>{this.props.title}</li> {editButton} - <li className='col-sm-7 section-describe'>{this.props.describe}</li> + <li className='col-sm-9 section-describe'>{this.props.describe}</li> </ul> ); } diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index 740a7b166..dbec3d02d 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -351,12 +351,10 @@ class SignupUserComplete extends React.Component { <div> {signupMessage} <div className='or__container'> - <span> - <FormattedMessage - id='signup_user_completed.or' - defaultMessage='or' - /> - </span> + <FormattedMessage + id='signup_user_completed.or' + defaultMessage='or' + /> </div> </div> ); diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index c79b54922..8508ce6fc 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -354,6 +354,9 @@ border-radius: 0; font-weight: 400; position: relative; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } } diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index e9c872a6e..38ae14d7d 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -115,7 +115,7 @@ .signup-team-login { padding-bottom: 10px; - font-weight: 700; + font-weight: 600; } .signup-team__name { |