Skip to content

Commit

Permalink
Merge branch 'main' into 2240-add-join-notify-to-the-main-nav
Browse files Browse the repository at this point in the history
  • Loading branch information
Beverly Nguyen authored and Beverly Nguyen committed Jan 7, 2025
2 parents 89ed314 + 1aa589b commit 227675c
Show file tree
Hide file tree
Showing 27 changed files with 24 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-project/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
python-version: "3.12.3"
- name: Install poetry
shell: bash
run: pip install poetry
run: pip install poetry==1.8.5
- name: Install application dependencies
shell: bash
run: make bootstrap
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ NVMSH := $(shell [ -f "$(HOME)/.nvm/nvm.sh" ] && echo "$(HOME)/.nvm/nvm.sh" || e

.PHONY: bootstrap
bootstrap: generate-version-file ## Set up everything to run the app
poetry self update
poetry self add poetry-dotenv-plugin
poetry lock --no-update
poetry install --sync --no-root
Expand Down
11 changes: 11 additions & 0 deletions app/assets/sass/uswds/_uswds-theme-custom-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,9 @@ li.linked-card:hover svg,
.usa-card__container {
align-items: center;
text-align: center;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
img {
margin: units(4) auto 0;
width: units(15);
Expand All @@ -965,9 +968,17 @@ li.linked-card:hover svg,
.usa-card__body {
margin-bottom: units(2);
}
.blue-bar {
background-color: #005eb8;
height: 1.3em;
width: 100%;
margin: 0;
border-radius: 0;
}
}
}


.contact-us-card {
border: 2px solid color("ink");
padding: units(2);
Expand Down
2 changes: 1 addition & 1 deletion app/templates/views/about/why-text-messaging.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2 id="improve-customer-experience">Improve customer experience</h2>
</p>
<p>
Texting not only helps programs reach people using a nearly-universal communication method, it is a cost effective
way to do so. With Notify.gov <a href="#">you can get started for free</a>, allowing you to try out
way to do so. With Notify.gov <a href="/join-notify">you can get started for free</a>, allowing you to try out
texting to complement your existing communications and outreach strategies.
</p>
<h2 id="what-texting-is-best-for">What texting is best for</h2>
Expand Down
8 changes: 4 additions & 4 deletions app/templates/views/join-notify.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ <h3 class="padding-bottom-3">Getting Started FAQs</h3>
{
"heading": "What if I need more than 250,000 messages?",
"p_text": "Plans that include additional messages for a fee will be available soon. We want to design these plans
based on our partners’ needs, so please <a href='mailto:[email protected]'>contact us</a> if you hope to be able to
based on our partners’ needs, so please <a class='use-link usa-link--external' href='mailto:[email protected]'>contact us</a> if you hope to be able to
send more messages. We’d like to talk with you.",
"position": "b-a1"
},
{
"heading": "What phone numbers can my agency send to?",
"p_text": "Right now, Notify.gov supports sending messages to North American numbers (+1). If you’d like to send to
international numbers, we want to <u>hear from you</u>.",
international numbers, we want to <a href='/contact'>hear from you</a>.",
"position": "b-a2",
},
{
Expand All @@ -146,7 +146,7 @@ <h3 class="padding-bottom-3">Getting Started FAQs</h3>
{
"heading": "Can we use API integrations with Notify?",
"p_text": "While public API integrations are not yet available, we are working on enabling these. If you're looking
for this feature <a href='/about/contact'>we want to hear from you</a>.",
for this feature <a href='/contact'>we want to hear from you</a>.",
"position": "b-a4",
},
{
Expand All @@ -164,7 +164,7 @@ <h3 class="padding-bottom-3">Getting Started FAQs</h3>
{
"heading": "My OGC is asking about consent, where can I get more information for them?",
"p_text": "Text message notifications are governed by the Telephone Consumer Protection Act. Different levels of
government have different consent requirements. Download and share our <a
government have different consent requirements. Download and share our <a class='use-link usa-link--external'
href='https://github.com/GSA/notifications-admin/files/15100120/TCPA.Overview_Notify.gov.pdf'>overview of the
TCPA</a> with your legal counsel as
a starting point.",
Expand Down
8 changes: 7 additions & 1 deletion app/templates/views/signedout.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ <h2 class="font-sans-xl margin-top-0">Key features</h2>
<ul class="usa-card-group display-flex margin-bottom-4">
<li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
<div class="usa-card__container">
<div class="blue-bar"></div>
<img
src="{{ asset_url('images/internet.svg') }}"
alt="Globe on top of a web browser"
Expand All @@ -80,6 +81,7 @@ <h3 class="font-heading-md">Web-based</h3>
</li>
<li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
<div class="usa-card__container">
<div class="blue-bar"></div>
<img
src="{{ asset_url('images/fast.svg') }}"
alt="Stopwatch with a notification speech bubble with a star inside"
Expand All @@ -94,6 +96,7 @@ <h3 class="font-heading-md">Fast and easy</h3>
</li>
<li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
<div class="usa-card__container">
<div class="blue-bar"></div>
<img
src="{{ asset_url('images/status.svg') }}"
alt="3 status messages, 2 successes and one failure"
Expand All @@ -110,6 +113,7 @@ <h3 class="font-heading-md">Track message delivery</h3>
<ul class="usa-card-group">
<li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
<div class="usa-card__container">
<div class="blue-bar"></div>
<img
src="{{ asset_url('images/translation.svg') }}"
alt="Speech bubbles with the letter A and the Chinese character for language"
Expand All @@ -126,6 +130,7 @@ <h3 class="font-heading-md">
</li>
<li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
<div class="usa-card__container">
<div class="blue-bar"></div>
<img
src="{{ asset_url('images/security.svg') }}"
alt="Lock with code icon inside on top of a web browser"
Expand All @@ -136,13 +141,14 @@ <h3 class="font-heading-md">Security and privacy</h3>
<div class="usa-card__body">
<p>
Limited data retention, encryption, and multi-factor
authentication protect user data and manage risk
authentication protect user data and manage risk with <br><a href="/about/security">our security efforts</a>
</p>
</div>
</div>
</li>
<li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
<div class="usa-card__container">
<div class="blue-bar"></div>
<img
src="{{ asset_url('images/send.svg') }}"
alt="Paper airplane and a notification icon with the number 1 inside"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 227675c

Please sign in to comment.