mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Bug fixes (#5218)

Просмотр исходного кода 
* PLT-5319 - Fixing text alignment security modal

* PLT-5280 - Fixing add comment button in RHS mobile

* PLT-5397 - Fixing Floating timestamp on mobile

* PLT-5129 - Hiding formatting help text

* PLT-5242 - Adjusting team sidebar border on IE!!

* PLT-5226 - Placing settings toggle over header

* PLT-5222 - Placed team description tooltip on top

* PLT-5201 - Account settings overlap on mobile

* PLT-5138 - Adding bg to pending post actions

* PLT-5286 - Adjusting play button on youtube videos

* PLT-5313 - Adjusting space between emoji reactions

* PLT-5187 - Adjusting text in channel switcher

* PLT-5399 - Reverting button alignment in modal
Этот коммит содержится в:
Asaad Mahmood
2017-01-30 19:39:43 +05:00
коммит произвёл Corey Hulen
родитель 95e3395a3b
Коммит 8a0db428bb
15 изменённых файлов: 176 добавлений и 149 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
webapp/components/select_team/components/select_team_item.jsx
Просмотреть файл

@@ -49,7 +49,7 @@ export default class SelectTeamItem extends React.Component {
<OverlayTrigger
trigger={['hover', 'focus', 'click']}
delayShow={1000}
placement='left'
placement='top'
overlay={descriptionTooltip}
ref='descriptionOverlay'
>

4
webapp/components/setting_item_max.jsx
Просмотреть файл

@@ -49,7 +49,7 @@ export default class SettingItemMax extends React.Component {
submit = (
<input
type='submit'
className='btn btn-sm btn-primary pull-right'
className='btn btn-sm btn-primary'
href='#'
onClick={this.props.submit}
value={Utils.localizeMessage('setting_item_max.save', 'Save')}
@@ -88,7 +88,7 @@ export default class SettingItemMax extends React.Component {
{clientError}
{submit}
<a
className='btn btn-sm pull-right'
className='btn btn-sm'
href='#'
onClick={this.props.updateSection}
>

6
webapp/components/setting_item_min.jsx
Просмотреть файл

@@ -10,7 +10,7 @@ export default class SettingItemMin extends React.Component {
let editButton = null;
if (!this.props.disableOpen) {
editButton = (
<li className='col-sm-3 section-edit'>
<li className='col-xs-12 col-sm-3 section-edit'>
<a
className='theme'
href='#'
@@ -31,9 +31,9 @@ export default class SettingItemMin extends React.Component {
className='section-min'
onClick={this.props.updateSection}
>
<li className='col-sm-9 section-title'>{this.props.title}</li>
<li className='col-xs-12 col-sm-9 section-title'>{this.props.title}</li>
{editButton}
<li className='col-sm-12 section-describe'>{this.props.describe}</li>
<li className='col-xs-12 section-describe'>{this.props.describe}</li>
</ul>
);
}

4
webapp/components/setting_picture.jsx
Просмотреть файл

@@ -73,7 +73,7 @@ export default class SettingPicture extends React.Component {
/>
);
} else {
var confirmButtonClass = 'btn btn-sm pull-right';
var confirmButtonClass = 'btn btn-sm';
if (this.props.submitActive) {
confirmButtonClass += ' btn-primary';
} else {
@@ -132,7 +132,7 @@ export default class SettingPicture extends React.Component {
</span>
{confirmButton}
<a
className='btn btn-sm theme pull-right'
className='btn btn-sm theme'
href='#'
onClick={self.props.updateSection}
>

12
webapp/components/user_settings/user_settings_general.jsx
Просмотреть файл

@@ -355,7 +355,7 @@ class UserSettingsGeneralTab extends React.Component {
if (!emailEnabled) {
helpText = (
<div className='setting-list__hint text-danger'>
<div className='setting-list__hint col-sm-12 text-danger'>
<FormattedMessage
id='user.settings.general.emailHelp2'
defaultMessage='Email has been disabled by your System Administrator. No notification emails will be sent until it is enabled.'
@@ -437,7 +437,7 @@ class UserSettingsGeneralTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.general.emailGitlabCantUpdate'
defaultMessage='Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.'
@@ -455,7 +455,7 @@ class UserSettingsGeneralTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.general.emailGoogleCantUpdate'
defaultMessage='Login occurs through Google Apps. Email cannot be updated. Email address used for notifications is {email}.'
@@ -473,7 +473,7 @@ class UserSettingsGeneralTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.general.emailOffice365CantUpdate'
defaultMessage='Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.'
@@ -491,7 +491,7 @@ class UserSettingsGeneralTab extends React.Component {
key='oauthEmailInfo'
className='padding-bottom'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.general.emailLdapCantUpdate'
defaultMessage='Login occurs through AD/LDAP. Email cannot be updated. Email address used for notifications is {email}.'
@@ -509,7 +509,7 @@ class UserSettingsGeneralTab extends React.Component {
key='oauthEmailInfo'
className='padding-bottom'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.general.emailSamlCantUpdate'
defaultMessage='Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.'

12
webapp/components/user_settings/user_settings_security.jsx
Просмотреть файл

@@ -387,7 +387,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.security.passwordGitlabCantUpdate'
defaultMessage='Login occurs through GitLab. Password cannot be updated.'
@@ -401,7 +401,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.security.passwordLdapCantUpdate'
defaultMessage='Login occurs through AD/LDAP. Password cannot be updated.'
@@ -415,7 +415,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.security.passwordSamlCantUpdate'
defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so through your login provider.'
@@ -429,7 +429,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.security.passwordGoogleCantUpdate'
defaultMessage='Login occurs through Google Apps. Password cannot be updated.'
@@ -443,7 +443,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.security.passwordOffice365CantUpdate'
defaultMessage='Login occurs through Office 365. Password cannot be updated.'
@@ -834,7 +834,7 @@ export default class SecurityTab extends React.Component {
apps = (
<div className='padding-bottom x2 authorized-app'>
<div className='col-sm-12'>
<div className='setting-list__hint'>
<div className='setting-list__hint col-sm-12'>
<FormattedMessage
id='user.settings.security.noApps'
defaultMessage='No OAuth 2.0 Applications are authorized.'