Skip to content

Commit

Permalink
Revise emergency banner colors and update code documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
rachidatecs committed Nov 14, 2024
1 parent 55cb076 commit c876071
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 9 deletions.
22 changes: 22 additions & 0 deletions src/registrar/assets/sass/_theme/_alerts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "uswds-core" as *;
@use "base" as *;

// Fixes some font size disparities with the Figma
Expand Down Expand Up @@ -29,3 +30,24 @@
.usa-alert__body--widescreen {
max-width: $widescreen-max-width !important;
}

.usa-site-alert--hot-pink {
.usa-alert {
background-color: $hot-pink;
border-left-color: $hot-pink;
.usa-alert__body {
color: color('base-darkest');
background-color: $hot-pink;
}
}
}

@supports ((-webkit-mask:url()) or (mask:url())) {
.usa-site-alert--hot-pink .usa-alert .usa-alert__body::before {
background-color: color('base-darkest');
}
}

.usa-site-alert--hot-pink .usa-alert .usa-alert__body::before {
background-image: url('../img/usa-icons-bg/error.svg');
}
1 change: 1 addition & 0 deletions src/registrar/assets/sass/_theme/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@use "cisa_colors" as *;

$widescreen-max-width: 1920px;
$hot-pink: #FFC3F9;

/* Styles for making visible to screen reader / AT users only. */
.sr-only {
Expand Down
2 changes: 1 addition & 1 deletion src/registrar/assets/sass/_theme/_uswds-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ in the form $setting: value,
/*---------------------------
## Emergency state
----------------------------*/
$theme-color-emergency: #FFC3F9,
$theme-color-emergency: "red-warm-60v",

/*---------------------------
# Input settings
Expand Down
13 changes: 10 additions & 3 deletions src/registrar/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,24 @@
{% endif %}

{% comment %}
Site banner / red alert banner / emergency banner / incident banner - Remove one of those includes and place outside the comment block to activate the banner.
<!-- Site banner / red alert banner / emergency banner / incident banner - Remove one of those includes and place outside the comment block to activate the banner.
DO NOT FORGET TO EDIT THE BANNER CONTENT -->

<!-- Red banner with exclamation mark in a circle: -->
{% include "includes/banner-error.html" %}

<!-- Blue banner with 'i'' mark in a circle: -->
{% include "includes/banner-info.html" %}

<!-- Marron banner with exclamation mark in a circle: -->
{% include "includes/banner-service-disruption.html" %}
{% include "includes/banner-site-alert.html" %}
{% include "includes/banner-system-outage.html" %}

<!-- Yellow banner with exclamation mark in a triangle: -->
{% include "includes/banner-warning.html" %}
{% endcomment %}

{% include "includes/banner-info.html" %}

<section class="usa-banner" aria-label="Official website of the United States government">
<div class="usa-accordion">
<header class="usa-banner__header">
Expand Down
4 changes: 3 additions & 1 deletion src/registrar/templates/includes/banner-error.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<div class="margin-y-0 {% if add_class %}{{ add_class }}{% endif %}" aria-label="Site alert">
<div class="usa-alert usa-alert--error">
<div class="usa-alert__body {% if is_widescreen_mode %}usa-alert__body--widescreen{% endif %}">
<h4 class="usa-alert__heading">Header</h4>
<h4 class="usa-alert__heading">
Header
</h4>
<p class="usa-alert__text maxw-none">
Text here
</p>
Expand Down
6 changes: 4 additions & 2 deletions src/registrar/templates/includes/banner-info.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<section class="usa-site-alert usa-site-alert--info margin-y-0 {% if add_class %}{{ add_class }}{% endif %}" aria-label="Site alert">
<div class="usa-alert">
<div class="usa-alert__body {% if is_widescreen_mode %}usa-alert__body--widescreen{% endif %}">
<h4 class="usa-alert__heading">Announcement:</h4>
<h4 class="usa-alert__heading">
Header
</h4>
<p class="usa-alert__text maxw-none">
Katherine & Rachid are now ruling the world!
Text here
</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="usa-site-alert usa-site-alert--emergency margin-y-0 {% if add_class %}{{ add_class }}{% endif %}" aria-label="Site alert">
<section class="usa-site-alert usa-site-alert--emergency usa-site-alert--hot-pink margin-y-0 {% if add_class %}{{ add_class }}{% endif %}" aria-label="Site alert">
<div class="usa-alert">
<div class="usa-alert__body {% if add_body_class %}{{ add_body_class }}{% endif %} {% if is_widescreen_mode %}usa-alert__body--widescreen{% endif %}">
<p class="usa-alert__text maxw-none">
Expand Down
4 changes: 3 additions & 1 deletion src/registrar/templates/includes/banner-warning.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<div class="margin-y-0 {% if add_class %}{{ add_class }}{% endif %}" aria-label="Site alert">
<div class="usa-alert usa-alert--warning">
<div class="usa-alert__body {% if is_widescreen_mode %}usa-alert__body--widescreen{% endif %}">
<h4 class="usa-alert__heading">Header</h4>
<h4 class="usa-alert__heading">
Header
</h4>
<p class="usa-alert__text maxw-none">
Text here
</p>
Expand Down

0 comments on commit c876071

Please sign in to comment.