summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-01-03 21:19:41 +0100
committerTim Zallmann <tzallmann@gitlab.com>2018-01-03 21:19:41 +0100
commit3ddd3e6966c8ff4c100a138646753f39b3f73cee (patch)
tree61fa78de91477210b336366c337a306b747e3a06
parentab9ac92276c1aa2adee5730ed10d8d7087b6dddf (diff)
downloadgitlab-ce-40042-resizable-file-list-and-commit-panel.tar.gz
Changes based on MR discussion for styling issues40042-resizable-file-list-and-commit-panel
-rw-r--r--app/assets/javascripts/ide/components/ide_context_bar.vue2
-rw-r--r--app/assets/javascripts/ide/components/ide_side_bar.vue2
-rw-r--r--app/assets/javascripts/vue_shared/components/panel_resizer.vue13
3 files changed, 10 insertions, 7 deletions
diff --git a/app/assets/javascripts/ide/components/ide_context_bar.vue b/app/assets/javascripts/ide/components/ide_context_bar.vue
index 0debe82faa3..78c01272af6 100644
--- a/app/assets/javascripts/ide/components/ide_context_bar.vue
+++ b/app/assets/javascripts/ide/components/ide_context_bar.vue
@@ -26,7 +26,7 @@ export default {
return this.rightPanelCollapsed ? 'angle-double-left' : 'angle-double-right';
},
maxSize() {
- return screen.width / 2;
+ return window.innerWidth / 2;
},
panelStyle() {
if (!this.rightPanelCollapsed) {
diff --git a/app/assets/javascripts/ide/components/ide_side_bar.vue b/app/assets/javascripts/ide/components/ide_side_bar.vue
index 273a81c3a6d..269f300a04d 100644
--- a/app/assets/javascripts/ide/components/ide_side_bar.vue
+++ b/app/assets/javascripts/ide/components/ide_side_bar.vue
@@ -24,7 +24,7 @@ export default {
return this.leftPanelCollapsed ? 'angle-double-right' : 'angle-double-left';
},
maxSize() {
- return screen.width / 2;
+ return window.innerWidth / 2;
},
panelStyle() {
if (!this.leftPanelCollapsed) {
diff --git a/app/assets/javascripts/vue_shared/components/panel_resizer.vue b/app/assets/javascripts/vue_shared/components/panel_resizer.vue
index 7285f46484e..4371534d345 100644
--- a/app/assets/javascripts/vue_shared/components/panel_resizer.vue
+++ b/app/assets/javascripts/vue_shared/components/panel_resizer.vue
@@ -1,10 +1,5 @@
<script>
export default {
- data() {
- return {
- size: this.startSize,
- };
- },
props: {
startSize: {
type: Number,
@@ -16,17 +11,25 @@ export default {
},
minSize: {
type: Number,
+ required: false,
default: 0,
},
maxSize: {
type: Number,
+ required: false,
default: Number.MAX_VALUE,
},
enabled: {
type: Boolean,
+ required: false,
default: true,
},
},
+ data() {
+ return {
+ size: this.startSize,
+ };
+ },
computed: {
className() {
return `drag${this.side}`;