diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2018-08-07 15:15:56 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-07 15:15:56 +0000 |
| commit | 0d6e50d54270a973647f828047828b80fdf8d013 (patch) | |
| tree | 9bf41acf27d039f673f45520187daff9d47cb04f /app/assets/javascripts/vue_shared/components | |
| parent | 0e90f27ff79d1743d8ec5e49e003d4c68a689f78 (diff) | |
| download | gitlab-ce-0d6e50d54270a973647f828047828b80fdf8d013.tar.gz | |
Create Web IDE MR and branch picker
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue | 14 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/icon.vue | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue index 3cba0c5e633..af5ebcdc40a 100644 --- a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue @@ -38,9 +38,17 @@ export default { v-show="isLoading" :inline="true" /> - <span class="dropdown-toggle-text"> - {{ toggleText }} - </span> + <template> + <slot + v-if="$slots.default" + ></slot> + <span + v-else + class="dropdown-toggle-text" + > + {{ toggleText }} + </span> + </template> <span v-show="!isLoading" class="dropdown-toggle-icon" diff --git a/app/assets/javascripts/vue_shared/components/icon.vue b/app/assets/javascripts/vue_shared/components/icon.vue index 3cf90b45a97..5e0e7315e99 100644 --- a/app/assets/javascripts/vue_shared/components/icon.vue +++ b/app/assets/javascripts/vue_shared/components/icon.vue @@ -1,7 +1,7 @@ <script> // only allow classes in images.scss e.g. s12 -const validSizes = [8, 12, 16, 18, 24, 32, 48, 72]; +const validSizes = [8, 10, 12, 16, 18, 24, 32, 48, 72]; let iconValidator = () => true; /* |