From 6ed3303ad0d4fbac6a66cb2e99290a5bdc42c607 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 8 Jan 2015 17:00:34 +0000
Subject: [PATCH] removed border from images, which conflicted with all other
 images from external django apps #502

---
 .../static/wagtailadmin/scss/components/formatters.scss       | 2 --
 .../static/wagtailadmin/scss/components/listing.scss          | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
index 084a323c8..de061d724 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
@@ -230,8 +230,6 @@ a.tag:hover{
 img{
     max-width:100%;
     height:auto;
-    border: 3px solid $color-grey-4;
-
 }
 
 /* make a block-level element inline */
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index af23d45d8..6d52793e5 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -353,6 +353,10 @@ ul.listing{
         font-size:1em;
         opacity:0.7;
     }
+
+    &.images img{
+        border: 3px solid transparent;
+    }
 }
 ul.listing{
     border-top:1px dashed $color-input-border;