Skip to content

Commit

Permalink
Merge pull request #779 from plone/fgrcon-fix-2077
Browse files Browse the repository at this point in the history
  • Loading branch information
thet authored Jun 17, 2017
2 parents 350df36 + 1922b8c commit 3c14abc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ New features:

Bug fixes:

- fixed css-classes for thumb scales ...
https://github.com/plone/Products.CMFPlone/issues/2077
[fgrcon]


- modal: Fixed duplicate window.confirm on form unload.
Fixes `issue 777 <https://github.com/plone/mockup/issues/777>`_.
[seanupton]
Expand Down
2 changes: 1 addition & 1 deletion mockup/patterns/structure/templates/tablerow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<% } %>
</div>
<% if(attributes["getIcon"] && thumb_scale) { %>
<img class="image-<%- thumb_scale %> pull-right" src="<%- getURL %>/@@images/image/<%- thumb_scale %>">
<img class="thumb-<%- thumb_scale %> pull-right" src="<%- getURL %>/@@images/image/<%- thumb_scale %>">
<% } %>
</td>

Expand Down
2 changes: 1 addition & 1 deletion mockup/tests/pattern-structure-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ define([
var el = row.render().el;

expect($('.title img', el).length).to.equal(1);
expect($('.title img', el).attr('class')).to.have.string('image-tile');
expect($('.title img', el).attr('class')).to.have.string('thumb-tile');
});

it('should display no icon for contents without images', function() {
Expand Down

0 comments on commit 3c14abc

Please sign in to comment.