diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2018-12-03 13:01:17 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-12-03 13:01:17 +0000 |
| commit | fcdb6c1968676c9bd81b097e5aa01c6159069728 (patch) | |
| tree | c0a3d8be9ca5881bdcd74aa35557941a0c05cb8d | |
| parent | 2b1cac491b271f5137c4961cba42c7c774e5de4c (diff) | |
| download | gitlab-ce-fcdb6c1968676c9bd81b097e5aa01c6159069728.tar.gz | |
CE Port of "Add empty and disabled web terminal tab"
| -rw-r--r-- | app/assets/javascripts/ide/components/panes/right.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/alerts.scss | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/components/panes/right.vue b/app/assets/javascripts/ide/components/panes/right.vue index e318367a5ec..7a57ccf2dd3 100644 --- a/app/assets/javascripts/ide/components/panes/right.vue +++ b/app/assets/javascripts/ide/components/panes/right.vue @@ -105,7 +105,7 @@ export default { :key="tabView.name" class="h-100" > - <component :is="tabView.name" /> + <component :is="tabView.component || tabView.name" /> </div> </resizable-panel> <nav class="ide-activity-bar"> diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 4041f2b4479..d320fa5f595 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -6,6 +6,7 @@ @import 'bootstrap_migration'; @import 'framework/layout'; +@import 'framework/alerts'; @import 'framework/animations'; @import 'framework/vue_transitions'; @import 'framework/avatar'; diff --git a/app/assets/stylesheets/framework/alerts.scss b/app/assets/stylesheets/framework/alerts.scss new file mode 100644 index 00000000000..866792a6a1b --- /dev/null +++ b/app/assets/stylesheets/framework/alerts.scss @@ -0,0 +1,4 @@ +.alert-tip { + background-color: $theme-gray-100; + color: $theme-gray-900; +} |