Skip to content

Column Refactor + Jumpmenu update #64

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

Merged
patrickbrown-io merged 1 commit into from
Jan 13, 2025
Merged

Column Refactor + Jumpmenu update #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
98 changes: 43 additions & 55 deletions layouts/edge-to-edge/layout--edge-to-edge.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{#
/**
* @file
* Default theme implementation to display a one-column layout.
* Default theme implementation to display an edge-to-edge layout.
*
* Available variables:
* - content: The content for this layout.
Expand All @@ -15,63 +15,51 @@
{{ attach_library('ucb_bootstrap_layouts/ucb-bootstrap-layouts') }}

{% set sectionID = settings.sectionID %}
{% set row_classes = ['row', 'ucb-bootstrap-layout__row', 'ucb-bootstrap-layout__row--one-column', 'g-0'] %}
{% set frameColor = 'content-frame-' ~ settings.content_frame_color %}
{% set frameStyle = settings.content_frame_color == 'none' ? 'content-frame-unstyled' : 'content-frame-styled' %}
{% set frame_classes = ['ucb-content-frame', frameColor, frameStyle] %}
{% set regions = ['first'] %}

{%
set row_classes = [
'row',
'ucb-bootstrap-layout__row',
'ucb-bootstrap-layout__row--one-column',
'g-0'
]
%}
<style>
.ucb-bootstrap-layout-section.section-{{sectionID}}{
padding-top: {{settings.section_mobile_padding_top}}
;
padding-bottom: {{settings.section_mobile_padding_bottom}}
;
}

{%
set frameColor = 'content-frame-' ~ settings.content_frame_color
%}
@media(min-width: 768px) {
.ucb-bootstrap-layout-section.section-{{sectionID}}{
padding-top: {{settings.section_tablet_padding_top}}
;
padding-bottom: {{settings.section_tablet_padding_bottom}}
;
}
}

{%
set frame_classes = [
'ucb-content-frame',
frameColor
]
%}

{% if settings.background_image_styles %}
{% if settings.overlay_color == 'black' %}
{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-dark" %}
{% elseif settings.overlay_color == 'white' %}
{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-light" %}
{% else %}
{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-none" %}
{% endif %}
{% else %}
{% set row_overlay_settings = "" %}
{% endif %}

{% if settings.background_effect == "fixed" %}
{% set row_background_effect = "fixed-background" %}
{% elseif settings.background_effect == "parallax" %}
{% set row_background_effect = "jarallax" %}
{% else %}
{% set row_background_effect = "scrolling-background" %}
{% endif %}

{% if settings.background_effect == "parallax" %}
<script>
window.onload = function () {
jarallax(document.querySelectorAll('.jarallax'), {speed: 0.2});
};
</script>
{% endif %}
@media(min-width: 992px) {
.ucb-bootstrap-layout-section.section-{{sectionID}}{
padding-top: {{settings.section_padding_top}}
;
padding-bottom: {{settings.section_padding_bottom}}
;
}
}
</style>

{% if content %}
<div class="ucb-bootstrap-layout-section section-{{ sectionID }} ucb-bootstrap-layout__background-color--{{ settings.background_color }} {{ row_overlay_settings }} {{ row_background_effect }}" style="{{ settings.background_image_styles }}">
<div class="ucb-edge-to-edge">
<div{{attributes.addClass(row_classes, frame_classes|join(' '))}}>
<div {{ region_attributes.first.addClass('column', 'column--first', 'col-12') }}>
{{ content.first }}
</div>
</div>
</div>
</div>
<div class="ucb-bootstrap-layout-section section-{{ sectionID }} ucb-bootstrap-layout__background-color--{{ settings.background_color }}">
<div class="ucb-edge-to-edge">
<div {{ attributes.addClass(row_classes, frame_classes|join(' ')) }} style="padding-left: {{ settings.section_padding_left }}; padding-right: {{ settings.section_padding_right }};">
{% for region in regions %}
{% if content[region] and content[region]|render|striptags('<img><iframe><slate-form>')|trim != '' %}
<div {{ region_attributes[region].addClass('column', 'column--' ~ region, 'col-12', 'main-column') }}>
{{ content[region] }}
</div>
{% endif %}
{% endfor %}
</div>
</div>
</div>
{% endif %}
193 changes: 66 additions & 127 deletions layouts/four-column/layout--four-column.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,140 +12,79 @@
*/
#}

{# Get the column widths #}

{{ attach_library('ucb_bootstrap_layouts/ucb-bootstrap-layouts') }}

{% set sectionID = settings.sectionID %}

{% set column_widths = settings.column_width|split('-') %}

{%
set row_classes = [
'row',
'ucb-bootstrap-layout__row',
'ucb-bootstrap-layout__row--four-column'
]
%}

{%
set frameColor = 'content-frame-' ~ settings.content_frame_color
%}

{% if settings.content_frame_color == 'none' %}
{% set frameStyle = 'content-frame-unstyled' %}
{% else %}
{% set frameStyle = 'content-frame-styled' %}
{% endif %}

{%
set frame_classes = [
'ucb-content-frame',
frameColor,
frameStyle
]
%}

{% if settings.column_equal_height == '1' %}
{% set columnHeight = 'd-flex flex-wrap' %}
{% else %}
{% set columnHeight = '' %}
{% endif %}

{% if settings.background_image_styles %}
{% if settings.overlay_color == 'black' %}
{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-dark" %}
{% elseif settings.overlay_color == 'white' %}
{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-light" %}
{% else %}
{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-none" %}
{% endif %}
{% else %}
{% set row_overlay_settings = "" %}
{% endif %}

{% if settings.background_effect == "fixed" %}
{% set row_background_effect = "fixed-background" %}
{% elseif settings.background_effect == "parallax" %}
{% set row_background_effect = "jarallax" %}
{% else %}
{% set row_background_effect = "scrolling-background" %}
{% endif %}

{% if settings.background_effect == "parallax" %}
<script>
window.onload = function() {
jarallax(document.querySelectorAll('.jarallax'), {
speed: 0.2,
});
};
</script>
{% endif %}
{% set row_classes = ['row', 'ucb-bootstrap-layout__row', 'ucb-bootstrap-layout__row--four-column'] %}
{% set frameColor = 'content-frame-' ~ settings.content_frame_color %}
{% set frameStyle = settings.content_frame_color == 'none' ? 'content-frame-unstyled' : 'content-frame-styled' %}
{% set frame_classes = ['ucb-content-frame', frameColor, frameStyle] %}
{% set columnHeight = settings.column_equal_height == '1' ? 'd-flex flex-wrap' : '' %}
{% set regions = ['first', 'second', 'third', 'fourth'] %}

<style>
.ucb-bootstrap-layout-section.section-{{ sectionID }} {
padding-top: {{ settings.section_mobile_padding_top }};
padding-bottom: {{settings.section_mobile_padding_bottom }};
}

.section-{{ sectionID }} .ucb-content-frame {
padding-left: {{ settings.section_mobile_padding_left }};
padding-right: {{settings.section_mobile_padding_right }};
}

@media (min-width: 768px) {
.ucb-bootstrap-layout-section.section-{{ sectionID }} {
padding-top: {{ settings.section_tablet_padding_top }};
padding-bottom: {{settings.section_tablet_padding_bottom }};
}

.section-{{ sectionID }} .ucb-content-frame {
padding-left: {{ settings.section_tablet_padding_left }};
padding-right: {{settings.section_tablet_padding_right }};
}
}

@media (min-width: 992px) {
.ucb-bootstrap-layout-section.section-{{ sectionID }} {
padding-top: {{ settings.section_padding_top }};
padding-bottom: {{settings.section_padding_bottom }};
}

.section-{{ sectionID }} .ucb-content-frame {
padding-left: {{ settings.section_padding_left }};
padding-right: {{settings.section_padding_right }};
}
}
.ucb-bootstrap-layout-section.section-{{sectionID}}{
padding-top: {{settings.section_mobile_padding_top}}
;
padding-bottom: {{settings.section_mobile_padding_bottom}}
;
}

.section-{{sectionID}}.ucb-content-frame {
padding-left: {{settings.section_mobile_padding_left}}
;
padding-right: {{settings.section_mobile_padding_right}}
;
}

@media(min-width: 768px) {
.ucb-bootstrap-layout-section.section-{{sectionID}}{
padding-top: {{settings.section_tablet_padding_top}}
;
padding-bottom: {{settings.section_tablet_padding_bottom}}
;
}

.section-{{sectionID}}.ucb-content-frame {
padding-left: {{settings.section_tablet_padding_left}}
;
padding-right: {{settings.section_tablet_padding_right}}
;
}
}

@media(min-width: 992px) {
.ucb-bootstrap-layout-section.section-{{sectionID}}{
padding-top: {{settings.section_padding_top}}
;
padding-bottom: {{settings.section_padding_bottom}}
;
}

.section-{{sectionID}}.ucb-content-frame {
padding-left: {{settings.section_padding_left}}
;
padding-right: {{settings.section_padding_right}}
;
}
}
</style>

{% if content %}
<div class="ucb-bootstrap-layout-section section-{{ sectionID }} ucb-bootstrap-layout__background-color--{{ settings.background_color }} {{ row_overlay_settings }} {{ row_background_effect }}" style="{{ settings.background_image_styles }}">
<div class="container ucb-contained-row">
<div{{attributes.addClass(row_classes, frame_classes|join(' '))}} style="padding-left: {{ settings.section_padding_left }}; padding-right: {{ settings.section_padding_right }};">
{% if content.first %}
<div {{ region_attributes.first.addClass('column', 'col-lg-' ~ column_widths.0, 'column--first', 'col-md-6 col-12') }}>
{{ content.first }}
</div>
{% endif %}

{% if content.second %}
<div {{ region_attributes.second.addClass('column', columnHeight, 'col-lg-' ~ column_widths.1, 'column--second', 'col-md-6 col-12') }}>
{{ content.second }}
</div>
{% endif %}

{% if content.third %}
<div {{ region_attributes.third.addClass('column', columnHeight, 'col-lg-' ~ column_widths.2, 'column--third', 'col-md-6 col-12') }}>
{{ content.third }}
</div>
{% endif %}

{% if content.fourth %}
<div {{ region_attributes.fourth.addClass('column', columnHeight, 'col-lg-' ~ column_widths.3, 'column--fourth', 'col-md-6 col-12') }}>
{{ content.fourth }}
</div>
{% endif %}
</div>
</div>
</div>
<div class="ucb-bootstrap-layout-section section-{{ sectionID }} ucb-bootstrap-layout__background-color--{{ settings.background_color }}">
<div class="container ucb-contained-row">
<div {{ attributes.addClass(row_classes, frame_classes|join(' ')) }} style="padding-left: {{ settings.section_padding_left }}; padding-right: {{ settings.section_padding_right }};">
{% for i in 0..(regions|length - 1) %}
{% set region = regions[i] %}
{% set width = column_widths[i] %}
{% if content[region] and content[region]|render|striptags('<img><iframe><slate-form>')|trim != '' %}
<div {{ region_attributes[region].addClass('column', 'col-lg-' ~ width, 'column--' ~ region, 'col-12', columnHeight, 'main-column') }}>
{{ content[region] }}
</div>
{% endif %}
{% endfor %}
</div>
</div>
</div>
{% endif %}
Loading
Loading