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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
635d3e09
Commit
635d3e09
authored
12 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issues, Merge Requests counters
parent
df27ec29
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
13 deletions
+27
-13
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+21
-7
app/assets/stylesheets/top_panel.scss
app/assets/stylesheets/top_panel.scss
+0
-4
app/views/commits/_commit.html.haml
app/views/commits/_commit.html.haml
+2
-1
app/views/layouts/_project_menu.html.haml
app/views/layouts/_project_menu.html.haml
+4
-1
No files found.
app/assets/stylesheets/common.scss
View file @
635d3e09
...
...
@@ -101,15 +101,24 @@ nav.main_menu {
border-radius
:
4px
;
margin
:
auto
;
margin
:
30px
$app_padding
;
background
:
#
f1f1f1
;
background
:
#
eee
;
border
:
1px
solid
#ccc
;
height
:
38px
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#
f1f1f1
)
,
to
(
#dfdfdf
));
background-image
:
-webkit-linear-gradient
(
#
f1f1f1
6
.6%
,
#dfdfdf
);
background-image
:
-moz-linear-gradient
(
#
f1f1f1
6
.6%
,
#dfdfdf
);
background-image
:
-o-linear-gradient
(
#
f1f1f1
6
.6%
,
#dfdfdf
);
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#
eee
)
,
to
(
#dfdfdf
));
background-image
:
-webkit-linear-gradient
(
#
eee
6
.6%
,
#dfdfdf
);
background-image
:
-moz-linear-gradient
(
#
eee
6
.6%
,
#dfdfdf
);
background-image
:
-o-linear-gradient
(
#
eee
6
.6%
,
#dfdfdf
);
-moz-box-shadow
:
0
0
3px
#ddd
;
-webkit-box-shadow
:
0
0
3px
#ddd
;
box-shadow
:
0
0
3px
#ddd
;
.count
{
color
:
#bbb
;
margin-left
:
3px
;
}
.label
{
background
:
$hover
;
...
...
@@ -131,12 +140,13 @@ nav.main_menu {
padding
:
10px
25px
;
display
:
inline-block
;
color
:
$style_color
;
border-right
:
1px
solid
#
ccc
;
border-right
:
1px
solid
#
d5d5d5
;
position
:
relative
;
box-shadow
:
1px
0
0
rgba
(
255
,
255
,
255
,
0
.1
);
margin
:
0
;
float
:left
;
text-shadow
:
0
1px
1px
white
;
&
.home
{
padding
:
7px
35px
;
...
...
@@ -281,7 +291,11 @@ img.lil_av {
h5
,
.title
{
padding
:
0
10px
;
background
:
#f5f5f5
;
border-bottom
:
1px
solid
#ccc
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
26
,
color-stop
(
0
.076
,
#fefefe
)
,
to
(
#F6F7F8
));
background-image
:
-webkit-linear-gradient
(
#fefefe
7
.6%
,
#F6F7F8
);
background-image
:
-moz-linear-gradient
(
#fefefe
7
.6%
,
#F6F7F8
);
background-image
:
-o-linear-gradient
(
#fefefe
7
.6%
,
#F6F7F8
);
border-bottom
:
1px
solid
#eee
;
@include
round-borders-top
(
4px
);
border-top
:none
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/top_panel.scss
View file @
635d3e09
...
...
@@ -79,10 +79,6 @@ body header {
font-weight
:bold
;
color
:
#aaa
;
text-shadow
:
0
1px
1px
#FFF
;
&
:hover
{
color
:
$style_color
;
}
}
img
{
...
...
This diff is collapsed.
Click to expand it.
app/views/commits/_commit.html.haml
View file @
635d3e09
%li
.wll.commit
.right.span2
=
link_to
"Browse Code"
,
tree_project_ref_path
(
@project
,
commit
.
id
),
:class
=>
"btn small right"
=
link_to
"Browse Code
»
"
,
tree_project_ref_path
(
@project
,
commit
.
id
),
:class
=>
"btn small right"
=
link_to
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
do
%p
%code
.left
=
commit
.
id
.
to_s
[
0
..
10
]
...
...
@@ -12,4 +12,5 @@
%span
.right.cgray
=
time_ago_in_words
(
commit
.
committed_date
)
ago
This diff is collapsed.
Click to expand it.
app/views/layouts/_project_menu.html.haml
View file @
635d3e09
...
...
@@ -10,10 +10,13 @@
=
link_to
"Network"
,
graph_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"graph"
,
:id
=>
@project
)
?
"current"
:
nil
-
if
@project
.
issues_enabled
=
link_to
project_issues_filter_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"issues"
)
?
"current"
:
nil
do
Issues
Issues
%span
.count
=
@project
.
issues
.
opened
.
count
-
if
@project
.
merge_requests_enabled
=
link_to
project_merge_requests_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"merge_requests"
)
?
"current"
:
nil
do
Merge Requests
%span
.count
=
@project
.
issues
.
opened
.
count
-
if
@project
.
wall_enabled
=
link_to
wall_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"wall"
,
:id
=>
@project
)
?
"current"
:
nil
do
...
...
This diff is collapsed.
Click to expand it.
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