diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-25 15:09:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-25 15:09:50 +0300 |
| commit | 52eb17ad859d778104993ee0edfa9c034e59af80 (patch) | |
| tree | 637728b1b4e29e41cfbcbea27da9aacb18eba0ac /app/assets/javascripts/sidebar | |
| parent | c595e9b53982eb9894754e03a2de4a91bd5a319c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/date/sidebar_formatted_date.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_formatted_date.vue b/app/assets/javascripts/sidebar/components/date/sidebar_formatted_date.vue index 87cf1c29fb0..627b8452508 100644 --- a/app/assets/javascripts/sidebar/components/date/sidebar_formatted_date.vue +++ b/app/assets/javascripts/sidebar/components/date/sidebar_formatted_date.vue @@ -35,7 +35,7 @@ export default { <template> <div class="gl-display-flex gl-align-items-center hide-collapsed"> <span - :class="hasDate ? 'gl-text-gray-900 gl-font-weight-bold' : 'gl-text-gray-500'" + :class="hasDate ? 'gl-text-gray-900' : 'gl-text-gray-500'" data-testid="sidebar-date-value" > {{ formattedDate }} 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 d280572adf5..ea57dedc4ab 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -221,8 +221,7 @@ export default { </div> <div v-if="!isTimeTrackingInfoLoading" class="hide-collapsed"> <div v-if="showEstimateOnlyState" data-testid="estimateOnlyPane"> - <span class="gl-font-weight-bold">{{ $options.i18n.estimatedOnlyText }} </span - >{{ humanTimeEstimate }} + <span>{{ $options.i18n.estimatedOnlyText }} </span>{{ humanTimeEstimate }} </div> <time-tracking-spent-only-pane v-if="showSpentOnlyState" |