diff --git a/assets/css/dashboard/bottom-action-bar.scss b/assets/css/dashboard/bottom-action-bar.scss index eb69be04..9a9a98d3 100644 --- a/assets/css/dashboard/bottom-action-bar.scss +++ b/assets/css/dashboard/bottom-action-bar.scss @@ -1,4 +1,4 @@ -@use "../variables-screenplay-forms"; +@use "../variables"; .bottom-action-bar { position: absolute; @@ -18,7 +18,7 @@ } .forward { - background-color: variables-screenplay-forms.$form-check-input-checked-bg-color; + background-color: variables.$button-primary; color: black; &:hover { background-color: #72a4cd; diff --git a/assets/css/dashboard/new-pa-message/associate-alert-page.scss b/assets/css/dashboard/new-pa-message/associate-alert-page.scss index 69f5ccce..790c3bb4 100644 --- a/assets/css/dashboard/new-pa-message/associate-alert-page.scss +++ b/assets/css/dashboard/new-pa-message/associate-alert-page.scss @@ -1,4 +1,3 @@ -@use "../../variables-screenplay-forms"; @use "../../variables"; .alert-description { @@ -49,7 +48,7 @@ } .apply-button { - background-color: variables-screenplay-forms.$form-check-input-checked-bg-color; + background-color: variables.$button-primary; color: black; &:hover { diff --git a/assets/css/screenplay.scss b/assets/css/screenplay.scss index bc8b8722..da3e5492 100644 --- a/assets/css/screenplay.scss +++ b/assets/css/screenplay.scss @@ -1,10 +1,14 @@ @use "variables"; -$theme-colors: ( - "primary": variables.$theme-primary, +@use "bootstrap/scss/bootstrap" with ( + $primary: variables.$theme-primary, + // Overrides for Bootstrap's `$form-*` variables + $form-check-input-checked-color: variables.$dark-bg, + $form-check-input-checked-bg-color: variables.$button-primary, + $form-check-input-bg: variables.$dark-bg, + $form-check-input-border: 1px solid variables.$border-primary, + $form-feedback-invalid-color: variables.$text-error ); - -@use "bootstrap/scss/bootstrap"; @use "dashboard"; @use "dashboard/places-page"; @use "dashboard/alerts-page"; diff --git a/assets/css/variables-screenplay-forms.scss b/assets/css/variables-screenplay-forms.scss deleted file mode 100644 index 14f5dc3e..00000000 --- a/assets/css/variables-screenplay-forms.scss +++ /dev/null @@ -1,8 +0,0 @@ -@use "variables"; - -// Overrides for Bootstrap `$form-*` variables -$form-check-input-checked-color: #0f1417; -$form-check-input-checked-bg-color: #8ecdff; -$form-check-input-bg: #0f1417; -$form-check-input-border: 1px solid #8b9198; -$form-feedback-invalid-color: variables.$text-error;