Skip to content

Commit 1cace55

Browse files
authored
Merge pull request #164 from UN-OCHA/iasc-561-common-design
IASC-561 common design
2 parents 2ffa137 + e34e493 commit 1cace55

9 files changed

+82
-35
lines changed

config/core.entity_form_display.node.panopoly_page.default.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies:
1111
- field.field.node.panopoly_page.field_featured_status
1212
- field.field.node.panopoly_page.field_footer
1313
- field.field.node.panopoly_page.field_header
14+
- field.field.node.panopoly_page.field_oa_banner_text
1415
- field.field.node.panopoly_page.field_sidebar
1516
- node.type.panopoly_page
1617
module:
@@ -25,7 +26,7 @@ mode: default
2526
content:
2627
body:
2728
type: text_textarea_with_summary
28-
weight: 2
29+
weight: 3
2930
settings:
3031
rows: 9
3132
summary_rows: 3
@@ -34,7 +35,7 @@ content:
3435
region: content
3536
created:
3637
type: datetime_timestamp
37-
weight: 8
38+
weight: 9
3839
region: content
3940
settings: { }
4041
third_party_settings: { }
@@ -46,7 +47,7 @@ content:
4647
third_party_settings: { }
4748
region: content
4849
field_content:
49-
weight: 3
50+
weight: 4
5051
settings:
5152
title: Paragraph
5253
title_plural: Paragraphs
@@ -65,13 +66,21 @@ content:
6566
type: paragraphs
6667
region: content
6768
field_featured_categories:
68-
weight: 6
69+
weight: 7
6970
type: options_buttons
7071
settings: { }
7172
third_party_settings: { }
7273
region: content
74+
field_oa_banner_text:
75+
weight: 2
76+
settings:
77+
size: 60
78+
placeholder: ''
79+
third_party_settings: { }
80+
type: string_textfield
81+
region: content
7382
field_sidebar:
74-
weight: 4
83+
weight: 5
7584
settings:
7685
title: Paragraph
7786
title_plural: Paragraphs
@@ -91,7 +100,7 @@ content:
91100
region: content
92101
langcode:
93102
type: language_select
94-
weight: 5
103+
weight: 6
95104
region: content
96105
settings:
97106
include_locked: true
@@ -106,7 +115,7 @@ content:
106115
type: boolean_checkbox
107116
settings:
108117
display_label: true
109-
weight: 9
118+
weight: 10
110119
region: content
111120
third_party_settings: { }
112121
status:
@@ -120,7 +129,7 @@ content:
120129
type: boolean_checkbox
121130
settings:
122131
display_label: true
123-
weight: 10
132+
weight: 11
124133
region: content
125134
third_party_settings: { }
126135
title:
@@ -133,7 +142,7 @@ content:
133142
third_party_settings: { }
134143
uid:
135144
type: entity_reference_autocomplete
136-
weight: 7
145+
weight: 8
137146
settings:
138147
match_operator: CONTAINS
139148
size: 60

config/core.entity_view_display.node.panopoly_page.default.yml

