kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix graph and settings highlight

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-12-15 17:46:36 +02:00
parent 6ef75dc778
commit 5f63c00598
No known key found for this signature in database
GPG key ID: 161B5D6A44D3D88A
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/stat_graph_contributors_graph.js.coffee
View file

@ -46,7 +46,7 @@ class @ContributorsGraph
class @ContributorsMasterGraph extends ContributorsGraph class @ContributorsMasterGraph extends ContributorsGraph
constructor: (@data) -> constructor: (@data) ->
@width = $('.container').width() - 70 @width = $('.container').width() - 345
@height = 200 @height = 200
@x = null @x = null
@y = null @y = null
@ -119,7 +119,7 @@ class @ContributorsMasterGraph extends ContributorsGraph
class @ContributorsAuthorGraph extends ContributorsGraph class @ContributorsAuthorGraph extends ContributorsGraph
constructor: (@data) -> constructor: (@data) ->
@width = $('.container').width()/2 - 100 @width = $('.container').width()/2 - 225
@height = 200 @height = 200
@x = null @x = null
@y = null @y = null

16
app/assets/stylesheets/sections/sidebar.scss
View file

@ -74,14 +74,20 @@ body.project {
.nav-sidebar li a .count { .nav-sidebar li a .count {
float: right; float: right;
background: #eee; background: #eee;
padding: 2px 8px; padding: 0px 8px;
@include border-radius(6px); @include border-radius(6px);
} }
.nav-sidebar li.active a { .nav-sidebar li {
color: #333; &.active a {
background: #EEE; color: #333;
font-weight: bold; background: #EEE;
font-weight: bold;
&.no-highlight {
background: none;
}
}
} }
.nav-sidebar li { .nav-sidebar li {

2
app/views/layouts/nav/_project.html.haml
View file

@ -41,7 +41,7 @@
- if project_nav_tab? :settings - if project_nav_tab? :settings
= nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
= link_to edit_project_path(@project), class: "stat-tab tab " do = link_to edit_project_path(@project), class: "stat-tab tab no-highlight" do
Settings Settings
%i.fa.fa-angle-down %i.fa.fa-angle-down
- if defined?(settings) && settings - if defined?(settings) && settings