Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
5f63c005
Commit
5f63c005
authored
Dec 15, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix graph and settings highlight
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
6ef75dc7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
app/assets/javascripts/stat_graph_contributors_graph.js.coffee
...ssets/javascripts/stat_graph_contributors_graph.js.coffee
+2
-2
app/assets/stylesheets/sections/sidebar.scss
app/assets/stylesheets/sections/sidebar.scss
+11
-5
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+1
-1
No files found.
app/assets/javascripts/stat_graph_contributors_graph.js.coffee
View file @
5f63c005
...
@@ -46,7 +46,7 @@ class @ContributorsGraph
...
@@ -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
...
@@ -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
...
...
app/assets/stylesheets/sections/sidebar.scss
View file @
5f63c005
...
@@ -74,14 +74,20 @@ body.project {
...
@@ -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
:
2
px
8px
;
padding
:
0
px
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
{
...
...
app/views/layouts/nav/_project.html.haml
View file @
5f63c005
...
@@ -41,7 +41,7 @@
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment