-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #360 from City-of-Helsinki/UHF-9132
UHF-9132: Add max-width limitation to all content types without sidebar except landing page
- Loading branch information
Showing
9 changed files
with
76 additions
and
85 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 5 additions & 7 deletions
12
...hemes/custom/hdbt_subtheme/templates/field/field--node--field-organization-name.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,5 @@ | ||
| <div class="job-listing__organization-name"> | ||
| {% for item in items %} | ||
| <span {{ item.attributes.addClass('organization') }}> | ||
| {{ item.content }} | ||
| </span> | ||
| {% endfor %} | ||
| </div> | ||
| {% for item in items %} | ||
| <span {{ item.attributes.addClass('organization') }}> | ||
| {{ item.content }} | ||
| </span> | ||
| {% endfor %} |
12 changes: 5 additions & 7 deletions
12
public/themes/custom/hdbt_subtheme/templates/field/field--node--field-salary-class.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,6 @@ | ||
| <div class="job-listing__salary-class"> | ||
| <h2 class="job-listing__salary-class__title">{{ 'Contract area'|t }}</h2> | ||
| <div class="job-listing__salary-class__content"> | ||
| {% for item in items %} | ||
| <p {{ item.attributes }}>{{ item.content }}</p> | ||
| {% endfor %} | ||
| </div> | ||
| <h2 class="job-listing__salary-class__title">{{ 'Contract area'|t }}</h2> | ||
| <div class="job-listing__salary-class__content"> | ||
| {% for item in items %} | ||
| <p {{ item.attributes }}>{{ item.content }}</p> | ||
| {% endfor %} | ||
| </div> |
3 changes: 0 additions & 3 deletions
3
public/themes/custom/hdbt_subtheme/templates/field/field--node--job-description.html.twig
This file was deleted.
Oops, something went wrong.
49 changes: 3 additions & 46 deletions
49
public/themes/custom/hdbt_subtheme/templates/field/field--node--job-listing.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,8 @@ | ||
| {# | ||
| /** | ||
| * @file | ||
| * Theme override for a field. | ||
| * | ||
| * To override output, copy the "field.html.twig" from the templates directory | ||
| * to your theme's directory and customize it, just like customizing other | ||
| * Drupal templates such as page.html.twig or node.html.twig. | ||
| * | ||
| * Instead of overriding the theming for all fields, you can also just override | ||
| * theming for a subset of fields using | ||
| * @link themeable Theme hook suggestions. @endlink For example, | ||
| * here are some theme hook suggestions that can be used for a field_foo field | ||
| * on an article node type: | ||
| * - field--node--field-foo--article.html.twig | ||
| * - field--node--field-foo.html.twig | ||
| * - field--node--article.html.twig | ||
| * - field--field-foo.html.twig | ||
| * - field--text-with-summary.html.twig | ||
| * - field.html.twig | ||
| * | ||
| * Available variables: | ||
| * - attributes: HTML attributes for the containing element. | ||
| * - label_hidden: Whether to show the field label or not. | ||
| * - title_attributes: HTML attributes for the title. | ||
| * - label: The label for the field. | ||
| * - multiple: TRUE if a field can contain multiple items. | ||
| * - items: List of all the field items. Each item contains: | ||
| * - attributes: List of HTML attributes for each item. | ||
| * - content: The field item's content. | ||
| * - entity_type: The entity type to which the field belongs. | ||
| * - field_name: The name of the field. | ||
| * - field_type: The type of the field. | ||
| * - label_display: The display settings for the label. | ||
| * | ||
| * @see template_preprocess_field() | ||
| * Triggers on all job listing field that is not overriden with a template | ||
| * so that we are able to give the field language parameter (check field-content.html.twig). | ||
| */ | ||
| #} | ||
| {% | ||
| set title_classes = [ | ||
| 'label', | ||
| label_display == 'visually_hidden' ? 'visually-hidden', | ||
| ] | ||
| %} | ||
|
|
||
| {% if label_hidden %} | ||
| {% include '@hdbt_subtheme/field/field-content.html.twig'%} | ||
| {% else %} | ||
| <div{{ title_attributes.addClass(title_classes) }}>{{ label }}: </div> | ||
| {% include '@hdbt_subtheme/field/field-content.html.twig'%} | ||
| {% endif %} | ||
| {% include '@hdbt_subtheme/field/field-content.html.twig'%} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters