Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update modal footer html #1241

Merged
merged 6 commits into from
Sep 28, 2023
+49 −30
Merged

update modal footer html #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9fcf7bc
add external link in a form's modal footer
ryanwoldatwork Sep 28, 2023
69f6635
use icons instead of emojis for thumbs up/down
ryanwoldatwork Sep 28, 2023
9efb33b
ensure uswds abbr styles for embedded forms
ryanwoldatwork Sep 28, 2023
7280a3f
add usa-form class to form
ryanwoldatwork Sep 28, 2023
0c31644
.big-thumbs style for widget (modal embed)
ryanwoldatwork Sep 28, 2023
a94b3e9
no .usa-form yet
ryanwoldatwork Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/assets/stylesheets/site.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,10 @@ span.usa-hint.save-notice {
.question-options.icons .usa-checkbox__label {
text-align: center;
}

.question-options.big-thumbs .usa-radio__label::before {
display: none;
}
// end A-11 V2 customizations
}

Expand Down
4 changes: 3 additions & 1 deletion app/views/components/forms/_custom.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<% multi_section_question_number = 0 %>

<form action="<%= root_url %>touchpoints/<%= form.present? ? form.short_uuid : nil %>/submissions.json" method="POST">
<form
action="<%= root_url %>touchpoints/<%= form.present? ? form.short_uuid : nil %>/submissions.json"
method="POST">
<div class="touchpoints-form-body">
<%= hidden_field_tag :authenticity_token, form_authenticity_token if form.verify_csrf? -%>
<%= hidden_field_tag :fba_location_code, params[:location_code] %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/components/forms/_footer_banner.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="usa-banner">
<header class="usa-banner__header touchpoints-footer-banner">
<footer class="usa-banner__header touchpoints-footer-banner">
<div class="usa-banner__inner">
<div class="grid-col-auto">
<img class="usa-banner__header-flag" src="<%= image_url("us_flag_small.png") %>" alt="U.S. flag">
Expand All @@ -8,7 +8,7 @@
<p class="usa-banner__header-text">
<%= t :official_form %>
<%= t :provided_by %>
<a href="https://touchpoints.digital.gov" target="_blank" rel="noopener"><%= t 'touchpoints' %></a>
<a href="https://touchpoints.digital.gov" target="_blank" rel="noopener" class="usa-link--external"><%= t 'touchpoints' %></a>
<br>
<% if form.present? %>
<% if form.omb_approval_number.present? %>
Expand All @@ -23,5 +23,5 @@
</p>
</div>
</div>
</header>
</footer>
</div>
21 changes: 11 additions & 10 deletions app/views/components/forms/question_types/_big_thumbs_up_down_buttons.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</legend>
<%= render 'components/question_title', question: question %>

<div class="question-options" id="<%= question.answer_field.to_sym %>">
<div class="question-options big-thumbs" id="<%= question.answer_field.to_sym %>">
<div class="grid-row grid-gap-lg">
<% question.question_options.each_with_index do |option, index| %>
<div class="grid-col-6">
Expand All @@ -17,15 +17,16 @@
>
<% @option_id = "#{question.answer_field}_#{(index + 1).to_s}" %>
<%= radio_button_tag(@option_id, option.value, nil, { id: @option_id, name: question.answer_field, class: "usa-radio__input usa-radio__input--tile", required: question.is_required }) %>
<%= label_tag(@option_id, nil, class: "usa-radio__label font-sans-3xl text-center") do %><%= option.text %><% end %>
<% if ["OTHER", "OTRO"].include?(option.text.upcase) %>
<%= label_tag(nil, for: "#{question.answer_field}_other", class: "usa-input__label") do %><%= t 'form.enter_other_text' %><% end %>
<input type="text" name="<%= question.answer_field %>_other"
id="<%= question.answer_field %>_other"
data-option-id="<%= @option_id %>"
placeholder="<%= t 'form.enter_other_text' %>"
class="usa-input other-option" />
<br>
<%= label_tag(@option_id, nil, class: "usa-radio__label font-sans-3xl text-center") do %>
<% if option.text == "👍" || option.text.downcase == "yes" %>
<svg class="usa-icon margin-top-2" aria-hidden="true" focusable="false" role="img">
<use xlink:href="<%= asset_path "sprite.svg#thumb_up_alt" %>"></use>
</svg>
<% elsif option.text == "👎" || option.text.downcase == "no" %>
<svg class="usa-icon margin-top-2" aria-hidden="true" focusable="false" role="img">
<use xlink:href="<%= asset_path "sprite.svg#thumb_down_alt" %>"></use>
</svg>
<% end %>
<% end %>
</div>
</div>
Expand Down
44 changes: 28 additions & 16 deletions app/views/components/widget/_widget.css.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
font-size: 100%
}

.fba-modal-close {
.fba-modal-dialog .fba-modal-close {
position: absolute;
top: 0;
right: 0;
Expand Down Expand Up @@ -1469,34 +1469,38 @@
}

.fba-modal-dialog .usa-link--external::after{
background:url(<%= asset_path "external-link.svg" %>) no-repeat 0 0;
background-image:url(<%= asset_path "usa-icons-bg/launch--blue-60v.svg" %>);
background-repeat:no-repeat;
background-size:100%;
content:'';
display:inline-block;
height:0.65em;
margin-bottom:-1px;
margin-left:0.25rem;
width:0.65em;
content:"";
height:1.75ex;
margin-left:2px;
background-position:center;
display:inline;
padding-left:1.75ex;
vertical-align:middle;
}

.fba-modal-dialog .usa-link--external:hover::after{
background-image:url(<%= asset_path "external-link-hover.svg" %>), linear-gradient(transparent, transparent);
background-image:url(<%= asset_path "usa-icons-bg/launch--blue-70v.svg" %>), linear-gradient(transparent, transparent);
background-repeat:no-repeat;
}

.fba-modal-dialog .usa-link--external.fba-modal-dialog .usa-link--alt::after{
background-image:url(<%= asset_path "external-link-alt.svg" %>);
background-position:50% 60%;
.fba-modal-dialog .usa-link--external.usa-link--alt::after{
background-image:url(<%= asset_path "usa-icons-bg/launch--gray-5.svg" %>);
background-repeat:no-repeat;
background-size:100%;
content:"";
height:1.75ex;
margin-left:2px;
background-position:center;
display:inline;
margin-left:0.25rem;
padding-left:0.65em;
padding-left:1.75ex;
vertical-align:middle;
}

.fba-modal-dialog .usa-link--external.fba-modal-dialog .usa-link--alt:hover::after{
background-image:url(<%= asset_path "external-link-alt-hover.svg" %>), linear-gradient(transparent, transparent);
.fba-modal-dialog .usa-link--external.usa-link--alt:hover::after{
background-image:url(<%= asset_path "usa-icons-bg/launch--white.svg" %>), linear-gradient(transparent, transparent);
background-repeat:no-repeat;
}

Expand Down Expand Up @@ -4054,6 +4058,10 @@
text-indent: 0;
}

.fba-modal-dialog abbr[title=required]{
text-decoration:none;
}

/* Override */
.fba-modal-dialog .usa-form {
max-width: inherit;
Expand All @@ -4067,3 +4075,7 @@
.usa-banner__header.touchpoints-footer-banner {
min-height: 0;
}

.fba-modal-dialog .question-options.big-thumbs .usa-radio__label::before {
display: none;
}
Loading