Merge branch 'master' into recfe

pull/5067/head
Liana Husikyan 3 months ago committed by GitHub
commit 1fb9c355bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 36
      apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css
  2. 2
      apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css
  3. 4
      libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx

@ -2507,12 +2507,12 @@ fieldset:disabled a.btn {
} }
.btn-warning { .btn-warning {
color: #915900; color: #ffffff;
background-color: #fbdf9f; background-color: #f1b513;
border-color: #fbdf9f; border-color: #f1b513;
} }
.btn-warning:hover { .btn-warning:hover {
color: #915900; color: #ffffff;
background-color: #ad632f; background-color: #ad632f;
border-color: #a35e2c; border-color: #a35e2c;
} }
@ -2523,15 +2523,15 @@ fieldset:disabled a.btn {
.btn-warning.disabled, .btn-warning.disabled,
.btn-warning:disabled { .btn-warning:disabled {
color: #fff; color: #fff;
background-color: #fbdf9f; background-color: #dabb68;
border-color: #fbdf9f; border-color: #dabb68;
} }
.btn-warning:not(:disabled):not(.disabled):active, .btn-warning:not(:disabled):not(.disabled):active,
.btn-warning:not(:disabled):not(.disabled).active, .btn-warning:not(:disabled):not(.disabled).active,
.show > .btn-warning.dropdown-toggle { .show > .btn-warning.dropdown-toggle {
color: #fff; color: #fff;
background-color: #a35e2c; background-color: #dabb68;
border-color: #99582a; border-color: #dabb68;
} }
.btn-warning:not(:disabled):not(.disabled):active:focus, .btn-warning:not(:disabled):not(.disabled):active:focus,
.btn-warning:not(:disabled):not(.disabled).active:focus, .btn-warning:not(:disabled):not(.disabled).active:focus,
@ -2766,13 +2766,13 @@ fieldset:disabled a.btn {
} }
.btn-outline-warning { .btn-outline-warning {
color: #fbdf9f; color: #f1b513;
border-color: #fbdf9f; border-color: #f1b513;
} }
.btn-outline-warning:hover { .btn-outline-warning:hover {
color: #fff; color: #fff;
background-color: #fbdf9f; background-color: #f1b513;
border-color: #fbdf9f; border-color: #f1b513;
} }
.btn-outline-warning:focus, .btn-outline-warning:focus,
.btn-outline-warning.focus { .btn-outline-warning.focus {
@ -2780,15 +2780,15 @@ fieldset:disabled a.btn {
} }
.btn-outline-warning.disabled, .btn-outline-warning.disabled,
.btn-outline-warning:disabled { .btn-outline-warning:disabled {
color: #fbdf9f; color: #f1b513;
background-color: transparent; background-color: transparent;
} }
.btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled):active,
.btn-outline-warning:not(:disabled):not(.disabled).active, .btn-outline-warning:not(:disabled):not(.disabled).active,
.show > .btn-outline-warning.dropdown-toggle { .show > .btn-outline-warning.dropdown-toggle {
color: #fff; color: #fff;
background-color: #fbdf9f; background-color: #f1b513;
border-color: #fbdf9f; border-color: #f1b513;
} }
.btn-outline-warning:not(:disabled):not(.disabled):active:focus, .btn-outline-warning:not(:disabled):not(.disabled):active:focus,
.btn-outline-warning:not(:disabled):not(.disabled).active:focus, .btn-outline-warning:not(:disabled):not(.disabled).active:focus,
@ -4793,7 +4793,7 @@ a.badge-info.focus {
.badge-warning { .badge-warning {
color: #b1270f; color: #b1270f;
background-color: #fbdf9f; background-color: #f1b513;
} }
a.badge-warning:hover, a.badge-warning:hover,
a.badge-warning:focus { a.badge-warning:focus {
@ -6188,7 +6188,7 @@ button.bg-info:focus {
} }
.bg-warning { .bg-warning {
background-color: #fbdf9f !important; background-color: #f1b513 !important;
} }
a.bg-warning:hover, a.bg-warning:hover,
@ -6300,7 +6300,7 @@ button.bg-dark:focus {
} }
.border-warning { .border-warning {
border-color: #fbdf9f !important; border-color: #f1b513 !important;
} }
.border-danger { .border-danger {

@ -6190,7 +6190,7 @@ button.bg-info:focus {
} }
.bg-warning { .bg-warning {
background-color: #edc464 !important; background-color: #bc8401 !important;
} }
a.bg-warning:hover, a.bg-warning:hover,

@ -22,9 +22,9 @@ export default function ScamDetails ({ refs, floatStyle, scamAlerts }: ScamDetai
className="px-1 ml-1 mb-1 d-flex w-25 alert alert-warning border border-warning" className="px-1 ml-1 mb-1 d-flex w-25 alert alert-warning border border-warning"
> >
<span className="align-self-center pl-4 mt-1"> <span className="align-self-center pl-4 mt-1">
<i style={{ fontSize: 'xxx-large', fontWeight: 'lighter' }} className="pr-2 far text-warning fa-exclamation-triangle"></i> <i style={{ fontSize: 'xxx-large', fontWeight: 'lighter' }} className="pr-2 far fa-exclamation-triangle"></i>
</span> </span>
<div className="d-flex flex-column text-warning"> <div className="d-flex flex-column">
{scamAlerts && scamAlerts.map((alert, index) => ( {scamAlerts && scamAlerts.map((alert, index) => (
<span className="pl-4 mt-1" key={`${alert.url}${index}`}> <span className="pl-4 mt-1" key={`${alert.url}${index}`}>
{alert.url.length < 1 ? <FormattedMessage id={`home.scamAlertText${index + 1}`} defaultMessage={alert.message} /> {alert.url.length < 1 ? <FormattedMessage id={`home.scamAlertText${index + 1}`} defaultMessage={alert.message} />

Loading…
Cancel
Save