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
Boxiang Sun
gitlab-ce
Commits
c49dcbac
Commit
c49dcbac
authored
Jul 15, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Few ui fixes: network graph and accept mr button
parent
39484136
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/stylesheets/sections/graph.scss
app/assets/stylesheets/sections/graph.scss
+2
-1
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+1
-1
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
app/views/projects/network/_head.html.haml
app/views/projects/network/_head.html.haml
+0
-1
app/views/public/projects/index.html.haml
app/views/public/projects/index.html.haml
+2
-2
No files found.
app/assets/stylesheets/sections/graph.scss
View file @
c49dcbac
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
h4
{
h4
{
padding
:
0
10px
;
margin
:
0
;
padding
:
10px
;
border-bottom
:
1px
solid
#bbb
;
border-bottom
:
1px
solid
#bbb
;
@include
bg-gray-gradient
;
@include
bg-gray-gradient
;
}
}
...
...
app/assets/stylesheets/sections/projects.scss
View file @
c49dcbac
...
@@ -86,7 +86,7 @@ ul.nav.nav-projects-tabs {
...
@@ -86,7 +86,7 @@ ul.nav.nav-projects-tabs {
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
#eee
;
.description
{
.description
{
margin-left
:
22
px
;
margin-left
:
15
px
;
color
:
#aaa
;
color
:
#aaa
;
}
}
}
}
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
c49dcbac
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
%strong
=
link_to
"click here"
,
"#"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
%strong
=
link_to
"click here"
,
"#"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
for instructions
for instructions
.accept_group
.accept_group
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-
success
accept_merge_request"
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-
create
accept_merge_request"
-
unless
@project
.
root_ref?
@merge_request
.
source_branch
-
unless
@project
.
root_ref?
@merge_request
.
source_branch
.remove_branch_holder
.remove_branch_holder
=
label_tag
:should_remove_source_branch
,
class:
"checkbox"
do
=
label_tag
:should_remove_source_branch
,
class:
"checkbox"
do
...
...
app/views/projects/network/_head.html.haml
View file @
c49dcbac
%h3
.page-title
Project Network Graph
%h3
.page-title
Project Network Graph
%hr
.clearfix
.clearfix
.pull-left
.pull-left
...
...
app/views/public/projects/index.html.haml
View file @
c49dcbac
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
%ul
.unstyled
%ul
.unstyled
-
@projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
%li
.clearfix
%li
.clearfix
%
h5
%
div
%i
.icon-share
%i
.icon-share
-
if
current_user
-
if
current_user
=
link_to_project
project
=
link_to_project
project
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
=
project
.
name_with_namespace
=
project
.
name_with_namespace
.pull-right
.pull-right
%pre
.dark.tiny
git clone
#{
project
.
http_url_to_repo
}
%pre
.dark.tiny
git clone
#{
project
.
http_url_to_repo
}
%
p
.description
%
div
.description
=
project
.
description
=
project
.
description
-
unless
@projects
.
present?
-
unless
@projects
.
present?
%h3
.nothing_here_message
No public projects
%h3
.nothing_here_message
No public projects
...
...
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