diff options
author | Phil Hughes <me@iamphill.com> | 2018-04-18 14:14:45 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-04-18 14:14:45 +0100 |
commit | 8c5adf681bc4d1f3a5ce883fca41be540ad27119 (patch) | |
tree | 5e4d7c2f9624f4c0cd6a227fea9bbad2698ea55e /app/assets | |
parent | fb3e23b06da10a90149aba0e2dbc3bca04286b0e (diff) | |
download | gitlab-ce-8c5adf681bc4d1f3a5ce883fca41be540ad27119.tar.gz |
updates to variable names to make more sense
fixed up duplicate is-collapsed classes
Diffstat (limited to 'app/assets')
6 files changed, 35 insertions, 36 deletions
diff --git a/app/assets/javascripts/ide/components/changed_file_icon.vue b/app/assets/javascripts/ide/components/changed_file_icon.vue index 9ce653f6e81..1fc11c84639 100644 --- a/app/assets/javascripts/ide/components/changed_file_icon.vue +++ b/app/assets/javascripts/ide/components/changed_file_icon.vue @@ -29,8 +29,8 @@ export default { }, computed: { changedIcon() { - const prefix = this.file.staged && !this.showStagedIcon ? '-solid' : ''; - return this.file.tempFile ? `file-additions${prefix}` : `file-modified${prefix}`; + const suffix = this.file.staged && !this.showStagedIcon ? '-solid' : ''; + return this.file.tempFile ? `file-addition${suffix}` : `file-modified${suffix}`; }, stagedIcon() { return `${this.changedIcon}-solid`; diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue index 5836f714b63..ff05ee8682a 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue @@ -29,7 +29,7 @@ export default { required: false, default: true, }, - icon: { + iconName: { type: String, required: true, }, @@ -78,9 +78,6 @@ export default { > <header class="multi-file-commit-panel-header" - :class="{ - 'is-collapsed': rightPanelCollapsed, - }" > <div v-if="!rightPanelCollapsed" @@ -91,7 +88,7 @@ export default { > <icon v-once - :name="icon" + :name="iconName" :size="18" /> {{ titleText }} @@ -123,7 +120,7 @@ export default { <list-collapsed v-if="rightPanelCollapsed" :files="fileList" - :icon="icon" + :icon-name="iconName" :title="title" /> <template v-else> diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue index 12281501038..2254271c679 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue @@ -1,11 +1,11 @@ <script> -import icon from '~/vue_shared/components/icon.vue'; +import Icon from '~/vue_shared/components/icon.vue'; import tooltip from '~/vue_shared/directives/tooltip'; import { sprintf, n__, __ } from '~/locale'; export default { components: { - icon, + Icon, }, directives: { tooltip, @@ -15,7 +15,7 @@ export default { type: Array, required: true, }, - icon: { + iconName: { type: String, required: true, }, @@ -52,7 +52,7 @@ export default { return sprintf(__('%{title} changes'), { title: this.title }); }, additionIconName() { - return this.title.toLowerCase() === 'staged' ? 'file-additions-solid' : 'file-additions'; + return this.title.toLowerCase() === 'staged' ? 'file-addition-solid' : 'file-addition'; }, modifiedIconName() { return this.title.toLowerCase() === 'staged' ? 'file-modified-solid' : 'file-modified'; @@ -74,7 +74,7 @@ export default { > <icon v-once - :name="icon" + :name="iconName" :size="18" /> </div> diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue index d3c30623332..ad4713c40d5 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue @@ -33,7 +33,7 @@ export default { computed: { iconName() { const prefix = this.stagedList ? '-solid' : ''; - return this.file.tempFile ? `file-additions${prefix}` : `file-modified${prefix}`; + return this.file.tempFile ? `file-addition${prefix}` : `file-modified${prefix}`; }, iconClass() { return `multi-file-${this.file.tempFile ? 'additions' : 'modified'} append-right-8`; diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue index 32b6af892d8..877d1b5e026 100644 --- a/app/assets/javascripts/ide/components/repo_commit_section.vue +++ b/app/assets/javascripts/ide/components/repo_commit_section.vue @@ -1,10 +1,10 @@ <script> import { mapState, mapActions, mapGetters } from 'vuex'; import tooltip from '~/vue_shared/directives/tooltip'; -import icon from '~/vue_shared/components/icon.vue'; +import Icon from '~/vue_shared/components/icon.vue'; import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue'; import LoadingButton from '~/vue_shared/components/loading_button.vue'; -import commitFilesList from './commit_sidebar/list.vue'; +import CommitFilesList from './commit_sidebar/list.vue'; import EmptyState from './commit_sidebar/empty_state.vue'; import CommitMessageField from './commit_sidebar/message_field.vue'; import * as consts from '../stores/modules/commit/constants'; @@ -13,8 +13,8 @@ import Actions from './commit_sidebar/actions.vue'; export default { components: { DeprecatedModal, - icon, - commitFilesList, + Icon, + CommitFilesList, EmptyState, Actions, LoadingButton, @@ -72,7 +72,7 @@ export default { v-if="changedFiles.length || stagedFiles.length" > <commit-files-list - icon="unstaged" + icon-name="unstaged" :title="__('Unstaged')" :file-list="changedFiles" action="stageAllChanges" @@ -80,7 +80,7 @@ export default { item-action-component="stage-button" /> <commit-files-list - icon="staged" + icon-name="staged" :title="__('Staged')" :file-list="stagedFiles" action="unstageAllChanges" diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 4bb07234722..98853d0e7af 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -540,22 +540,6 @@ margin-bottom: 0; border-bottom: 1px solid $white-dark; padding: $gl-btn-padding 0; - - &.is-collapsed { - margin-left: -$gl-padding; - margin-right: -$gl-padding; - - svg { - margin-left: auto; - margin-right: auto; - } - - .multi-file-commit-panel-collapse-btn { - margin-right: auto; - margin-left: auto; - border-left: 0; - } - } } .multi-file-commit-panel-header-title { @@ -835,6 +819,24 @@ flex: 1; min-height: 140px; } + + &.is-collapsed { + .multi-file-commit-panel-header { + margin-left: -$gl-padding; + margin-right: -$gl-padding; + + svg { + margin-left: auto; + margin-right: auto; + } + + .multi-file-commit-panel-collapse-btn { + margin-right: auto; + margin-left: auto; + border-left: 0; + } + } + } } .ide-staged-action-btn { |