kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '55703-md-image-borders' into 'master' 

Only show borders around markdown images in notes

Closes #55703

See merge request gitlab-org/gitlab-ce!25448
This commit is contained in:
Kushal Pandya 2019-02-22 12:10:47 +00:00
parent 7b86f1a6a4 77ac026e33
commit cafc4943e0
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/framework/markdown_area.scss
View File

@ -149,14 +149,6 @@
margin: 10px 0;
}
// Border around images in issue and MR comments.
img:not(.emoji) {
border: 1px solid $white-normal;
padding: 5px;
margin: 5px 0;
// Ensure that image does not exceed viewport
max-height: calc(100vh - 100px);
}
table:not(.js-syntax-highlight) {
@include markdown-table;

10
app/assets/stylesheets/framework/typography.scss
View File

@ -371,6 +371,16 @@ code {
.md:not(.use-csslab) {
@include md-typography;
&:not(.wiki) {
img:not(.emoji) {
border: 1px solid $white-normal;
padding: 5px;
margin: 5px 0;
// Ensure that image does not exceed viewport
max-height: calc(100vh - 100px);
}
}
}
/**

5
changelogs/unreleased/55703-md-image-borders.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Only show borders for markdown images in notes
merge_request: 25448
author:
type: fixed