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

Ygat 442 map lb fixes #86

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Ygat 442 map lb fixes #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83badcc
YGAT-442 Set distance default to 10
froboy Feb 26, 2025
eb6c0d0
YGAT-442 Clean up map display
froboy Feb 26, 2025
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
113 changes: 59 additions & 54 deletions modules/openy_map_lb/assets/css/openy-map-lb.css
View file
Open in desktop

Large diffs are not rendered by default.

172 changes: 95 additions & 77 deletions modules/openy_map_lb/assets/src/scss/openy-map-lb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,84 +327,7 @@
border: var(--wsBorderStyle , none);
box-shadow: var(--wsBoxShadow, none);
font-family: var(--ylb-font-family-verdana);
.card-body {
h2 {
font-size: 30px;
line-height: 32px;
margin-bottom: 23px;
font-family: var(--ylb-font-family-cachet);
a {
color: var(--wsPrimaryColor, blue);
}
}
.type {
text-transform: uppercase;
color: var(--ylb-color-dark-grey-1, darkgray);
margin-bottom: 20px;
font-weight: 600;
font-size: 15px;
line-height: 20px;
img {
height: 17.5px;
margin-right: 10px;
display: none;
}
svg {
margin-right: 6px;
}
}
.node__content {
padding: 0;
a {
text-decoration: underline;
}
address {
margin-bottom: 0;
.fa-map-marker-alt {
display: none;
}
}

.directions {
margin-bottom: 20px;
padding-left: 25px;
a {
color: var(--wsPartnerColor, blue);
}
}
.phone {
font-size: 18px;
line-height: 28px;
letter-spacing: -1px;
margin-bottom: 20px;

svg {
margin-right: 6px;
}
.field-location-phone {
display: inline;
a {
font-weight: normal;
color: var(--wsPartnerColor, blue);
}
}
}
.hours {
display: flex;
align-items: flex-start;

svg {
margin-right: 6px;
margin-top: 6px;
}
}
.field-branch-hours {
h4 {
display: none;
}
}
}
}
.card-footer {
background-color: transparent;
.btn {
Expand All @@ -426,6 +349,101 @@

}

.card-body {
h2 {
font-size: 30px;
line-height: 32px;
margin-bottom: 23px;
font-family: var(--ylb-font-family-cachet);
a {
color: var(--wsPrimaryColor, blue);
}
}
.type {
text-transform: uppercase;
color: var(--ylb-color-dark-grey-1, darkgray);
margin-bottom: 20px;
font-weight: 600;
font-size: 15px;
line-height: 20px;
img {
height: 17.5px;
margin-right: 10px;
display: none;
}
svg {
margin-right: 6px;
}
}
.node__content {
padding: 0;
a {
text-decoration: underline;
}
address {
margin-bottom: 0;
.fa-map-marker-alt {
display: none;
}
}

.directions {
margin-bottom: 20px;
padding-left: 25px;
a {
color: var(--wsPartnerColor, blue);
}
}
.phone {
font-size: 18px;
line-height: 28px;
letter-spacing: -1px;
margin-bottom: 20px;

svg {
margin-right: 6px;
}
.field-location-phone {
display: inline;
a {
font-weight: normal;
color: var(--wsPartnerColor, blue);
}
}
}
.hours {
display: flex;
align-items: flex-start;

svg {
margin-right: 6px;
margin-top: 6px;
}
}
.field-branch-hours {
h4 {
display: none;
}
}
}
}

// Specific styles for map tooltip cards.
.marker_tooltip {
.card-body {
.node__content address .fa-map-marker-alt {
display: block;
// Needs to be important to override `text-gray-300` from Carnation.
color: var(--wsTertiaryColor, black) !important;
}

// Hide hours since hours_today can't properly rewrite it.
.hours {
display: none;
}
}
}

// WS Style component-level adjustments.
// - Border style.
&.ws-border-style--solid {
Expand Down
2 changes: 1 addition & 1 deletion modules/openy_map_lb/src/Plugin/Block/LocationFinder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private function getDistanceMapOptions() {
'@unit' => $units_map[$units],
]
),
'selected' => '',
'selected' => $distance == '10' ? 'selected' : '',
];
}
return $options;
Expand Down
10 changes: 8 additions & 2 deletions modules/openy_map_lb/templates/node--location-type--lb-teaser.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,19 @@
{% if content.field_location_phone %}
<div class="phone">
{% include "@openy_map_lb/svg/phone_icon.html.twig" %}
{{ "Phone"|t }} {{ content.field_location_phone }}
{{ content.field_location_phone }}
</div>
{% endif %}
{% if content.field_branch_hours %}
<div class="hours">
{% include "@openy_map_lb/svg/clock_icon.html.twig" %}
{{ content.field_branch_hours }}</div>
{% set items = content.field_branch_hours|filter((v, k) => k|first != '#') %}
{% if items is not empty %}
<div class="field-branch-hours field-item">
{{ items|first }}
</div>
{% endif %}
</div>
{% endif %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion modules/openy_map_lb/templates/openy-map-lb.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="form-group">
<label for="distance_limit">{{ 'Distance'|t }}</label>
<select class="distance_limit_value distance_limit form-control form-select" id="distance_limit">
<option class="all_locations" value="all_locations" selected="selected">{{ 'Any distance' | t }}</option>
<option class="all_locations" value="all_locations">{{ 'Any distance' | t }}</option>
{% for option in element['#options'] %}
<option value="{{ option.value }}"
{{ option.selected }}>
Expand Down