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
02dc2565
Commit
02dc2565
authored
May 18, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Branches pages polished. few css improvements
parent
2b319d04
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
51 additions
and
20 deletions
+51
-20
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+7
-0
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+5
-0
app/assets/stylesheets/ui_basic.scss
app/assets/stylesheets/ui_basic.scss
+6
-0
app/views/protected_branches/index.html.haml
app/views/protected_branches/index.html.haml
+15
-14
app/views/refs/_head.html.haml
app/views/refs/_head.html.haml
+1
-1
app/views/repositories/_branches_head.html.haml
app/views/repositories/_branches_head.html.haml
+0
-1
app/views/repositories/branches.html.haml
app/views/repositories/branches.html.haml
+8
-1
app/views/repositories/show.html.haml
app/views/repositories/show.html.haml
+7
-1
app/views/snippets/_form.html.haml
app/views/snippets/_form.html.haml
+1
-1
app/views/team_members/_show.html.haml
app/views/team_members/_show.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
02dc2565
body
{
margin-bottom
:
20px
;
}
a
{
a
{
outline
:
none
;
outline
:
none
;
color
:
$link_color
;
color
:
$link_color
;
...
@@ -67,6 +70,10 @@ h3, h4, h5, h6 {
...
@@ -67,6 +70,10 @@ h3, h4, h5, h6 {
line-height
:
36px
;
line-height
:
36px
;
}
}
h5
{
font-size
:
14px
;
}
code
{
code
{
background
:
#FCEEC1
;
background
:
#FCEEC1
;
color
:
$style_color
;
color
:
$style_color
;
...
...
app/assets/stylesheets/main.scss
View file @
02dc2565
...
@@ -31,6 +31,11 @@ $hover: #FDF5D9;
...
@@ -31,6 +31,11 @@ $hover: #FDF5D9;
box-shadow
:
0
0
3px
#ddd
;
box-shadow
:
0
0
3px
#ddd
;
}
}
@mixin
border-radius
(
$radius
)
{
-moz-border-radius
:
$radius
;
-webkit-border-radius
:
$radius
;
border-radius
:
$radius
;
}
@mixin
round-borders-bottom
(
$radius
)
{
@mixin
round-borders-bottom
(
$radius
)
{
border-top
:
1px
solid
#eaeaea
;
border-top
:
1px
solid
#eaeaea
;
...
...
app/assets/stylesheets/ui_basic.scss
View file @
02dc2565
...
@@ -87,6 +87,12 @@
...
@@ -87,6 +87,12 @@
padding
:
5px
;
padding
:
5px
;
margin-right
:
10px
;
margin-right
:
10px
;
float
:right
;
float
:right
;
background
:
#EEE
;
@include
border-radius
(
5px
);
border
:
1px
solid
#DDD
;
img
{
vertical-align
:top
;
}
}
}
.project_name
{
.project_name
{
...
...
app/views/protected_branches/index.html.haml
View file @
02dc2565
...
@@ -8,10 +8,24 @@
...
@@ -8,10 +8,24 @@
%li
forced code review before merge to protected branches
%li
forced code review before merge to protected branches
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
:class
=>
"vlink"
}
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
:class
=>
"vlink"
}
-
if
can?
current_user
,
:admin_project
,
@project
=
form_for
[
@project
,
@protected_branch
]
do
|
f
|
-
if
@protected_branch
.
errors
.
any?
.alert-message.block-message.error
%ul
-
@protected_branch
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.entry.clearfix
=
f
.
label
:name
,
"Branch"
.span3
=
f
.
select
(
:name
,
@project
.
open_branches
.
map
{
|
br
|
[
br
.
name
,
br
.
name
]
}
,
{
:include_blank
=>
"-- Select branch"
},
{
:class
=>
"span3"
})
=
f
.
submit
'Protect'
,
:class
=>
"primary btn"
-
unless
@branches
.
empty?
-
unless
@branches
.
empty?
%table
.
table-striped
%table
.
admin-table
%thead
%thead
%tr
%tr
%th
Name
%th
Name
...
@@ -36,19 +50,6 @@
...
@@ -36,19 +50,6 @@
-
if
can?
current_user
,
:admin_project
,
@project
=
form_for
[
@project
,
@protected_branch
]
do
|
f
|
-
if
@protected_branch
.
errors
.
any?
.alert-message.block-message.error
%ul
-
@protected_branch
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.clearfix
=
f
.
label
:name
.input
=
f
.
select
(
:name
,
@project
.
open_branches
.
map
{
|
br
|
[
br
.
name
,
br
.
name
]
}
,
{
:include_blank
=>
"Select branch"
},
{
:style
=>
"width:300px"
})
.actions
=
f
.
submit
'Add'
,
:class
=>
"primary btn"
:javascript
:javascript
...
...
app/views/refs/_head.html.haml
View file @
02dc2565
...
@@ -6,5 +6,5 @@
...
@@ -6,5 +6,5 @@
=
hidden_field_tag
:path
,
params
[
:path
]
=
hidden_field_tag
:path
,
params
[
:path
]
%li
{
:class
=>
"#{'active' if (controller.controller_name == "
refs
") }"
}
%li
{
:class
=>
"#{'active' if (controller.controller_name == "
refs
") }"
}
=
link_to
tree_project_ref_path
(
@project
,
@ref
)
do
=
link_to
tree_project_ref_path
(
@project
,
@ref
)
do
Cod
e
Sourc
e
app/views/repositories/_branches_head.html.haml
View file @
02dc2565
...
@@ -9,4 +9,3 @@
...
@@ -9,4 +9,3 @@
%li
{
:class
=>
(
"active"
if
current_page?
(
branches_project_repository_path
(
@project
)))}
%li
{
:class
=>
(
"active"
if
current_page?
(
branches_project_repository_path
(
@project
)))}
=
link_to
branches_project_repository_path
(
@project
)
do
=
link_to
branches_project_repository_path
(
@project
)
do
All
All
%hr
app/views/repositories/branches.html.haml
View file @
02dc2565
=
render
"repositories/branches_head"
=
render
"repositories/branches_head"
-
unless
@branches
.
empty?
-
unless
@branches
.
empty?
%table
.table-striped.borders
%table
.admin-table
%thead
%tr
%th
Name
%th
Last commit
%th
Updated at
%th
%tbody
%tbody
-
@branches
.
each
do
|
branch
|
-
@branches
.
each
do
|
branch
|
=
render
"repositories/branch"
,
:branch
=>
branch
=
render
"repositories/branch"
,
:branch
=>
branch
app/views/repositories/show.html.haml
View file @
02dc2565
=
render
"branches_head"
=
render
"branches_head"
%table
.zebra-striped.borders
%table
.admin-table
%thead
%tr
%th
Name
%th
Last commit
%th
Updated at
%th
-
@activities
.
each
do
|
update
|
-
@activities
.
each
do
|
update
|
=
render
"repositories/branch"
,
:branch
=>
update
.
head
=
render
"repositories/branch"
,
:branch
=>
update
.
head
app/views/snippets/_form.html.haml
View file @
02dc2565
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
.input
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
:style
=>
"width:200px;"
.input
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
:style
=>
"width:200px;"
.clearfix
.clearfix
=
f
.
label
:content
,
"Code"
=
f
.
label
:content
,
"Code"
=
f
.
text_area
:content
,
:class
=>
"xxlarge
"
.input
=
f
.
text_area
:content
,
:class
=>
"span8
"
.actions
.actions
=
f
.
submit
'Save'
,
:class
=>
"primary btn"
=
f
.
submit
'Save'
,
:class
=>
"primary btn"
...
...
app/views/team_members/_show.html.haml
View file @
02dc2565
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
user
.
name
,
:class
=>
"dark"
do
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
user
.
name
,
:class
=>
"dark"
do
=
image_tag
gravatar_icon
(
user
.
email
,
40
),
:class
=>
"avatar"
=
image_tag
gravatar_icon
(
user
.
email
,
40
),
:class
=>
"avatar"
%strong
=
truncate
(
user
.
name
,
:lenght
=>
40
)
%strong
=
truncate
(
user
.
name
,
:lenght
=>
40
)
.prepend-top-10
=
user
.
email
%div
.cgray
=
user
.
email
.span3
.span3
=
form_for
(
member
,
:as
=>
:team_member
,
:url
=>
project_team_member_path
(
@project
,
member
))
do
|
f
|
=
form_for
(
member
,
:as
=>
:team_member
,
:url
=>
project_team_member_path
(
@project
,
member
))
do
|
f
|
...
...
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