summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-15 10:01:15 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-15 10:01:15 +0300
commit2a0739010467030e8ea74d30b6188aa06444fa8c (patch)
treea0c1f8a1c48e31b100f33028e1c34375c888fb85
parentc49dcbacc3455ccfa149375a2f792b5f3c5223ec (diff)
downloadgitlab-ce-2a0739010467030e8ea74d30b6188aa06444fa8c.tar.gz
Remove unnecessary title. Fix graphs width for less then 1214px resolution
-rw-r--r--app/assets/javascripts/stat_graph_contributors_graph.js.coffee12
-rw-r--r--app/assets/stylesheets/sections/stat_graph.scss36
-rw-r--r--app/views/projects/network/_head.html.haml2
-rw-r--r--features/steps/project/project_network_graph.rb1
4 files changed, 29 insertions, 22 deletions
diff --git a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee b/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
index 15cf68ff31b..cc83486e8c1 100644
--- a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
+++ b/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
@@ -46,7 +46,11 @@ class window.ContributorsGraph
class window.ContributorsMasterGraph extends ContributorsGraph
constructor: (@data) ->
- @width = 1100
+ if $(window).width() > 1214
+ @width = 1100
+ else
+ @width = 870
+
@height = 125
@x = null
@y = null
@@ -118,7 +122,11 @@ class window.ContributorsMasterGraph extends ContributorsGraph
class window.ContributorsAuthorGraph extends ContributorsGraph
constructor: (@data) ->
- @width = 490
+ if $(window).width() > 1214
+ @width = 490
+ else
+ @width = 380
+
@height = 130
@x = null
@y = null
diff --git a/app/assets/stylesheets/sections/stat_graph.scss b/app/assets/stylesheets/sections/stat_graph.scss
index 4baec343d6e..b9be47e7700 100644
--- a/app/assets/stylesheets/sections/stat_graph.scss
+++ b/app/assets/stylesheets/sections/stat_graph.scss
@@ -14,27 +14,29 @@
font-size: 10px;
}
-#contributors .person {
- &:nth-child(even) {
- float: right;
+#contributors {
+ .contributors-list {
+ margin: 0 0 10px 0;
+ list-style: none;
+ padding: 0;
}
- float: left;
- margin-top: 10px;
-}
-.contributors-list {
- margin: 0 0 10px 0;
- list-style: none;
- padding: 0;
-}
+ .person {
+ &:nth-child(even) {
+ float: right;
+ }
+ float: left;
+ margin-top: 10px;
+ }
-#contributors .person .spark {
- display: block;
- background: #f3f3f3;
-}
+ .person .spark {
+ display: block;
+ background: #f3f3f3;
+ }
-#contributors .person .area-contributor {
- fill: #f17f49;
+ .person .area-contributor {
+ fill: #f17f49;
+ }
}
.selection rect {
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index d59e82406fd..59ce787e187 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,5 +1,3 @@
-%h3.page-title Project Network Graph
-
.clearfix
.pull-left
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
diff --git a/features/steps/project/project_network_graph.rb b/features/steps/project/project_network_graph.rb
index f001c0beb9a..f091e320d75 100644
--- a/features/steps/project/project_network_graph.rb
+++ b/features/steps/project/project_network_graph.rb
@@ -3,7 +3,6 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
include SharedProject
Then 'page should have network graph' do
- page.should have_content "Project Network Graph"
page.should have_selector ".graph"
end