summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-14 12:15:21 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-19 18:02:53 -0600
commit8685b3f80a9a653849776a83b7a968725a8ae1f0 (patch)
tree03f5ba9fcb342fbbaeefb0437f5a4e3c12b6c4e7
parent98cede7ebeae9dac994b35b66be6aab14eb932b3 (diff)
downloadgitlab-ce-8685b3f80a9a653849776a83b7a968725a8ae1f0.tar.gz
Add borders to images in issues, MRs, and Help.
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/help.scss7
-rw-r--r--app/assets/stylesheets/pages/issuable.scss7
-rw-r--r--app/assets/stylesheets/pages/notes.scss7
4 files changed, 22 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 44e6a194745..a0c681f520d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 8.9.0 (unreleased)
- Redesign all Devise emails. !4297
- Don't show 'Leave Project' to group members
- Fix wiki page events' webhook to point to the wiki repository
+ - Add a border around images to differentiate them from the background.
- Don't show tags for revert and cherry-pick operations
- Fix issue todo not remove when leave project !4150 (Long Nguyen)
- Allow customisable text on the 'nearly there' page after a user signs up
diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index 4a95b7b852e..204c0eea487 100644
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
@@ -57,4 +57,11 @@
.documentation {
padding: 7px;
+
+ // Border around images in the help pages.
+ img {
+ border: 1px solid $table-border-gray;
+ padding: 5px;
+ margin: 5px;
+ }
}
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 687117233f6..bf6f44161df 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -4,6 +4,13 @@
margin-right: 1px;
}
}
+
+ // Border around images in issue and MR descriptions.
+ .description img {
+ border: 1px solid $table-border-gray;
+ padding: 5px;
+ margin: 5px;
+ }
}
.issuable-filter-count {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 35d728aec83..44db5b156ce 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -117,6 +117,13 @@ ul.notes {
code {
word-break: keep-all;
}
+
+ // Border around images in issue and MR comments.
+ img {
+ border: 1px solid $table-border-gray;
+ padding: 5px;
+ margin: 5px 0;
+ }
}
}