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

Jump to bottom

Move socials to left footer column #211

Merged
merged 7 commits into from
Jul 23, 2024
Merged

Move socials to left footer column #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
544f8c8
styling for centering socials on left
aheaphy Jul 2, 2024
57390bd
touch more padding
aheaphy Jul 2, 2024
28dc36f
fix mobile footer
aheaphy Jul 3, 2024
2a4caf5
remove 'Beta' from get status alerts for bills
aheaphy Jul 17, 2024
418ec7f
updated footer block config
aheaphy Jul 17, 2024
1bafb35
remove component references to beta
aheaphy Jul 17, 2024
a0fa7f5
Remove Twig template 'BETA' references
routinet Jul 18, 2024
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
2 changes: 1 addition & 1 deletion config/sync/block.block.footerright.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
id: footerright
theme: nysenate_theme
region: footer_right
weight: 0
weight: -10
provider: null
plugin: 'system_menu_block:footer-right'
settings:
Expand Down
2 changes: 1 addition & 1 deletion config/sync/block.block.sitebranding.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
id: sitebranding
theme: nysenate_theme
region: footer_left
weight: 0
weight: -10
provider: null
plugin: system_branding_block
settings:
Expand Down
4 changes: 2 additions & 2 deletions config/sync/block.block.socials.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ dependencies:
- nysenate_theme
id: socials
theme: nysenate_theme
region: footer_right
weight: 0
region: footer_left
weight: -9
provider: null
plugin: 'system_menu_block:socials'
settings:
Expand Down
2 changes: 1 addition & 1 deletion web/modules/custom/nys_bill_vote/src/Form/BillVoteWidgetForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ public function addSubscriptionForm(&$form, FormStateInterface $form_state, $nod
'#attributes' => ['class' => ['nys-bill-subscribe']],
'#id' => 'edit-nys-bill-subscribe-container-' . $node_id,
'nys_bill_subscribe_title' => [
'#markup' => '<div class="nys-bill-subscribe-beta"><a href="/citizen-guide/bill-alerts" style="color: #ffffff; font-weight: bold">BETA ⓘ</a></div><div class="nys-bill-subscribe-title">' . 'Get Status Alerts for ' . $ref_node->label() . '</div>',
'#markup' => '<div class="nys-bill-subscribe-title">' . 'Get Status Alerts for ' . $ref_node->label() . '</div>',
],
];
if (!$this->currentUser->isAuthenticated()) {
Expand Down
10 changes: 0 additions & 10 deletions ...emes/custom/nysenate_theme/src/patterns/components/bill-vote-widget/bill-vote-widget.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@
padding-bottom: 1em;
color: $color-white;

.nys-bill-subscribe-beta {
padding: 0.5em;
text-align: center;
background-color: $yellow01 !important;

a {
color: $color-white;
}
}

.nys-bill-subscribe-title {
padding: 1em 2em;
text-transform: uppercase;
Expand Down
9 changes: 1 addition & 8 deletions ...emes/custom/nysenate_theme/src/patterns/components/bill-vote-widget/bill-vote-widget.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
id="nys-bill-vote-vote-widget-{{ node_id }}"
accept-charset="UTF-8">
<div>
<div class="nys-bill-vote form-wrapper"
id="edit-nys-bill-vote-container-{{ node_id }}">
<div class="nys-bill-vote form-wrapper" id="edit-nys-bill-vote-container-{{ node_id }}">
<input type="hidden" name="nid" value="{{ node_id }}" />
<input type="hidden" name="tid" value="53928" />
<p class="c-bill-polling--cta">
Expand Down Expand Up @@ -51,12 +50,6 @@
{% if has_sub %}
<div class="nys-bill-subscribe form-wrapper"
id="edit-nys-bill-subscribe-container-{{ node_id }}">
<div class="nys-bill-subscribe-beta">
<a href="/citizen-guide/bill-alerts"
style="color: #ffffff; font-weight: bold">
BETA ⓘ
</a>
</div>
<div class="nys-bill-subscribe-title">
Get Status Alerts for S7617
</div>
Expand Down
25 changes: 18 additions & 7 deletions ...themes/custom/nysenate_theme/src/patterns/components/nysenate-footer/nysenate-footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ footer {
padding-bottom: 10px;
border-bottom: 2px solid #e1e1e3;
margin: 10px 0 20px;
height: 70px;
height: 170px;

#block-sitebranding {
margin-top: 24px;
}

@include breakpoint($bp-sm) {
width: 31%;
Expand All @@ -134,6 +138,9 @@ footer {
border-bottom: 0;
margin: 0;
height: inherit;
#block-sitebranding {
margin-top: 0;
}
}

@include breakpoint($bp-md) {
Expand All @@ -142,7 +149,6 @@ footer {
}

a {
float: left;
text-transform: uppercase;
color: $gen_blue_drk;
text-decoration: none;
Expand Down Expand Up @@ -204,7 +210,7 @@ footer {
width: 42px;
height: 42px;
float: left;
margin-top: -15px;
margin-top: -5px;
background: none;

@include breakpoint($bp-sm) {
Expand Down Expand Up @@ -315,11 +321,16 @@ footer {
.c-senator-footer-col__social {
width: 100%;
padding-top: 20px;
border-top: 2px solid #e1e1e3;
margin-top: 30px;

@include breakpoint($bp-sm) {
padding-top: 27px;
padding-top: 34px;
float: none;
width: 100%;
text-align: center;
margin-top: 0;
border-top: none;
}

@include breakpoint($bp-md) {
Expand All @@ -329,7 +340,7 @@ footer {
p {
@include font-stack-secondary;
//display: none;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove commented code

margin: 0 0 20px;
margin: 0;
color: $grey10;
font-size: 12px;
line-height: 14.62px;
Expand All @@ -345,14 +356,14 @@ footer {
list-style: none;
display: flex;
padding: 0;
justify-content: flex-start;
flex-direction: row;
gap: 15px;
margin: 0;

@include breakpoint($bp-sm) {
flex-direction: row;
justify-content: flex-start;
align-items: stretch;
justify-content: center;
}
}

Expand Down
Loading