Multiple Ui Improvements
Этот коммит содержится в:
@@ -113,7 +113,15 @@ export default class GitLabSettings extends React.Component {
|
||||
/>
|
||||
{'false'}
|
||||
</label>
|
||||
<p className='help-text'>{'When true, Mattermost allows team creation and account signup using GitLab OAuth. To configure, log in to your GitLab account and go to Applications -> Profile Settings. Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". Then use "Secret" and "Id" fields to complete the options below.'}</p>
|
||||
<p className='help-text'>
|
||||
{'When true, Mattermost allows team creation and account signup using GitLab OAuth.'} <br/>
|
||||
</p>
|
||||
<ol className='help-text'>
|
||||
<li>{'Log in to your GitLab account and go to Applications -> Profile Settings.'}</li>
|
||||
<li>{'Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". '}</li>
|
||||
<li>{'Then use "Secret" and "Id" fields from GitLab to complete the options below.'}</li>
|
||||
<li>{'Complete the Endpoint URLs below. '}</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -150,6 +150,7 @@ export default class PostInfo extends React.Component {
|
||||
<ul className='post-header post-info'>
|
||||
<li className='post-header-col'>
|
||||
<OverlayTrigger
|
||||
container={this}
|
||||
placement='top'
|
||||
overlay={tooltip}
|
||||
>
|
||||
|
||||
@@ -178,7 +178,7 @@ export default class UserSettingsAppearance extends React.Component {
|
||||
href='#'
|
||||
onClick={this.submitTheme}
|
||||
>
|
||||
{'Submit'}
|
||||
{'Save'}
|
||||
</a>
|
||||
<a
|
||||
className='btn btn-sm theme'
|
||||
|
||||
@@ -117,6 +117,9 @@
|
||||
.form-group {
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
ul, ol {
|
||||
padding-left: 23px;
|
||||
}
|
||||
.help-text {
|
||||
margin: 10px 0 0 15px;
|
||||
color: #777;
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
z-index: 6;
|
||||
}
|
||||
.post-list {
|
||||
.new-messages-hr {
|
||||
|
||||
@@ -147,12 +147,12 @@ body.ios {
|
||||
&::-webkit-scrollbar {
|
||||
width: 0px !important;
|
||||
}
|
||||
&.inactive {
|
||||
display: none;
|
||||
}
|
||||
&.active {
|
||||
display: inline;
|
||||
}
|
||||
&.inactive {
|
||||
display: none;
|
||||
}
|
||||
&.active {
|
||||
display: inline;
|
||||
}
|
||||
}
|
||||
.post-list__table {
|
||||
display: table;
|
||||
@@ -407,6 +407,8 @@ body.ios {
|
||||
display: none;
|
||||
}
|
||||
.post-body {
|
||||
position: relative;
|
||||
z-index: 5;
|
||||
max-width: 100%;
|
||||
width: 600px;
|
||||
float: left;
|
||||
@@ -431,10 +433,13 @@ body.ios {
|
||||
}
|
||||
}
|
||||
.post-header {
|
||||
position: relative;
|
||||
list-style-type: none;
|
||||
margin: 0 0 1px;
|
||||
padding-left: 0px;
|
||||
&.post-header-post {
|
||||
position: relative;
|
||||
z-index: 5;
|
||||
width: 200px;
|
||||
text-align: right;
|
||||
float: left;
|
||||
@@ -519,9 +524,9 @@ body.ios {
|
||||
}
|
||||
|
||||
.bot-indicator {
|
||||
background-color: lightgrey;
|
||||
border-radius:2px;
|
||||
padding-left:2px;
|
||||
padding-right:2px;
|
||||
font-family:"Courier New"
|
||||
background-color: lightgrey;
|
||||
border-radius:2px;
|
||||
padding-left:2px;
|
||||
padding-right:2px;
|
||||
font-family:"Courier New"
|
||||
}
|
||||
|
||||
@@ -73,6 +73,10 @@
|
||||
display: inline;
|
||||
.post-info {
|
||||
display: inline;
|
||||
.tooltip {
|
||||
margin-top: -25px;
|
||||
margin-left: 40px;
|
||||
}
|
||||
.post-profile-time {
|
||||
margin: 0;
|
||||
}
|
||||
@@ -153,6 +157,10 @@
|
||||
display: inline;
|
||||
.post-info {
|
||||
display: inline;
|
||||
.tooltip {
|
||||
margin-top: -25px;
|
||||
margin-left: 40px;
|
||||
}
|
||||
.post-profile-time {
|
||||
width: auto;
|
||||
margin: 0;
|
||||
@@ -327,6 +335,7 @@
|
||||
}
|
||||
.modal-title {
|
||||
float: none;
|
||||
max-width: 90%;
|
||||
}
|
||||
.btn {
|
||||
&.btn-primary {
|
||||
|
||||
Ссылка в новой задаче
Block a user