+15-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies:
1111
- field.field.node.panopoly_page.field_featured_status
1212
- field.field.node.panopoly_page.field_footer
1313
- field.field.node.panopoly_page.field_header
14+
- field.field.node.panopoly_page.field_oa_banner_text
1415
- field.field.node.panopoly_page.field_sidebar
1516
- node.type.panopoly_page
1617
module:
@@ -25,7 +26,7 @@ content:
2526
body:
2627
label: hidden
2728
type: text_default
28-
weight: 2
29+
weight: 3
2930
settings: { }
3031
third_party_settings: { }
3132
region: content
@@ -39,7 +40,7 @@ content:
3940
third_party_settings: { }
4041
region: content
4142
field_content:
42-
weight: 3
43+
weight: 4
4344
label: hidden
4445
settings:
4546
view_mode: default
@@ -49,14 +50,14 @@ content:
4950
region: content
5051
field_featured_categories:
5152
label: above
52-
weight: 6
53+
weight: 7
5354
type: entity_reference_label
5455
settings:
5556
link: true
5657
third_party_settings: { }
5758
region: content
5859
field_footer:
59-
weight: 5
60+
weight: 6
6061
label: hidden
6162
settings:
6263
view_mode: default
@@ -73,8 +74,16 @@ content:
7374
third_party_settings: { }
7475
type: entity_reference_revisions_entity_view
7576
region: content
77+
field_oa_banner_text:
78+
weight: 2
79+
label: hidden
80+
settings:
81+
link_to_entity: false
82+
third_party_settings: { }
83+
type: string
84+
region: content
7685
field_sidebar:
77-
weight: 4
86+
weight: 5
7887
label: hidden
7988
settings:
8089
view_mode: default
@@ -83,7 +92,7 @@ content:
8392
type: entity_reference_revisions_entity_view
8493
region: content
8594
links:
86-
weight: 7
95+
weight: 8
8796
region: content
8897
settings: { }
8998
third_party_settings: { }
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
uuid: 2a8eb5ca-8c0b-4c75-ac23-58d0e37596ae
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- field.storage.node.field_oa_banner_text
7+
- node.type.panopoly_page
8+
id: node.panopoly_page.field_oa_banner_text
9+
field_name: field_oa_banner_text
10+
entity_type: node
11+
bundle: panopoly_page
12+
label: 'Banner caption'
13+
description: ''
14+
required: false
15+
translatable: true
16+
default_value: { }
17+
default_value_callback: ''
18+
settings: { }
19+
field_type: string

config/views.view.iasc_group_content.yml

+12
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,18 @@ display:
211211
fields: { }
212212
plugin_id: search_api_fulltext
213213
sorts:
214+
created:
215+
id: created
216+
table: search_api_index_default_solr_index
217+
field: created
218+
relationship: none
219+
group_type: group
220+
admin_label: ''
221+
order: DESC
222+
exposed: false
223+
expose:
224+
label: ''
225+
plugin_id: search_api
214226
changed:
215227
id: changed
216228
table: search_api_index_default_solr_index

config/views.view.updates.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -179,36 +179,36 @@ display:
179179
entity_field: type
180180
plugin_id: bundle
181181
sorts:
182-
changed:
183-
id: changed
182+
created:
183+
id: created
184184
table: node_field_data
185-
field: changed
185+
field: created
186+
order: DESC
187+
entity_type: node
188+
entity_field: created
189+
plugin_id: date
186190
relationship: none
187191
group_type: group
188192
admin_label: ''
189-
order: DESC
190193
exposed: false
191194
expose:
192195
label: ''
193196
granularity: second
194-
entity_type: node
195-
entity_field: changed
196-
plugin_id: date
197-
created:
198-
id: created
197+
changed:
198+
id: changed
199199
table: node_field_data
200-
field: created
201-
order: DESC
202-
entity_type: node
203-
entity_field: created
204-
plugin_id: date
200+
field: changed
205201
relationship: none
206202
group_type: group
207203
admin_label: ''
204+
order: DESC
208205
exposed: false
209206
expose:
210207
label: ''
211208
granularity: second
209+
entity_type: node
210+
entity_field: changed
211+
plugin_id: date
212212
title: Updates
213213
header: { }
214214
footer: { }

html/themes/custom/iasc_common_design/css/styles.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

html/themes/custom/iasc_common_design/css/styles.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

html/themes/custom/iasc_common_design/sass/iasc-custom/_field.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@
106106
}
107107

108108
// Banner caption.
109-
.field--name-field-banner-text {
109+
.field--name-field-banner-text,
110+
.field--name-field-oa-banner-text {
110111
text-align: right;
111112
font-size: 0.9rem;
112113
margin-top: -1rem; // assumes banner_image field has bottom margin.

html/themes/custom/iasc_common_design/templates/paragraphs/paragraph--reliefweb-feed.html.twig

-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
{% for feed_link in feed_links %}
6060
<li>
6161
<a href="{{ feed_link.url }}">
62-
<svg class="icon icon--arrow-right">
63-
<use xlink:href="#arrow-right"></use>
64-
</svg>
6562
{{ feed_link.title }}, {{ feed_link.source }}, {{ feed_link.date|date("d F Y") }}
6663
</a>
6764
</li>

0 commit comments

Comments
 (0)