Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-23 00:08:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-23 00:08:59 +0300
commitb489f0f0a1ebcea2044911b7b38837f072b7ee05 (patch)
tree5fba06eec9bda781dd1000cb322ed883f4692c04 /app/assets/javascripts/contributors
parent9a643ab892cfd7897fb7695bc158ce17ada81b1a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/contributors')
-rw-r--r--app/assets/javascripts/contributors/components/contributors.vue11
1 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue
index 7426e570864..25ce6500094 100644
--- a/app/assets/javascripts/contributors/components/contributors.vue
+++ b/app/assets/javascripts/contributors/components/contributors.vue
@@ -201,11 +201,12 @@ export default {
</div>
<div v-else-if="showChart" class="contributors-charts">
- <h4>{{ __('Commits to') }} {{ branch }}</h4>
+ <h4 class="gl-mb-2 gl-mt-5">{{ __('Commits to') }} {{ branch }}</h4>
<span>{{ __('Excluding merge commits. Limited to 6,000 commits.') }}</span>
<resizable-chart-container>
<gl-area-chart
slot-scope="{ width }"
+ class="gl-mb-5"
:width="width"
:data="masterChartData"
:option="masterChartOptions"
@@ -218,10 +219,12 @@ export default {
<div
v-for="(contributor, index) in individualChartsData"
:key="index"
- class="col-lg-6 col-12"
+ class="col-lg-6 col-12 gl-my-5"
>
- <h4>{{ contributor.name }}</h4>
- <p>{{ n__('%d commit', '%d commits', contributor.commits) }} ({{ contributor.email }})</p>
+ <h4 class="gl-mb-2 gl-mt-0">{{ contributor.name }}</h4>
+ <p class="gl-mb-3">
+ {{ n__('%d commit', '%d commits', contributor.commits) }} ({{ contributor.email }})
+ </p>
<resizable-chart-container>
<gl-area-chart
slot-scope="{ width }"