Skip to content

Commit

Permalink
Merge pull request #112 from lindsaycarr/master
Browse files Browse the repository at this point in the history
image captions!
  • Loading branch information
mwernimont authored Sep 22, 2017
2 parents bce8440 + eee801f commit d67e804
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion layout/templates/image-section.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
<div class="imagesDescription">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. In dapibus urna a turpis maximus, ac ultrices neque ultrices. Integer condimentum metus libero, vel fringilla dolor ullamcorper vitae. Duis quis cursus nisl. Nulla consequat efficitur neque, et accumsan massa viverra ac. Maecenas viverra maximus libero ut commodo. Sed a diam dui. Donec ante odio, maximus id posuere vulputate, varius ut nulla. Duis ac magna id urna pellentesque pellentesque. Integer varius dui erat, nec dignissim diam accumsan ac. Nullam suscipit nunc ac porttitor volutpat. Mauris eleifend sem orci, sit amet suscipit est scelerisque quis. Nulla rutrum in ante non aliquet. Sed faucibus libero diam, non pellentesque arcu consequat consectetur. Sed venenatis, tellus a laoreet ullamcorper, orci velit consequat augue, vel feugiat magna metus eget dolor. Donec hendrerit imperdiet ultricies. Cras interdum, arcu sed ornare mattis, ex tortor semper lorem, eget porta justo libero in nunc.
{{{image-caption}}}
</p>
</div>
</div>
19 changes: 15 additions & 4 deletions viz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ info:
water, hurricane, maria, USGS, NOAA, VIZLAB, NWIS, flood, Puerto Rico
audience:
thumbnail-facebook:
url: images/thumb-facebook.png
url: https://owi.usgs.gov/vizlab/images/thumb-facebook.png
width: 1560
height: 820
alttext: "Hurricane Maria"
type: image/png
thumbnail-twitter:
url: images/thumb-twitter.png
url: https://owi.usgs.gov/vizlab/images/thumb-twitter.png
width: 560
height: 300
alttext: "Hurricane Maria"
Expand Down Expand Up @@ -599,9 +599,19 @@ publish:
depends:
gage-image: gage-image
hydrograph-image: hydrograph-image
markdown-text: markdown-text
context:
gage-image: gage-image
hydrograph-image: hydrograph-image
image-caption: markdown-text.texas-caption
-
id: footnote-section
publisher: section
template: layout/templates/text-section.mustache
depends: markdown-text
context:
text: markdown-text.footnote
id: textSection
-
id: social-section
publisher: section
Expand All @@ -626,9 +636,10 @@ publish:
map-section: map-section
social-section: social-section
description-section: description-section
image-section: image-section
footnote-section: footnote-section
header: header
footer: footer
image-section: image-section
figure-css: map-figure-css
jquery-js: lib-jquery-js
animate-js: animate-js
Expand All @@ -647,7 +658,7 @@ publish:
thumb-landing: thumb-landing
comment: missing from depends are the thumbnails which should be added back
context:
sections: [ map-section, social-section, description-section, image-section ]
sections: [ map-section, social-section, description-section, image-section, footnote-section ]
resources: [ figure-css, jquery-js, vizlab-js, svg-injector-js, animate-js, svg-css,
header-css, footer-css, social-media-css, vizlab-favicon, sourcesanspro]
-
Expand Down

0 comments on commit d67e804

Please sign in to comment.