Skip to content

Commit 9e99081

Browse files
authored
Merge pull request #198 from 18F/190-add-footer-with-links
Add NSF and Research.gov footer menus
2 parents 2ab6f0b + 1f30e47 commit 9e99081

File tree

44 files changed

+3471
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3471
-115
lines changed

composer.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"composer/installers": "^1.2",
2121
"cweagans/composer-patches": "^1.6",
2222
"drupal-composer/drupal-scaffold": "^2.2",
23+
"drupal/better_normalizers": "^1.0@beta",
2324
"drupal/brightcove": "^1.3",
2425
"drupal/console": "^1.0.2",
2526
"drupal/core": "~8.5",
@@ -81,6 +82,11 @@
8182
"web/drush/contrib/{$name}": ["type:drupal-drush"],
8283
"web/modules/custom/{$name}": ["type:drupal-custom-module"],
8384
"web/themes/custom/{$name}": ["type:drupal-custom-theme"]
85+
},
86+
"patches": {
87+
"drupal/default_content": {
88+
"Make menu items export properly": "web/patches/menu_link_uuid_nid-2670954-reroll.patch"
89+
}
8490
}
8591
}
8692
}

composer.lock

Lines changed: 178 additions & 107 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff -Naur default_content/composer.json default_content_patched/composer.json
2+
--- default_content/composer.json 2018-04-27 15:49:03.000000000 -0700
3+
+++ default_content_patched/composer.json 2018-04-27 15:50:22.000000000 -0700
4+
@@ -5,6 +5,7 @@
5+
"license": "GPL-2.0+",
6+
"minimum-stability": "dev",
7+
"require": {
8+
- "drupal/core": "~8.3"
9+
+ "drupal/core": "~8.3",
10+
+ "drupal/better_normalizers": "^1.0@beta"
11+
}
12+
}
13+
diff -Naur default_content/default_content.info.yml default_content_patched/default_content.info.yml
14+
--- default_content/default_content.info.yml 2018-04-27 15:49:18.000000000 -0700
15+
+++ default_content_patched/default_content.info.yml 2018-04-27 15:50:22.000000000 -0700
16+
@@ -5,6 +5,7 @@
17+
# core: 8.x
18+
dependencies:
19+
- drupal:hal (>=8.3.x)
20+
+ - better_normalizers
21+
22+
# Information added by Drupal.org packaging script on 2017-10-19
23+
version: '8.x-1.0-alpha7'
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
uuid: 2ef021c2-0395-414b-a5cf-2d0242ace566
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- system.menu.footer-national-science-fou
7+
module:
8+
- system
9+
theme:
10+
- nsf
11+
id: footernationalsciencefoundation
12+
theme: nsf
13+
region: footer_menu
14+
weight: 0
15+
provider: null
16+
plugin: 'system_menu_block:footer-national-science-fou'
17+
settings:
18+
id: 'system_menu_block:footer-national-science-fou'
19+
label: 'National Science Foundation'
20+
provider: system
21+
label_display: visible
22+
level: 1
23+
depth: 0
24+
visibility: { }
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
uuid: ab29e5ed-fc41-46e6-9ce8-5449727b6d97
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- system.menu.footer-research-gov
7+
module:
8+
- system
9+
theme:
10+
- nsf
11+
id: footerresearch.gov
12+
theme: nsf
13+
region: footer_menu
14+
weight: 0
15+
provider: null
16+
plugin: 'system_menu_block:footer-research-gov'
17+
settings:
18+
id: 'system_menu_block:footer-research-gov'
19+
label: Research.gov
20+
provider: system
21+
label_display: visible
22+
level: 1
23+
depth: 0
24+
visibility: { }

web/sites/default/config/block.block.nsf_footer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
uuid: 55389443-45a7-429a-9c06-7f834d48388d
22
langcode: en
3-
status: true
3+
status: false
44
dependencies:
55
config:
66
- system.menu.footer

web/sites/default/config/core.extension.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module:
22
action: 0
33
aggregator: 0
44
automated_cron: 0
5+
better_normalizers: 0
56
block: 0
67
block_content: 0
78
breakpoint: 0

web/sites/default/config/nsf.settings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ uswds_header_style: basic
1313
uswds_header_mega: 0
1414
uswds_search: 0
1515
uswds_government_banner: 1
16-
uswds_footer_style: slim
16+
uswds_footer_style: big
1717
uswds_footer_agency: 0
1818
uswds_footer_agency_name: ''
1919
uswds_footer_agency_url: ''
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uuid: e6aeed50-3dc2-4de9-a1fb-4bd68577a1c7
2+
langcode: en
3+
status: true
4+
dependencies: { }
5+
id: footer-national-science-fou
6+
label: 'Footer: National Science Foundation'
7+
description: 'NSF links for footer'
8+
locked: false
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uuid: 15a5991d-1290-428a-864d-c62b25259c85
2+
langcode: en
3+
status: true
4+
dependencies: { }
5+
id: footer-research-gov
6+
label: 'Footer: Research.gov'
7+
description: 'Research.gov links for footer'
8+
locked: false

0 commit comments

Comments
 (0)