summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-07-28 12:51:12 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-07-28 12:51:12 +0000
commit4ccecb7db4879b0eae8211578b533911ee8920df (patch)
treea16ffa75fd0c4b69e1d6f7ff0a662b6c84dadfd2
parent20d7b04639c38e3216b115484e36446c3465b1bf (diff)
parente1c432d84812cbcaa5bca1d43cc4dab902ae2360 (diff)
downloadgitlab-ce-4ccecb7db4879b0eae8211578b533911ee8920df.tar.gz
Merge branch '35691-images-in-wiki-display-have-wrong-size' into 'master'
Resolve "Images in Wiki display have wrong size" Closes #35691 See merge request !13153
-rw-r--r--app/assets/stylesheets/framework/typography.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index befd8133be0..bf5f124d142 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -19,9 +19,9 @@
}
img.js-lazy-loaded {
- min-width: none;
- min-height: none;
- background-color: none;
+ min-width: inherit;
+ min-height: inherit;
+ background-color: inherit;
}
p a:not(.no-attachment-icon) img {