Updating UI for suggestions list
Этот коммит содержится в:
@@ -240,14 +240,18 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
|
|
||||||
const inputs = [
|
const inputs = [
|
||||||
<div key='userDisplayNameOptions'>
|
<div key='userDisplayNameOptions'>
|
||||||
<select
|
<div
|
||||||
className='form-control'
|
className='dropdown'
|
||||||
type='text'
|
|
||||||
value={this.state.selectedFont}
|
|
||||||
onChange={(e) => this.handleFont(e.target.value)}
|
|
||||||
>
|
>
|
||||||
{options}
|
<select
|
||||||
</select>
|
className='form-control'
|
||||||
|
type='text'
|
||||||
|
value={this.state.selectedFont}
|
||||||
|
onChange={(e) => this.handleFont(e.target.value)}
|
||||||
|
>
|
||||||
|
{options}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
<div><br/>{'Select the font displayed in the Mattermost user interface.'}</div>
|
<div><br/>{'Select the font displayed in the Mattermost user interface.'}</div>
|
||||||
</div>
|
</div>
|
||||||
];
|
];
|
||||||
@@ -305,12 +309,12 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
<div className='user-settings'>
|
<div className='user-settings'>
|
||||||
<h3 className='tab-header'>{'Display Settings'}</h3>
|
<h3 className='tab-header'>{'Display Settings'}</h3>
|
||||||
<div className='divider-dark first'/>
|
<div className='divider-dark first'/>
|
||||||
|
{fontSection}
|
||||||
|
<div className='divider-dark'/>
|
||||||
{clockSection}
|
{clockSection}
|
||||||
<div className='divider-dark'/>
|
<div className='divider-dark'/>
|
||||||
{nameFormatSection}
|
{nameFormatSection}
|
||||||
<div className='divider-dark'/>
|
<div className='divider-dark'/>
|
||||||
{fontSection}
|
|
||||||
<div className='divider-dark'/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -47,17 +47,19 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.emoticon-suggestion {
|
.emoticon-suggestion {
|
||||||
|
@include clearfix;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 36px;
|
height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
line-height: 36px;
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoticon-suggestion__image {
|
.emoticon-suggestion__image {
|
||||||
width: 32px;
|
width: 20px;
|
||||||
height: 32px;
|
height: 20px;
|
||||||
margin-right: 6px;
|
margin: 6px 6px 0 5px;
|
||||||
padding: 2px;
|
padding: 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user