Skip to content

Commit

Permalink
CONCOREL-108: Add ConcordiaMed to the footer. Adjust docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Marta Pieczynska committed Feb 1, 2017
1 parent 97bd0af commit ce9f7c4
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 3 deletions.
8 changes: 8 additions & 0 deletions source/modules/footer/footer.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ var data = _.merge(defaultData, {
documentation: dataHelper.getDocumentation('footer.md')
},
links: requireNew('../sociallist/sociallist.data.js').links,
concordiaMed: {
darkTheme: true,
title: 'ConcordiaMed 24h Gesundheitsratgeber',
phone: {
number: '+410412100250',
text: '+41 (0)41 210 02 50'
}
},
columns: [
{
title: 'Private',
Expand Down
1 change: 1 addition & 0 deletions source/modules/footer/footer.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{{> modules/collapsiblecolumns/collapsiblecolumns}}
</div>
</div>
{{> modules/concordiamed/concordiamed concordiaMed}}
<div>
<div class="footer__wrap footer__footnote">
<ul class="footer__links">
Expand Down
6 changes: 4 additions & 2 deletions source/modules/footer/footer.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
Footer of the page.

The module reuses other modules:
* [Location Search](http://localhost:9000/modules/locationsearch/locationsearch.html)
* [Location Search](/modules/locationsearch/locationsearch.html) (light theme variant)
* [Collapsible Columns](/modules/collapsiblecolumns/collapsiblecolumns.html)
* [ConcordiaMed](/modules/concordiamed/concordiamed.html) (dark theme variant)
* [SocialList](/modules/sociallist/sociallist.html)

## Integration

Copy HTML. Please remember to set proper action form action, id and name of the select used in `LocationSearch`.
Copy HTML. Please remember to set proper action form action, id and name of the select used in `LocationSearch`.

7 changes: 7 additions & 0 deletions source/modules/footer/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
p {
color: rgba($colorPaleGreyTwo, .7);
}

.footer__wrap:after {
content: '';
display: block;
border-top: 2px solid rgba($colorBlueGrey, .5);
margin: 0 $padding;
}
}

&__footnote {
Expand Down
2 changes: 1 addition & 1 deletion source/modules/linklist/linklist.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var data = _.merge(defaultData, {
title: 'LinkList',
specificationId: '',
specificationURL: 'https://projects.unic.com/display/CONCOREL/',
jira: '',
jira: 'CONCOREL-108',
className: 'LinkList',
code: dataHelper.getTemplateCode('linklist.hbs'),
documentation: dataHelper.getDocumentation('linklist.md')
Expand Down

0 comments on commit ce9f7c4

Please sign in to comment.