diff options
Diffstat (limited to 'app/assets/javascripts/sidebar/components')
18 files changed, 64 insertions, 257 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue index 284a258d3c9..0ad2b3a73a2 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue @@ -32,18 +32,8 @@ export default { <template> <div class="title hide-collapsed"> {{ assigneeTitle }} - <i - v-if="loading" - aria-hidden="true" - class="fa fa-spinner fa-spin block-loading" - > - - </i> - <a - v-if="editable" - class="js-sidebar-dropdown-toggle edit-link float-right" - href="#" - > + <i v-if="loading" aria-hidden="true" class="fa fa-spinner fa-spin block-loading"> </i> + <a v-if="editable" class="js-sidebar-dropdown-toggle edit-link float-right" href="#"> {{ __('Edit') }} </a> <a @@ -53,12 +43,7 @@ export default { href="#" role="button" > - <i - aria-hidden="true" - data-hidden="true" - class="fa fa-angle-double-right" - > - </i> + <i aria-hidden="true" data-hidden="true" class="fa fa-angle-double-right"> </i> </a> </div> </template> diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.vue b/app/assets/javascripts/sidebar/components/assignees/assignees.vue index f1ea6aacdb2..d1a396182b3 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignees.vue @@ -133,12 +133,7 @@ export default { data-placement="left" data-boundary="viewport" > - <i - v-if="hasNoUsers" - aria-label="No Assignee" - class="fa fa-user" - > - </i> + <i v-if="hasNoUsers" aria-label="No Assignee" class="fa fa-user"> </i> <button v-for="(user, index) in users" v-if="shouldRenderCollapsedAssignee(index)" @@ -152,20 +147,10 @@ export default { width="24" class="avatar avatar-inline s24" /> - <span class="author"> - {{ user.name }} - </span> + <span class="author"> {{ user.name }} </span> </button> - <button - v-if="hasMoreThanTwoAssignees" - class="btn-link" - type="button" - > - <span - class="avatar-counter sidebar-avatar-counter" - > - {{ sidebarAvatarCounter }} - </span> + <button v-if="hasMoreThanTwoAssignees" class="btn-link" type="button"> + <span class="avatar-counter sidebar-avatar-counter"> {{ sidebarAvatarCounter }} </span> </button> </div> <div class="value hide-collapsed"> @@ -173,34 +158,20 @@ export default { <span class="assign-yourself no-value"> No assignee <template v-if="editable"> - - - <button - type="button" - class="btn-link" - @click="assignSelf" - > - assign yourself - </button> + - <button type="button" class="btn-link" @click="assignSelf">assign yourself</button> </template> </span> </template> <template v-else-if="hasOneUser"> - <a - :href="assigneeUrl(firstUser)" - class="author-link bold" - > + <a :href="assigneeUrl(firstUser)" class="author-link bold"> <img :alt="assigneeAlt(firstUser)" :src="avatarUrl(firstUser)" width="32" class="avatar avatar-inline s32" /> - <span class="author"> - {{ firstUser.name }} - </span> - <span class="username"> - {{ assigneeUsername(firstUser) }} - </span> + <span class="author"> {{ firstUser.name }} </span> + <span class="username"> {{ assigneeUsername(firstUser) }} </span> </a> </template> <template v-else> @@ -227,15 +198,8 @@ export default { </a> </div> </div> - <div - v-if="renderShowMoreSection" - class="user-list-more" - > - <button - type="button" - class="btn-link" - @click="toggleShowLess" - > + <div v-if="renderShowMoreSection" class="user-list-more"> + <button type="button" class="btn-link" @click="toggleShowLess"> <template v-if="showLess"> {{ hiddenAssigneesLabel }} </template> diff --git a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue index 439e8a69df0..597b723a9d9 100644 --- a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue +++ b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue @@ -74,10 +74,7 @@ export default { data-boundary="viewport" @click="toggleForm" > - <icon - :name="confidentialityIcon" - aria-hidden="true" - /> + <icon :name="confidentialityIcon" aria-hidden="true" /> </div> <div class="title hide-collapsed"> {{ __('Confidentiality') }} @@ -96,20 +93,11 @@ export default { :is-confidential="isConfidential" :update-confidential-attribute="updateConfidentialAttribute" /> - <div - v-if="!isConfidential" - class="no-value sidebar-item-value"> - <icon - :size="16" - name="eye" - aria-hidden="true" - class="sidebar-item-icon inline" - /> + <div v-if="!isConfidential" class="no-value sidebar-item-value"> + <icon :size="16" name="eye" aria-hidden="true" class="sidebar-item-icon inline" /> {{ __('Not confidential') }} </div> - <div - v-else - class="value sidebar-item-value hide-collapsed"> + <div v-else class="value sidebar-item-value hide-collapsed"> <icon :size="16" name="eye-slash" diff --git a/app/assets/javascripts/sidebar/components/confidential/edit_form.vue b/app/assets/javascripts/sidebar/components/confidential/edit_form.vue index 4165aa19acf..0ecbf934c25 100644 --- a/app/assets/javascripts/sidebar/components/confidential/edit_form.vue +++ b/app/assets/javascripts/sidebar/components/confidential/edit_form.vue @@ -35,14 +35,8 @@ export default { <div class="dropdown show"> <div class="dropdown-menu sidebar-item-warning-message"> <div> - <p - v-if="!isConfidential" - v-html="confidentialityOnWarning"> - </p> - <p - v-else - v-html="confidentialityOffWarning"> - </p> + <p v-if="!isConfidential" v-html="confidentialityOnWarning"></p> + <p v-else v-html="confidentialityOffWarning"></p> <edit-form-buttons :is-confidential="isConfidential" :update-confidential-attribute="updateConfidentialAttribute" diff --git a/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue index 38b1ddbfd5b..4b9bb5c7b0e 100644 --- a/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue +++ b/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue @@ -36,18 +36,10 @@ export default { <template> <div class="sidebar-item-warning-message-actions"> - <button - type="button" - class="btn btn-default append-right-10" - @click="closeForm" - > + <button type="button" class="btn btn-default append-right-10" @click="closeForm"> {{ __('Cancel') }} </button> - <button - type="button" - class="btn btn-close" - @click.prevent="submitForm" - > + <button type="button" class="btn btn-close" @click.prevent="submitForm"> {{ toggleButtonText }} </button> </div> diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form.vue b/app/assets/javascripts/sidebar/components/lock/edit_form.vue index 4906dad22e1..630da751704 100644 --- a/app/assets/javascripts/sidebar/components/lock/edit_form.vue +++ b/app/assets/javascripts/sidebar/components/lock/edit_form.vue @@ -43,22 +43,11 @@ export default { <template> <div class="dropdown show"> <div class="dropdown-menu sidebar-item-warning-message"> - <p - v-if="isLocked" - class="text" - v-html="unlockWarning"> - </p> + <p v-if="isLocked" class="text" v-html="unlockWarning"></p> - <p - v-else - class="text" - v-html="lockWarning"> - </p> + <p v-else class="text" v-html="lockWarning"></p> - <edit-form-buttons - :is-locked="isLocked" - :update-locked-attribute="updateLockedAttribute" - /> + <edit-form-buttons :is-locked="isLocked" :update-locked-attribute="updateLockedAttribute" /> </div> </div> </template> diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue index 63082654101..902aeb9b8e4 100644 --- a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue +++ b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue @@ -41,19 +41,11 @@ export default { <template> <div class="sidebar-item-warning-message-actions"> - <button - type="button" - class="btn btn-default append-right-10" - @click="closeForm" - > + <button type="button" class="btn btn-default append-right-10" @click="closeForm"> {{ __('Cancel') }} </button> - <button - type="button" - class="btn btn-close" - @click.prevent="submitForm" - > + <button type="button" class="btn btn-close" @click.prevent="submitForm"> {{ buttonText }} </button> </div> diff --git a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue index 48a2b9194aa..faea64c9841 100644 --- a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue +++ b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue @@ -100,14 +100,13 @@ export default { data-boundary="viewport" @click="toggleForm" > - <icon - :name="lockIcon" - class="sidebar-item-icon is-active" - /> + <icon :name="lockIcon" class="sidebar-item-icon is-active" /> </div> <div class="title hide-collapsed"> - {{ sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName }) }} + {{ + sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName }) + }} <button v-if="isEditable" class="float-right lock-edit" @@ -126,28 +125,13 @@ export default { :issuable-type="issuableType" /> - <div - v-if="isLocked" - class="value sidebar-item-value" - > - <icon - :size="16" - name="lock" - class="sidebar-item-icon inline is-active" - /> + <div v-if="isLocked" class="value sidebar-item-value"> + <icon :size="16" name="lock" class="sidebar-item-icon inline is-active" /> {{ __('Locked') }} </div> - <div - v-else - class="no-value sidebar-item-value hide-collapsed" - > - <icon - :size="16" - name="lock-open" - class="sidebar-item-icon inline" - /> - {{ __('Unlocked') }} + <div v-else class="no-value sidebar-item-value hide-collapsed"> + <icon :size="16" name="lock-open" class="sidebar-item-icon inline" /> {{ __('Unlocked') }} </div> </div> </div> diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue index 43d2f754bac..4bfc8fa7eec 100644 --- a/app/assets/javascripts/sidebar/components/participants/participants.vue +++ b/app/assets/javascripts/sidebar/components/participants/participants.vue @@ -88,21 +88,9 @@ export default { data-boundary="viewport" @click="onClickCollapsedIcon" > - <i - class="fa fa-users" - aria-hidden="true" - > - </i> - <gl-loading-icon - v-if="loading" - class="js-participants-collapsed-loading-icon" - /> - <span - v-else - class="js-participants-collapsed-count" - > - {{ participantCount }} - </span> + <i class="fa fa-users" aria-hidden="true"> </i> + <gl-loading-icon v-if="loading" class="js-participants-collapsed-loading-icon" /> + <span v-else class="js-participants-collapsed-count"> {{ participantCount }} </span> </div> <div class="title hide-collapsed"> <gl-loading-icon @@ -118,10 +106,7 @@ export default { :key="participant.id" class="participants-author js-participants-author" > - <a - :href="participant.web_url" - class="author-link" - > + <a :href="participant.web_url" class="author-link"> <user-avatar-image :lazy="true" :img-src="participant.avatar_url" @@ -133,10 +118,7 @@ export default { </a> </div> </div> - <div - v-if="hasMoreParticipants" - class="participants-more hide-collapsed" - > + <div v-if="hasMoreParticipants" class="participants-more hide-collapsed"> <button type="button" class="btn-transparent btn-blank js-toggle-participants-button" diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue index b6151aa6c64..a75daca156c 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue @@ -73,10 +73,7 @@ export default { <template> <div> - <div - class="sidebar-collapsed-icon" - @click="onClickCollapsedIcon" - > + <div class="sidebar-collapsed-icon" @click="onClickCollapsedIcon"> <span v-tooltip :title="notificationTooltip" @@ -92,9 +89,7 @@ export default { /> </span> </div> - <span class="issuable-header-text hide-collapsed float-left"> - {{ __('Notifications') }} - </span> + <span class="issuable-header-text hide-collapsed float-left"> {{ __('Notifications') }} </span> <toggle-button ref="toggleButton" :is-loading="showLoadingState" diff --git a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue index 259858e4b46..657ac837baf 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue @@ -120,9 +120,7 @@ export default { <icon name="timer" /> <div class="time-tracking-collapsed-summary"> <div :class="divClass"> - <span :class="spanClass"> - {{ text }} - </span> + <span :class="spanClass"> {{ text }} </span> </div> </div> </div> diff --git a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue index 87780411c26..f4d926cd3ec 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue @@ -69,26 +69,15 @@ export default { data-placement="top" role="timeRemainingDisplay" > - <gl-progress-bar - :value="timeRemainingPercent" - :variant="progressBarVariant" - /> + <gl-progress-bar :value="timeRemainingPercent" :variant="progressBarVariant" /> <div class="compare-display-container"> <div class="compare-display float-left"> - <span class="compare-label"> - {{ s__('TimeTracking|Spent') }} - </span> - <span class="compare-value spent"> - {{ timeSpentHumanReadable }} - </span> + <span class="compare-label"> {{ s__('TimeTracking|Spent') }} </span> + <span class="compare-value spent"> {{ timeSpentHumanReadable }} </span> </div> <div class="compare-display estimated float-right"> - <span class="compare-label"> - {{ s__('TimeTrackingEstimated|Est') }} - </span> - <span class="compare-value"> - {{ timeEstimateHumanReadable }} - </span> + <span class="compare-label"> {{ s__('TimeTrackingEstimated|Est') }} </span> + <span class="compare-value"> {{ timeEstimateHumanReadable }} </span> </div> </div> </div> diff --git a/app/assets/javascripts/sidebar/components/time_tracking/estimate_only_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/estimate_only_pane.vue index 08fce597e50..305726d9725 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/estimate_only_pane.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/estimate_only_pane.vue @@ -12,9 +12,6 @@ export default { <template> <div class="time-tracking-estimate-only-pane"> - <span class="bold"> - {{ s__('TimeTracking|Estimated:') }} - </span> - {{ timeEstimateHumanReadable }} + <span class="bold"> {{ s__('TimeTracking|Estimated:') }} </span> {{ timeEstimateHumanReadable }} </div> </template> diff --git a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue index 91909cd49b8..51cd5810ac0 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue @@ -40,22 +40,11 @@ export default { <template> <div class="time-tracking-help-state"> <div class="time-tracking-info"> - <h4> - {{ __('Track time with quick actions') }} - </h4> - <p> - {{ __('Quick actions can be used in the issues description and comment boxes.') }} - </p> - <p v-html="estimateText"> - </p> - <p v-html="spendText"> - </p> - <a - :href="href" - class="btn btn-default learn-more-button" - > - {{ __('Learn more') }} - </a> + <h4>{{ __('Track time with quick actions') }}</h4> + <p>{{ __('Quick actions can be used in the issues description and comment boxes.') }}</p> + <p v-html="estimateText"></p> + <p v-html="spendText"></p> + <a :href="href" class="btn btn-default learn-more-button"> {{ __('Learn more') }} </a> </div> </div> </template> diff --git a/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue index 9228184df5b..45552589e50 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue @@ -6,8 +6,6 @@ export default { <template> <div class="time-tracking-no-tracking-pane"> - <span class="no-value"> - {{ __('No estimate or time spent') }} - </span> + <span class="no-value"> {{ __('No estimate or time spent') }} </span> </div> </template> diff --git a/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue index 59cd99f8f14..7c7356e2afa 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue @@ -12,7 +12,6 @@ export default { <template> <div class="time-tracking-spend-only-pane"> - <span class="bold">Spent:</span> - {{ timeSpentHumanReadable }} + <span class="bold">Spent:</span> {{ timeSpentHumanReadable }} </div> </template> diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue index ef76dc13ce9..d3a4f9c81e0 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -90,10 +90,7 @@ export default { </script> <template> - <div - v-cloak - class="time_tracker time-tracking-component-wrap" - > + <div v-cloak class="time_tracker time-tracking-component-wrap"> <time-tracking-collapsed-state :show-comparison-state="showComparisonState" :show-no-time-tracking-state="showNoTimeTrackingState" @@ -105,27 +102,15 @@ export default { /> <div class="title hide-collapsed"> {{ __('Time tracking') }} - <div - v-if="!showHelpState" - class="help-button float-right" - @click="toggleHelpState(true)" - > - <i - class="fa fa-question-circle" - aria-hidden="true" - > - </i> + <div v-if="!showHelpState" class="help-button float-right" @click="toggleHelpState(true);"> + <i class="fa fa-question-circle" aria-hidden="true"> </i> </div> <div v-if="showHelpState" class="close-help-button float-right" - @click="toggleHelpState(false)" + @click="toggleHelpState(false);" > - <i - class="fa fa-close" - aria-hidden="true" - > - </i> + <i class="fa fa-close" aria-hidden="true"> </i> </div> </div> <div class="time-tracking-content hide-collapsed"> @@ -137,9 +122,7 @@ export default { v-if="showSpentOnlyState" :time-spent-human-readable="humanTimeSpent" /> - <time-tracking-no-tracking-pane - v-if="showNoTimeTrackingState" - /> + <time-tracking-no-tracking-pane v-if="showNoTimeTrackingState" /> <time-tracking-comparison-pane v-if="showComparisonState" :time-estimate="timeEstimate" @@ -148,10 +131,7 @@ export default { :time-estimate-human-readable="humanTimeEstimate" /> <transition name="help-state-toggle"> - <time-tracking-help-state - v-if="showHelpState" - :root-path="rootPath" - /> + <time-tracking-help-state v-if="showHelpState" :root-path="rootPath" /> </transition> </div> </div> diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue index 7edef35461a..706e6ca19c3 100644 --- a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue +++ b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue @@ -84,15 +84,7 @@ export default { :css-classes="collapsedButtonIconClasses" :name="collapsedButtonIcon" /> - <span - v-show="!collapsed" - class="issuable-todo-inner" - > - {{ buttonLabel }} - </span> - <gl-loading-icon - v-show="isActionActive" - :inline="true" - /> + <span v-show="!collapsed" class="issuable-todo-inner"> {{ buttonLabel }} </span> + <gl-loading-icon v-show="isActionActive" :inline="true" /> </button> </template> |