Download as
Browse Code »

Commit 2a0739010467030e8ea74d30b6188aa06444fa8c

Authored by Dmitriy Zaporozhets
1 parent c49dcbac
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove unnecessary title. Fix graphs width for less then 1214px resolution

Showing 4 changed files with 29 additions and 22 deletions   Show diff stats
app/assets/javascripts/stat_graph_contributors_graph.js.coffee
  Diff comments   View file @2a07390
@@ -46,7 +46,11 @@ class window.ContributorsGraph @@ -46,7 +46,11 @@ class window.ContributorsGraph
46 46
47 class window.ContributorsMasterGraph extends ContributorsGraph 47 class window.ContributorsMasterGraph extends ContributorsGraph
48 constructor: (@data) -> 48 constructor: (@data) ->
49 - @width = 1100 49 + if $(window).width() > 1214
  50 + @width = 1100
  51 + else
  52 + @width = 870
  53 +
50 @height = 125 54 @height = 125
51 @x = null 55 @x = null
52 @y = null 56 @y = null
@@ -118,7 +122,11 @@ class window.ContributorsMasterGraph extends ContributorsGraph @@ -118,7 +122,11 @@ class window.ContributorsMasterGraph extends ContributorsGraph
118 122
119 class window.ContributorsAuthorGraph extends ContributorsGraph 123 class window.ContributorsAuthorGraph extends ContributorsGraph
120 constructor: (@data) -> 124 constructor: (@data) ->
121 - @width = 490 125 + if $(window).width() > 1214
  126 + @width = 490
  127 + else
  128 + @width = 380
  129 +
122 @height = 130 130 @height = 130
123 @x = null 131 @x = null
124 @y = null 132 @y = null
app/assets/stylesheets/sections/stat_graph.scss
  Diff comments   View file @2a07390
@@ -14,27 +14,29 @@ @@ -14,27 +14,29 @@
14 font-size: 10px; 14 font-size: 10px;
15 } 15 }
16 16
17 -#contributors .person {  
18 - &:nth-child(even) {  
19 - float: right; 17 +#contributors {
  18 + .contributors-list {
  19 + margin: 0 0 10px 0;
  20 + list-style: none;
  21 + padding: 0;
20 } 22 }
21 - float: left;  
22 - margin-top: 10px;  
23 -}  
24 23
25 -.contributors-list {  
26 - margin: 0 0 10px 0;  
27 - list-style: none;  
28 - padding: 0;  
29 -} 24 + .person {
  25 + &:nth-child(even) {
  26 + float: right;
  27 + }
  28 + float: left;
  29 + margin-top: 10px;
  30 + }
30 31
31 -#contributors .person .spark {  
32 - display: block;  
33 - background: #f3f3f3;  
34 -} 32 + .person .spark {
  33 + display: block;
  34 + background: #f3f3f3;
  35 + }
35 36
36 -#contributors .person .area-contributor {  
37 - fill: #f17f49; 37 + .person .area-contributor {
  38 + fill: #f17f49;
  39 + }
38 } 40 }
39 41
40 .selection rect { 42 .selection rect {
app/views/projects/network/_head.html.haml
  Diff comments   View file @2a07390
1 -%h3.page-title Project Network Graph  
2 -  
3 .clearfix 1 .clearfix
4 .pull-left 2 .pull-left
5 = render partial: 'shared/ref_switcher', locals: {destination: 'graph'} 3 = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
features/steps/project/project_network_graph.rb
  Diff comments   View file @2a07390
@@ -3,7 +3,6 @@ class ProjectNetworkGraph < Spinach::FeatureSteps @@ -3,7 +3,6 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
3 include SharedProject 3 include SharedProject
4 4
5 Then 'page should have network graph' do 5 Then 'page should have network graph' do
6 - page.should have_content "Project Network Graph"  
7 page.should have_selector ".graph" 6 page.should have_selector ".graph"
8 end 7 end
9 8