diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-05 06:11:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-05 06:11:53 +0300 |
commit | b892ac7767d111a4762161fecf826f7030d30689 (patch) | |
tree | 6fcbbadc3e4af092640c171888e1d7231ca67ca7 /app/assets | |
parent | 33a1d1835f5fc146acf0cdda402b5a327ae0d52f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
6 files changed, 17 insertions, 54 deletions
diff --git a/app/assets/javascripts/related_issues/components/add_issuable_form.vue b/app/assets/javascripts/related_issues/components/add_issuable_form.vue index a9b5942efa9..4deb93e4b30 100644 --- a/app/assets/javascripts/related_issues/components/add_issuable_form.vue +++ b/app/assets/javascripts/related_issues/components/add_issuable_form.vue @@ -197,7 +197,7 @@ export default { <p v-if="hasError" class="gl-field-error"> {{ addRelatedErrorMessage }} </p> - <div class="add-issuable-form-actions clearfix"> + <div class="gl-mt-5 gl-clearfix"> <gl-button ref="addButton" category="primary" diff --git a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue index b7080bb05b8..c2ca87af9ce 100644 --- a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue +++ b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue @@ -82,8 +82,12 @@ export default { </div> </assignee-avatar-link> <div v-else> - <div class="user-list"> - <div v-for="user in uncollapsedUsers" :key="user.id" class="user-item"> + <div class="gl-display-flex gl-flex-wrap"> + <div + v-for="user in uncollapsedUsers" + :key="user.id" + class="user-item gl-display-inline-block" + > <assignee-avatar-link :user="user" :issuable-type="issuableType" /> </div> </div> diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue index ad4bfe5b665..4a255a3b916 100644 --- a/app/assets/javascripts/sidebar/components/participants/participants.vue +++ b/app/assets/javascripts/sidebar/components/participants/participants.vue @@ -104,11 +104,11 @@ export default { <gl-loading-icon v-if="loading" size="sm" :inline="true" /> {{ participantLabel }} </div> - <div class="participants-list hide-collapsed"> + <div class="hide-collapsed gl-display-flex gl-flex-wrap"> <div v-for="participant in visibleParticipants" :key="participant.id" - class="participants-author" + class="participants-author gl-display-inline-block gl-pr-3 gl-pb-3" > <a :href="participant.web_url || participant.webUrl" class="author-link"> <user-avatar-image 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 3705d725a15..7b4be659330 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue @@ -83,13 +83,15 @@ export default { :value="timeRemainingPercent" :variant="progressBarVariant" /> - <div class="compare-display-container"> - <div class="compare-display float-left"> - <span class="compare-label">{{ s__('TimeTracking|Spent') }}</span> + <div + class="compare-display-container gl-display-flex gl-justify-content-space-between gl-mt-2" + > + <div class="gl-float-left"> + <span class="gl-text-gray-400">{{ 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> + <div class="estimated gl-float-right"> + <span class="gl-text-gray-400">{{ s__('TimeTrackingEstimated|Est') }}</span> <span class="compare-value">{{ timeEstimateHumanReadable }}</span> </div> </div> diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 099dfa28b9f..c0e297d8554 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -759,7 +759,6 @@ $help-shortcut-header-color: #333; */ $issues-today-bg: #f3fff2 !default; $issues-today-border: #e1e8d5 !default; -$compare-display-color: #888; /* * Label diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index d8fc94cce0c..c4df2e102bd 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -220,21 +220,12 @@ } .cross-project-reference { - color: inherit; - span { - white-space: nowrap; width: 85%; - overflow: hidden; - position: relative; - display: inline-block; - text-overflow: ellipsis; } button { - float: right; padding: 1px 5px; - background-color: $gray-light; } } @@ -563,35 +554,17 @@ } } -.participants-list { - display: flex; - flex-wrap: wrap; -} - -.user-list { - display: flex; - flex-wrap: wrap; -} - .participants-author { - display: inline-block; - padding: 0 $gl-padding-8 $gl-padding-8 0; - &:nth-of-type(7n) { padding-right: 0; } - .author-link { - display: block; - } - .avatar.avatar-inline { margin: 0; } } .user-item { - display: inline-block; padding: 5px; flex-basis: 20%; @@ -803,10 +776,6 @@ } } -.add-issuable-form-actions { - margin-top: $gl-padding; -} - .time-tracker { .sidebar-collapsed-icon { > .stopwatch-svg { @@ -839,18 +808,7 @@ } .compare-display-container { - display: flex; - justify-content: space-between; - margin-top: 5px; - - .compare-display { - font-size: 13px; - color: $compare-display-color; - - .compare-value { - color: $gl-text-color; - } - } + font-size: 13px; } .time-tracking-help-state { |