Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Mm 29656 #7820

Merged
merged 8 commits into from
Apr 14, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PR remarks
  • Loading branch information
michelengelen committed Apr 6, 2021
commit 6682a80bbceccffd8268d93802501d70227bb271
70 changes: 50 additions & 20 deletions components/product_notices_modal/product_notices_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
}

.GenericModal__header {
padding: 0px;
padding: 0;
}

.GenericModal__body {
padding: 0px;
padding: 0;
}

.productNotices__helpText {
Expand All @@ -23,11 +23,11 @@
border: 1px solid var(--center-channel-color-16);
border-radius: 4px;
max-height: 347px;
margin: 20px auto 0px;
margin: 20px auto 0;
display: block;
}
.productNotices__imageDiv {
margin: 0px auto;
margin: 0 auto;
}

.modal-footer {
Expand Down Expand Up @@ -60,41 +60,54 @@

&.GenericModal .modal-footer {
position: relative;
padding: 0px;
padding: 0;
}
.GenericModal__button {
padding: 10px 16px;
display: inline-flex;
align-items: center;
border: none;
span {
font-size: 12px;
line-height: 9px;
}
padding: 13px 20px;
font-size: 14px;
line-height: 14px;

&.confirm {
background: var(--button-bg);
color: var(--button-color);

&:hover:not(.disabled) {
background: linear-gradient(0deg, rgba(var(--center-channel-color-rgb), 0.16), rgba(var(--center-channel-color-rgb), 0.16)), var(--button-bg);
background: linear-gradient(
0deg,
rgba(var(--center-channel-color-rgb), 0.16),
rgba(var(--center-channel-color-rgb), 0.16)
),
var(--button-bg);
}

&:active {
background: linear-gradient(0deg, rgba(var(--center-channel-color-rgb), 0.32), rgba(var(--center-channel-color-rgb), 0.32)), var(--button-bg);
background: linear-gradient(
0deg,
rgba(var(--center-channel-color-rgb), 0.32),
rgba(var(--center-channel-color-rgb), 0.32)
),
var(--button-bg);
}

&:focus {
box-shadow: inset 0 0 0 2px var(--sidebar-text-active-border);
}
}

&.cancel,
&.actionButton {
box-shadow: inset 0 0 0 1px var(--button-bg);
border-radius: 4px;
display: inline-block;
display: inline-flex;
align-items: center;
color: var(--button-bg);
background: var(--center-channel-bg);
text-decoration: none;

&:hover {
background: rgba(var(--button-bg-rgb), 0.04);
text-decoration: none;
}

&:active {
Expand All @@ -105,11 +118,28 @@
box-shadow: inset 0 0 0 2px var(--button-bg);
}
}
}

.fa {
width: 14px;
font-size: 14px;
margin-left: 5px;
&.actionButton {
box-shadow: inset 0 0 0 1px var(--button-bg);
}

&.cancel {
margin-right: 12px;
}

.fa {
width: 14px;
font-size: 14px;

// only target `.fa` that is the first child (left aligned icon)
&:first-child {
margin-right: 7px;
}
}

// only target `.fa` that follows a `span` (right aligned icon)
span ~ .fa {
margin-left: 7px;
}
}
}
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.