Commit 9e60cb39 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch '301246-graph-spacing' into 'master'

Resolve "Graphs in the contributor page should conform with spacing guidelines"

See merge request gitlab-org/gitlab!54431
parents ea2586ed 6a390ac1
...@@ -201,11 +201,12 @@ export default { ...@@ -201,11 +201,12 @@ export default {
</div> </div>
<div v-else-if="showChart" class="contributors-charts"> <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> <span>{{ __('Excluding merge commits. Limited to 6,000 commits.') }}</span>
<resizable-chart-container> <resizable-chart-container>
<gl-area-chart <gl-area-chart
slot-scope="{ width }" slot-scope="{ width }"
class="gl-mb-5"
:width="width" :width="width"
:data="masterChartData" :data="masterChartData"
:option="masterChartOptions" :option="masterChartOptions"
...@@ -218,10 +219,12 @@ export default { ...@@ -218,10 +219,12 @@ export default {
<div <div
v-for="(contributor, index) in individualChartsData" v-for="(contributor, index) in individualChartsData"
:key="index" :key="index"
class="col-lg-6 col-12" class="col-lg-6 col-12 gl-my-5"
> >
<h4>{{ contributor.name }}</h4> <h4 class="gl-mb-2 gl-mt-0">{{ contributor.name }}</h4>
<p>{{ n__('%d commit', '%d commits', contributor.commits) }} ({{ contributor.email }})</p> <p class="gl-mb-3">
{{ n__('%d commit', '%d commits', contributor.commits) }} ({{ contributor.email }})
</p>
<resizable-chart-container> <resizable-chart-container>
<gl-area-chart <gl-area-chart
slot-scope="{ width }" slot-scope="{ width }"
......
---
title: Add space to graph in contributor page
merge_request: 54431
author: Yogi (@yo)
type: changed
...@@ -5,7 +5,9 @@ exports[`Contributors charts should render charts when loading completed and the ...@@ -5,7 +5,9 @@ exports[`Contributors charts should render charts when loading completed and the
<div <div
class="contributors-charts" class="contributors-charts"
> >
<h4> <h4
class="gl-mb-2 gl-mt-5"
>
Commits to master Commits to master
</h4> </h4>
...@@ -16,6 +18,7 @@ exports[`Contributors charts should render charts when loading completed and the ...@@ -16,6 +18,7 @@ exports[`Contributors charts should render charts when loading completed and the
<div> <div>
<glareachart-stub <glareachart-stub
annotations="" annotations=""
class="gl-mb-5"
data="[object Object]" data="[object Object]"
height="264" height="264"
includelegendavgmax="true" includelegendavgmax="true"
...@@ -34,14 +37,20 @@ exports[`Contributors charts should render charts when loading completed and the ...@@ -34,14 +37,20 @@ exports[`Contributors charts should render charts when loading completed and the
class="row" class="row"
> >
<div <div
class="col-lg-6 col-12" class="col-lg-6 col-12 gl-my-5"
>
<h4
class="gl-mb-2 gl-mt-0"
> >
<h4>
John John
</h4> </h4>
<p> <p
class="gl-mb-3"
>
2 commits (jawnnypoo@gmail.com) 2 commits (jawnnypoo@gmail.com)
</p> </p>
<div> <div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment