Merge fcae170 into 7845cb4

wagtail · Nov 27, 2015 · f5cfb4d · f5cfb4d
2 parents 7845cb4 + fcae170
commit f5cfb4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -501,6 +501,10 @@ <h3>Avatar icons</h3>
             <p><span class="avatar small icon icon-user"><img src="{% gravatar_url "david@torchbox.com" %}" /></span> Gravatar set (small)</p>
             <p><span class="avatar small icon icon-user"><img src="{% gravatar_url "aeon@torchbox.com" %}" /></span> Gravatar not set (small)</p>
 
+            <h3>Transparency in images</h3>
+            <p>Add the <code>.show-transparency</code> class to any <code>img</code> tag to highlight transparent areas of an image</p>
+            <img src="{% static 'wagtailadmin/images/wagtail-logo.svg' %}" width="200" class="show-transparency" />
+
             <h3>Status tags</h3>
             <div class="status-tag primary">Primary tag</div>
 

diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html
@@ -17,7 +17,7 @@ <h2>{% trans "Latest images" %}</h2>
         {% for image in images %}
             <li>
                 <a class="image-choice" href="{% if will_select_format %}{% url 'wagtailimages:chooser_select_format' image.id %}{% else %}{% url 'wagtailimages:image_chosen' image.id %}{% endif %}">
-                    <div class="image">{% image image max-165x165 %}</div>
+                    <div class="image">{% image image max-165x165 class="show-transparency" %}</div>
                     <h3>{{ image.title|ellipsistrim:60 }}</h3>
                 </a>
             </li>

diff --git a/wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html b/wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html
@@ -6,7 +6,7 @@
 {% block chosen_state_view %}
     <div class="preview-image">
         {% if image %}
-            {% image image max-165x165 %}
+            {% image image max-165x165 class="show-transparency" %}
         {% else %}
             <img>
         {% endif %}