MM-58854 Update how Compass icons are referenced by AnnouncementBar (#27461)
Automatic Merge
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
b9e501e285
Коммит
70b218839f
@@ -140,16 +140,6 @@
|
|||||||
fill: currentColor;
|
fill: currentColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__icon {
|
|
||||||
display: inline-flex;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
font-family: "compass-icons";
|
|
||||||
font-size: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__cell {
|
&__cell {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ exports[`components/TextDismissableBar should match snapshot 1`] = `
|
|||||||
message={
|
message={
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<i
|
<i
|
||||||
className="icon-information-outline"
|
className="icon icon-information-outline"
|
||||||
/>
|
/>
|
||||||
<Memo(Connect(Markdown))
|
<Memo(Connect(Markdown))
|
||||||
message="sample text"
|
message="sample text"
|
||||||
@@ -32,7 +32,7 @@ exports[`components/TextDismissableBar should match snapshot, with an internal a
|
|||||||
message={
|
message={
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<i
|
<i
|
||||||
className="icon-information-outline"
|
className="icon icon-information-outline"
|
||||||
/>
|
/>
|
||||||
<Memo(Connect(Markdown))
|
<Memo(Connect(Markdown))
|
||||||
message="A [link](http://testurl.com/admin_console/) with an internal url and a [link](http://other-url.com/admin_console/) with an external url"
|
message="A [link](http://testurl.com/admin_console/) with an internal url and a [link](http://other-url.com/admin_console/) with an external url"
|
||||||
@@ -58,7 +58,7 @@ exports[`components/TextDismissableBar should match snapshot, with an internal u
|
|||||||
message={
|
message={
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<i
|
<i
|
||||||
className="icon-information-outline"
|
className="icon icon-information-outline"
|
||||||
/>
|
/>
|
||||||
<Memo(Connect(Markdown))
|
<Memo(Connect(Markdown))
|
||||||
message="A [link](http://testurl.com/admin_console/) with an internal url"
|
message="A [link](http://testurl.com/admin_console/) with an internal url"
|
||||||
@@ -84,7 +84,7 @@ exports[`components/TextDismissableBar should match snapshot, with ean external
|
|||||||
message={
|
message={
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<i
|
<i
|
||||||
className="icon-information-outline"
|
className="icon icon-information-outline"
|
||||||
/>
|
/>
|
||||||
<Memo(Connect(Markdown))
|
<Memo(Connect(Markdown))
|
||||||
message="A [link](http://otherurl.com/admin_console/) with an external url"
|
message="A [link](http://otherurl.com/admin_console/) with an external url"
|
||||||
@@ -110,7 +110,7 @@ exports[`components/TextDismissableBar should match snapshot, with link but with
|
|||||||
message={
|
message={
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<i
|
<i
|
||||||
className="icon-information-outline"
|
className="icon icon-information-outline"
|
||||||
/>
|
/>
|
||||||
<Memo(Connect(Markdown))
|
<Memo(Connect(Markdown))
|
||||||
message="A [link](http://testurl.com/admin_console/)"
|
message="A [link](http://testurl.com/admin_console/)"
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ export default class AnnouncementBar extends React.PureComponent<Props, State> {
|
|||||||
|
|
||||||
const announcementIcon = () => {
|
const announcementIcon = () => {
|
||||||
return this.props.showLinkAsButton &&
|
return this.props.showLinkAsButton &&
|
||||||
(this.props.showCloseButton ? <div className='content__icon'>{'\uF5D6'}</div> : <div className='content__icon'>{'\uF02A'}</div>);
|
(this.props.showCloseButton ? <i className='icon icon-alert-circle-outline'/> : <i className='icon icon-alert-outline'/>);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ export default class TextDismissableBar extends React.PureComponent<Props, State
|
|||||||
handleClose={this.handleDismiss}
|
handleClose={this.handleDismiss}
|
||||||
message={
|
message={
|
||||||
<>
|
<>
|
||||||
<i className='icon-information-outline'/>
|
<i className='icon icon-information-outline'/>
|
||||||
{typeof text === 'string' ? (
|
{typeof text === 'string' ? (
|
||||||
<Markdown
|
<Markdown
|
||||||
message={text}
|
message={text}
|
||||||
|
|||||||
@@ -160,11 +160,6 @@ button.custom_status__row {
|
|||||||
padding: 4px 8px;
|
padding: 4px 8px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
|
|
||||||
.icon > i:not(.status-icon) {
|
|
||||||
color: rgba(var(--center-channel-color-rgb), 0.64);
|
|
||||||
font-family: "compass-icons";
|
|
||||||
}
|
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background: var(--sidebar-text-08);
|
background: var(--sidebar-text-08);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|||||||
@@ -87,10 +87,7 @@
|
|||||||
content: "\00a0 ";
|
content: "\00a0 ";
|
||||||
}
|
}
|
||||||
|
|
||||||
.content__icon,
|
.icon {
|
||||||
i {
|
|
||||||
margin-right: 4px;
|
|
||||||
font-family: 'compass-icons';
|
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user