diff --git a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee b/app/assets/javascripts/stat_graph_contributors_graph.js.coffee index 15cf68ff31b985166451be295740f7c3a92dc48b..cc83486e8c1dbdf978e0e03da085d962dc63b56a 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 4baec343d6eea3ad8a0761413a5e4cd97d475c3f..b9be47e7700273cab16d2ba4c309730941fbd0b8 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 d59e82406fd2724b3e78050daa8f106fb46ade70..59ce787e187f71fe5447821025a14ca7197d78a5 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 f001c0beb9abb36a35cda5d98c7831376c3aa2ee..f091e320d75307020d8a4d5119384071af360c73 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