Skip to content

Commit

Permalink
Merge branch 'develop' into fix-17100
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanml authored Jan 9, 2023
2 parents f54fc83 + b653b4f commit b6526e3
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions ui/components/app/hold-to-reveal-button/index.scss
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ $circle-stroke-width: 2px;
transition: 0.5s transform !important;

&:active {
background-color: var(--primary-1) !important;
background-color: var(--color-primary-default) !important;
transform: scale(1.05) !important;

.hold-to-reveal-button__circle-foreground {
@@ -103,13 +103,13 @@ $circle-stroke-width: 2px;
&__circle-background {
@extend .hold-to-reveal-button__circle-shared;

stroke: var(--primary-3);
stroke: var(--color-primary-alternative);
}

&__circle-foreground {
@extend .hold-to-reveal-button__circle-shared;

stroke: var(--ui-white);
stroke: var(--color-primary-inverse);
stroke-dasharray: $circle-circumference;
stroke-dashoffset: $circle-circumference;
transition: 1s stroke-dashoffset;
@@ -136,15 +136,15 @@ $circle-stroke-width: 2px;
}

&__circle-static-outer {
fill: var(--ui-white);
fill: var(--color-primary-inverse);
}

&__circle-static-inner-container {
animation: 0.125s collapse forwards;
}

&__circle-static-inner {
fill: var(--primary-1);
fill: var(--color-primary-default);
}

&__unlock-icon-container {
2 changes: 1 addition & 1 deletion ui/pages/send/send-content/send-content.component.js
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ export default class SendContent extends Component {
<ActionableMessage
type="danger"
useIcon
iconFillColor="#d73a49"
iconFillColor="var(--color-error-default)"
primaryActionV2={{
label: t('tooltipApproveButton'),
onClick: acknowledgeRecipientWarning,
2 changes: 1 addition & 1 deletion ui/pages/send/send.scss
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@
padding-right: 16px;

&__link {
color: var(--primary-1);
color: var(--color-primary-default);
}
}

0 comments on commit b6526e3

Please sign in to comment.