diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 06:09:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 06:09:42 +0300 |
commit | f8454d351eb238ae9898fb7bd67013fe8e93d0db (patch) | |
tree | 988278bb45940e7b9c3253e652f54597fce33f2c /app/assets/javascripts/blob | |
parent | 46c2316f9226d9701437bd535880651e59bebdc6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/blob')
3 files changed, 27 insertions, 24 deletions
diff --git a/app/assets/javascripts/blob/components/blob_header.vue b/app/assets/javascripts/blob/components/blob_header.vue index 76c5779f3ae..fd40c51fec1 100644 --- a/app/assets/javascripts/blob/components/blob_header.vue +++ b/app/assets/javascripts/blob/components/blob_header.vue @@ -71,7 +71,7 @@ export default { </template> </blob-filepath> - <div class="file-actions d-none d-sm-flex"> + <div class="gl-display-none gl-display-sm-flex"> <viewer-switcher v-if="showViewerSwitcher" v-model="viewer" /> <slot name="actions"></slot> diff --git a/app/assets/javascripts/blob/components/blob_header_default_actions.vue b/app/assets/javascripts/blob/components/blob_header_default_actions.vue index 62fef108b47..daade611651 100644 --- a/app/assets/javascripts/blob/components/blob_header_default_actions.vue +++ b/app/assets/javascripts/blob/components/blob_header_default_actions.vue @@ -1,5 +1,5 @@ <script> -import { GlDeprecatedButton, GlButtonGroup, GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { GlButton, GlButtonGroup, GlTooltipDirective } from '@gitlab/ui'; import { BTN_COPY_CONTENTS_TITLE, BTN_DOWNLOAD_TITLE, @@ -10,9 +10,8 @@ import { export default { components: { - GlIcon, GlButtonGroup, - GlDeprecatedButton, + GlButton, }, directives: { GlTooltip: GlTooltipDirective, @@ -48,7 +47,7 @@ export default { </script> <template> <gl-button-group> - <gl-deprecated-button + <gl-button v-if="!hasRenderError" v-gl-tooltip.hover :aria-label="$options.BTN_COPY_CONTENTS_TITLE" @@ -56,26 +55,29 @@ export default { :disabled="copyDisabled" data-clipboard-target="#blob-code-content" data-testid="copyContentsButton" - > - <gl-icon name="copy-to-clipboard" :size="14" /> - </gl-deprecated-button> - <gl-deprecated-button + icon="copy-to-clipboard" + category="primary" + variant="default" + /> + <gl-button v-gl-tooltip.hover :aria-label="$options.BTN_RAW_TITLE" :title="$options.BTN_RAW_TITLE" :href="rawPath" target="_blank" - > - <gl-icon name="doc-code" :size="14" /> - </gl-deprecated-button> - <gl-deprecated-button + icon="doc-code" + category="primary" + variant="default" + /> + <gl-button v-gl-tooltip.hover :aria-label="$options.BTN_DOWNLOAD_TITLE" :title="$options.BTN_DOWNLOAD_TITLE" :href="downloadUrl" target="_blank" - > - <gl-icon name="download" :size="14" /> - </gl-deprecated-button> + icon="download" + category="primary" + variant="default" + /> </gl-button-group> </template> diff --git a/app/assets/javascripts/blob/components/blob_header_viewer_switcher.vue b/app/assets/javascripts/blob/components/blob_header_viewer_switcher.vue index 5b15fe2d7cc..902dd0b8eec 100644 --- a/app/assets/javascripts/blob/components/blob_header_viewer_switcher.vue +++ b/app/assets/javascripts/blob/components/blob_header_viewer_switcher.vue @@ -1,5 +1,5 @@ <script> -import { GlButton, GlButtonGroup, GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { GlButton, GlButtonGroup, GlTooltipDirective } from '@gitlab/ui'; import { RICH_BLOB_VIEWER, RICH_BLOB_VIEWER_TITLE, @@ -9,7 +9,6 @@ import { export default { components: { - GlIcon, GlButtonGroup, GlButton, }, @@ -52,19 +51,21 @@ export default { :title="$options.SIMPLE_BLOB_VIEWER_TITLE" :selected="isSimpleViewer" :class="{ active: isSimpleViewer }" + icon="code" + category="primary" + variant="default" @click="switchToViewer($options.SIMPLE_BLOB_VIEWER)" - > - <gl-icon name="code" :size="14" /> - </gl-button> + /> <gl-button v-gl-tooltip.hover :aria-label="$options.RICH_BLOB_VIEWER_TITLE" :title="$options.RICH_BLOB_VIEWER_TITLE" :selected="isRichViewer" :class="{ active: isRichViewer }" + icon="document" + category="primary" + variant="default" @click="switchToViewer($options.RICH_BLOB_VIEWER)" - > - <gl-icon name="document" :size="14" /> - </gl-button> + /> </gl-button-group> </template> |