Multiple bug fixes (#7243)
* PLT-7320 - Fixing alignment of x icon * PLT-7357 - Fixing close icon in compact view * PLT-7322 - Fixing overflow for delete token modal * PLT-7351 - Fixing flag icon alignment * PLT-7393 - Fixing cursor on upload button * PLT-7392 - Fixing scrollbar in admin console * PLT-7376 - Fixing hover effect for mobile nav
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
f720288c10
Коммит
b60cc5b28e
@@ -29,13 +29,17 @@ export default class AdminSidebar extends React.Component {
|
|||||||
this.updateTitle();
|
this.updateTitle();
|
||||||
|
|
||||||
if (!Utils.isMobile()) {
|
if (!Utils.isMobile()) {
|
||||||
$('.admin-sidebar .nav-pills__container').perfectScrollbar();
|
$('.admin-sidebar .nav-pills__container').perfectScrollbar({
|
||||||
|
suppressScrollX: true
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidUpdate() {
|
componentDidUpdate() {
|
||||||
if (!Utils.isMobile()) {
|
if (!Utils.isMobile()) {
|
||||||
$('.admin-sidebar .nav-pills__container').perfectScrollbar();
|
$('.admin-sidebar .nav-pills__container').perfectScrollbar({
|
||||||
|
suppressScrollX: true
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1066,7 +1066,7 @@ export default class SecurityTab extends React.Component {
|
|||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
confirmMessage: (
|
confirmMessage: (
|
||||||
<div className='alert alert-danger'>
|
<div className='alert alert-danger word-break--all'>
|
||||||
<FormattedHTMLMessage
|
<FormattedHTMLMessage
|
||||||
id='user.settings.tokens.confirmDeleteMessage'
|
id='user.settings.tokens.confirmDeleteMessage'
|
||||||
defaultMessage='Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the {description} token?'
|
defaultMessage='Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the {description} token?'
|
||||||
|
|||||||
@@ -139,6 +139,10 @@
|
|||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
width: 32px;
|
width: 32px;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
svg {
|
svg {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: 5px;
|
top: 5px;
|
||||||
|
|||||||
@@ -733,6 +733,24 @@
|
|||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.attachment {
|
||||||
|
.attachment__body__wrap {
|
||||||
|
.btn-close {
|
||||||
|
left: -2px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.post--comment {
|
||||||
|
.attachment {
|
||||||
|
.attachment__body__wrap {
|
||||||
|
.btn-close {
|
||||||
|
left: -13px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.status-wrapper {
|
.status-wrapper {
|
||||||
cursor: auto;
|
cursor: auto;
|
||||||
height: 14px;
|
height: 14px;
|
||||||
@@ -942,6 +960,14 @@
|
|||||||
border-color: $yellow;
|
border-color: $yellow;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.attachment {
|
||||||
|
.attachment__body__wrap {
|
||||||
|
.btn-close {
|
||||||
|
left: -11px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.same--root {
|
&.same--root {
|
||||||
|
|||||||
@@ -358,7 +358,7 @@
|
|||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
|
|
||||||
.flag-icon__container {
|
.flag-icon__container {
|
||||||
left: -19px;
|
left: -21px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 4px;
|
top: 4px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,8 +123,10 @@
|
|||||||
|
|
||||||
input {
|
input {
|
||||||
@include opacity(0);
|
@include opacity(0);
|
||||||
|
cursor: pointer;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
padding-left: 100%;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@@ -355,7 +357,7 @@
|
|||||||
.nav-pills__container {
|
.nav-pills__container {
|
||||||
@include font-smoothing(initial);
|
@include font-smoothing(initial);
|
||||||
background: #111;
|
background: #111;
|
||||||
height: calc(100% - 50px);
|
height: calc(100% - 68px);
|
||||||
margin-top: 1px;
|
margin-top: 1px;
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user