Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-06-30 00:27:58 +0300
committerFatih Acet <acetfatih@gmail.com>2018-06-30 00:27:58 +0300
commit9ecb06ae2a1d6eb72f524ad463e06c1c1d74fa06 (patch)
tree4945ee6add67d0825dfdc50d48da0b29024082c3 /app/assets
parente325367a85ca10ba5d4f28d6ff1005d8af3e5bb6 (diff)
Resolve "Merge request collapse icon is tiny"
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/diffs/components/diff_file_header.vue6
-rw-r--r--app/assets/stylesheets/pages/diff.scss4
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 1176ca25b7b..fba1d1af7cd 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -112,7 +112,11 @@ export default {
},
methods: {
handleToggle(e, checkTarget) {
- if (!checkTarget || e.target === this.$refs.header) {
+ if (
+ !checkTarget ||
+ e.target === this.$refs.header ||
+ (e.target.classList && e.target.classList.contains('diff-toggle-caret'))
+ ) {
this.$emit('toggleFile');
}
},
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 8c25d177813..a90a9c6e486 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -14,8 +14,8 @@
background-color: $gray-normal;
}
- .diff-toggle-caret {
- padding-right: 6px;
+ svg {
+ vertical-align: text-bottom;
}
}