summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-10-02 15:41:28 +0100
committerPhil Hughes <me@iamphill.com>2018-10-02 15:41:28 +0100
commitf7a7e8a4d9ba396d903c540ce66975a215389f69 (patch)
tree8fbcafb490b09d628b1b21d8c527130d4ca11c20
parent443bac0a904b9c8ede2924c843b2ca1fd0b09861 (diff)
downloadgitlab-ce-mr-file-tree-data.tar.gz
Updated computed prop namemr-file-tree-data
Moved random number into a constant
-rw-r--r--app/assets/javascripts/diffs/components/compare_versions.vue6
-rw-r--r--app/assets/javascripts/diffs/components/compare_versions_dropdown.vue1
-rw-r--r--app/assets/javascripts/lib/utils/common_utils.js3
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss1
4 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/diffs/components/compare_versions.vue b/app/assets/javascripts/diffs/components/compare_versions.vue
index 6f1e2895a38..9bbf62c0eb6 100644
--- a/app/assets/javascripts/diffs/components/compare_versions.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions.vue
@@ -40,17 +40,17 @@ export default {
comparableDiffs() {
return this.mergeRequestDiffs.slice(1);
},
- whitespaceVisible() {
+ isWhitespaceVisible() {
return !getParameterValues('w')[0];
},
toggleWhitespaceText() {
- if (this.whitespaceVisible) {
+ if (this.isWhitespaceVisible) {
return __('Hide whitespace changes');
}
return __('Show whitespace changes');
},
toggleWhitespacePath() {
- if (this.whitespaceVisible) {
+ if (this.isWhitespaceVisible) {
return mergeUrlParams({ w: 1 }, window.location.href);
}
diff --git a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
index e6916c275ee..c3acc352d5e 100644
--- a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
@@ -118,6 +118,7 @@ export default {
<Icon
:size="12"
name="angle-down"
+ class="position-absolute"
/>
</a>
<div class="dropdown-menu dropdown-select dropdown-menu-selectable">
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index 36cdf857989..e14fff7a610 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -88,6 +88,7 @@ export const handleLocationHash = () => {
const fixedDiffStats = document.querySelector('.js-diff-files-changed');
const fixedNav = document.querySelector('.navbar-gitlab');
const performanceBar = document.querySelector('#js-peek');
+ const topPadding = 8;
let adjustment = 0;
if (fixedNav) adjustment -= fixedNav.offsetHeight;
@@ -109,7 +110,7 @@ export const handleLocationHash = () => {
}
if (isInMRPage()) {
- adjustment -= 8;
+ adjustment -= topPadding;
}
window.scrollBy(0, adjustment);
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 834e4270f6f..45382d4ea43 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -730,7 +730,6 @@
max-width: 170px;
svg {
- position: absolute;
top: 10px;
right: 8px;
}