Skip to content

Commit

Permalink
Issue 24 (#28)
Browse files Browse the repository at this point in the history
* Style for social icons

* Move descrition to article header

* Add script for analytics e iframe

* Add last changes do changelog

* Refactor
  • Loading branch information
hvelarde committed Oct 10, 2016
1 parent 15ba699 commit 45ea544
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ There's a frood who really knows where his towel is.
1.0a3 (unreleased)
------------------

- Add class for social icon <div> tag.
[agnogueira]

- Move description to article header.
[agnogueira]

- Add missing script for <amp-analytics> component.
[agnogueira]

- Do not fail if an image doesn't have a ``src`` attribute,
or if it was referenced inside the body text as an external resource.
[hvelarde]
Expand Down
9 changes: 5 additions & 4 deletions src/collective/behavior/amp/browser/view.pt
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
</style>
<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
<script async src="https://cdn.ampproject.org/v0.js"></script>
<script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
<script async custom-element="amp-sidebar" src="https://cdn.ampproject.org/v0/amp-sidebar-0.1.js"></script>
<script async custom-element="amp-social-share" src="https://cdn.ampproject.org/v0/amp-social-share-0.1.js" tal:condition="view/has_sociallike"></script>
</head>
Expand Down Expand Up @@ -137,6 +138,9 @@

<h1 tal:content="context/title">Title</h1>

<p tal:condition="context/description"
tal:content="context/description">Description</p>

<div class="amp-byline" tal:condition="view/show_byline">
<span tal:condition="view/author">
<tal:i18n i18n:translate="label_by_author">
Expand Down Expand Up @@ -170,7 +174,7 @@
</div>
</header>

<div tal:condition="view/has_sociallike">
<div tal:condition="view/has_sociallike" class="social-icons">
<tal:buttons repeat="button view/share_buttons">
<amp-social-share tal:condition="python:button == 'facebook'"
tal:attributes="type button;
Expand All @@ -184,9 +188,6 @@
</tal:buttons>
</div>

<p tal:condition="context/description"
tal:content="context/description">Description</p>

<p tal:replace="structure view/text">Body text</p>
</article>

Expand Down

0 comments on commit 45ea544

Please sign in to comment.