Skip to content

Commit 4b2a5a3

Browse files
committed
Merge branch 'develop' of https://github.com/ubc-web-services/clf into develop
2 parents 2b9768d + 91d7a52 commit 4b2a5a3

8 files changed

+149
-0
lines changed

clf.info.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,17 @@ libraries-override:
1111
css:
1212
theme:
1313
css/unit.custom.css: css/unit.custom.css
14+
15+
regions:
16+
primary_menu: 'Primary menu'
17+
secondary_menu: 'Secondary menu'
18+
featured: 'Featured'
19+
breadcrumb: 'Breadcrumb'
20+
help: 'Help'
21+
highlighted: 'Highlighted'
22+
content: 'Content'
23+
sidebar_first: 'Sidebar first'
24+
sidebar_second: 'Sidebar second'
25+
secondary_content: 'Secondary Content'
26+
prefooter: 'Pre-Footer'
27+
drawer: 'Off Canvas Drawer'
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#Defines settings for the Breadcrumbs block
2+
3+
langcode: en
4+
status: true
5+
dependencies:
6+
module:
7+
- system
8+
theme:
9+
- clf
10+
id: clf_breadcrumbs
11+
theme: clf
12+
region: breadcrumb
13+
weight: -2
14+
provider: null
15+
plugin: system_breadcrumb_block
16+
settings:
17+
id: system_breadcrumb_block
18+
label: Breadcrumbs
19+
provider: system
20+
label_display: '0'
21+
visibility: { }
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#Defines settings for the Main Menu block
2+
3+
langcode: en
4+
status: true
5+
dependencies:
6+
config:
7+
- system.menu.main
8+
module:
9+
- system
10+
theme:
11+
- clf
12+
id: clf_drawer
13+
theme: clf
14+
region: drawer
15+
weight: 0
16+
provider: null
17+
plugin: 'system_menu_block:main'
18+
settings:
19+
id: 'system_menu_block:main'
20+
label: 'Main navigation'
21+
provider: system
22+
label_display: '0'
23+
cache:
24+
max_age: -1
25+
level: 1
26+
depth: 2
27+
visibility: { }
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#Defines settings for the Help block
2+
3+
langcode: en
4+
status: true
5+
dependencies:
6+
module:
7+
- help
8+
theme:
9+
- clf
10+
id: clf_help
11+
theme: clf
12+
region: help
13+
weight: -5
14+
provider: null
15+
plugin: help_block
16+
settings:
17+
id: help_block
18+
label: Help
19+
provider: help
20+
label_display: visible
21+
visibility: { }
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#Defines settings for the Main Menu block
2+
3+
langcode: en
4+
status: true
5+
dependencies:
6+
config:
7+
- system.menu.main
8+
module:
9+
- system
10+
theme:
11+
- clf
12+
id: clf_main_menu
13+
theme: clf
14+
region: primary_menu
15+
weight: 0
16+
provider: null
17+
plugin: 'system_menu_block:main'
18+
settings:
19+
id: 'system_menu_block:main'
20+
label: 'Main navigation'
21+
provider: system
22+
label_display: '0'
23+
cache:
24+
max_age: -1
25+
level: 1
26+
depth: 2
27+
visibility: { }
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#Defines settings for the Page Title block
2+
3+
langcode: en
4+
status: true
5+
dependencies:
6+
theme:
7+
- clf
8+
id: clf_pagetitle
9+
theme: clf
10+
region: content
11+
weight: -1
12+
provider: null
13+
plugin: page_title_block
14+
settings:
15+
id: page_title_block
16+
label: 'Page title'
17+
provider: core
18+
label_display: '0'
19+
visibility: { }
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#Defines settings for the Admin Actions block
2+
3+
langcode: en
4+
status: true
5+
dependencies:
6+
theme:
7+
- clf
8+
id: clf_primaryadminactions
9+
theme: clf
10+
region: content
11+
weight: -3
12+
provider: null
13+
plugin: local_actions_block
14+
settings:
15+
id: local_actions_block
16+
label: 'Primary admin actions'
17+
provider: core
18+
label_display: '0'
19+
visibility: { }

config/install/clf.settings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ clf_social_youtube: ''
4242
clf_searchdomain: ''
4343
clf_searchlabel: ''
4444
clf_content_row_class: 'expand row-fluid'
45+
clf_navigation_placement: 'default'
4546
clf_no_sidebar_class: 'span12'
4647
clf_one_sidebar_class: 'span9'
4748
clf_one_sidebar_class_sidebar: 'span3'

0 commit comments

Comments
 (0)