summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-15 12:01:58 -0500
committerJacob Schatz <jschatz1@gmail.com>2016-06-21 12:15:49 -0400
commita02c3d09d3670c7b7543461bf4d3c4d5fc08f418 (patch)
treec7b56cc1cb08b09c6b5bdab5cfedd62ce07141da
parent596b2f46c835e76748a3026ea080323406ad461c (diff)
downloadgitlab-ce-a02c3d09d3670c7b7543461bf4d3c4d5fc08f418.tar.gz
Fix graph columns
-rw-r--r--app/assets/stylesheets/pages/stat_graph.scss17
-rw-r--r--app/views/projects/graphs/show.html.haml2
2 files changed, 14 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/stat_graph.scss b/app/assets/stylesheets/pages/stat_graph.scss
index 85a0304196c..4adf6193b8a 100644
--- a/app/assets/stylesheets/pages/stat_graph.scss
+++ b/app/assets/stylesheets/pages/stat_graph.scss
@@ -14,18 +14,27 @@
font-size: 10px;
}
+#contributors-master {
+ @include make-md-column(12);
+
+ svg {
+ width: 100%;
+ }
+}
+
#contributors {
.contributors-list {
margin: 0 0 10px;
list-style: none;
padding: 0;
+
+ svg {
+ width: 100%;
+ }
}
.person {
- &:nth-child(even) {
- float: right;
- }
- float: left;
+ @include make-md-column(6);
margin-top: 10px;
}
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index bdfde634f7c..61706c1d0fe 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -22,7 +22,7 @@
%p.light
Commits to #{@ref}, excluding merge commits. Limited to 6,000 commits.
%input#brush_change{:type => "hidden"}
- .graphs
+ .graphs.row
#contributors-master
#contributors.clearfix
%ol.contributors-list.clearfix