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.

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

DP-12682/DP-12682 How to page template mapping #485

Merged
merged 14 commits into from
Mar 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions assets/scss/03-organisms/_tabular-data.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.post-content > &,
.main-content--full .page-content > & {
@include ma-container();
margin-top: 0px;
}

.ma__rich-text {
Expand Down
14 changes: 14 additions & 0 deletions changelogs/DP-12682.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Changed
Minor

- (Patternlab) DP-12682: Changes to the details.twig to use the class `sidebar sidebar--colored` in sidebar.

Removed
Minor

- (Patternlab) DP-12682: Removed the social media links on the Howto page.

Added
Minor

- (Patternlab) DP-12682: Added a block to the tabular-data.twig for template mapping.
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.
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
{% set sidebarHeading = tabularData.sidebarHeading %}
{% include "@atoms/04-headings/sidebar-heading.twig" %}
{% endif %}
{% if tabularData.description %}
{% set richText = tabularData.description %}
{% include "@organisms/by-author/rich-text.twig" %}
{% endif %}
{% set table = tabularData.table %}
{% include "@atoms/10-table/table.twig" %}
{% block tabularData %}
{% if tabularData.description %}
{% set richText = tabularData.description %}
{% include "@organisms/by-author/rich-text.twig" %}
{% endif %}
{% set table = tabularData.table %}
{% include "@atoms/10-table/table.twig" %}
{% endblock %}
</section>
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</div>
</div>

<aside class="sidebar {{ sidebar.coloredHeadings ? 'sidebar--colored' : '' }}">
<aside class="sidebar sidebar--colored">
{% if sidebar.contactList %}
{% set contactList = sidebar.contactList %}
{% include "@organisms/by-author/contact-list.twig" %}
Expand All @@ -61,4 +61,3 @@

{# site footer #}
{% block footer %}{% endblock %}

33 changes: 5 additions & 28 deletions patternlab/styleguide/source/_patterns/05-pages/howto.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,6 @@
"divider": false,
"title": "Apply for unemployment benefits",
"subTitle": "Have you lost your job? You may qualify for temporary income to support you while you look for a new one.",
"socialLinks": {
"label": "Share:",
"items": [
{
"altText": "Follow us on Facebook",
"href": "#",
"icon": "facebook",
"linkType": "facebook"
},
{
"altText": "Follow us on Twitter",
"href": "#",
"icon": "twitter",
"linkType": "twitter"
},
{
"altText": "Follow us on LinkedIn",
"href": "#",
"icon": "linkedin",
"linkType": "linkedin"
}
]
},
"optionalContents": [
{
"path": "@organisms/by-author/callout-time.twig",
Expand Down Expand Up @@ -136,12 +113,12 @@
},
{
"href": "next-steps",
"text": "Next Steps",
"text": "Next steps",
"info": ""
},
{
"href": "more-info",
"text": "More Info",
"text": "More info",
"info": ""
},
{
Expand Down Expand Up @@ -330,7 +307,7 @@
},
"stepsUnordered": {
"compHeading": {
"title": "How To Apply",
"title": "How to apply",
"level": 3,
"color": "",
"id": "how-to-apply",
Expand Down Expand Up @@ -412,7 +389,7 @@
},
"stepsOrdered": {
"compHeading": {
"title": "Next Steps",
"title": "Next steps",
"titleContext": "to Apply for unemployment benefits",
"level": 3,
"color": "",
Expand Down Expand Up @@ -880,4 +857,4 @@
]
}
}
}
}