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
a41875d2
Commit
a41875d2
authored
Jul 13, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace %h5.title with div.title
parent
e97abfce
Changes
33
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
52 additions
and
58 deletions
+52
-58
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+2
-5
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+0
-1
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+2
-4
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+3
-3
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+4
-4
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+1
-1
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+3
-3
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+1
-1
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+3
-3
app/views/dashboard/_groups.html.haml
app/views/dashboard/_groups.html.haml
+1
-1
app/views/dashboard/_projects.html.haml
app/views/dashboard/_projects.html.haml
+1
-1
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+1
-1
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+1
-1
app/views/groups/_projects.html.haml
app/views/groups/_projects.html.haml
+1
-1
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+4
-4
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-1
app/views/groups/members.html.haml
app/views/groups/members.html.haml
+1
-1
app/views/help/index.html.haml
app/views/help/index.html.haml
+3
-3
app/views/profiles/groups/index.html.haml
app/views/profiles/groups/index.html.haml
+1
-1
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/index.html.haml
+1
-1
app/views/profiles/keys/show.html.haml
app/views/profiles/keys/show.html.haml
+1
-1
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+1
-1
app/views/projects/compare/show.html.haml
app/views/projects/compare/show.html.haml
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+4
-4
app/views/projects/hooks/index.html.haml
app/views/projects/hooks/index.html.haml
+1
-1
app/views/projects/merge_requests/show/_commits.html.haml
app/views/projects/merge_requests/show/_commits.html.haml
+1
-1
app/views/projects/milestones/_issues.html.haml
app/views/projects/milestones/_issues.html.haml
+1
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+2
-2
app/views/projects/team_members/_group_members.html.haml
app/views/projects/team_members/_group_members.html.haml
+1
-1
app/views/projects/team_members/_team.html.haml
app/views/projects/team_members/_team.html.haml
+1
-1
app/views/shared/_merge_requests.html.haml
app/views/shared/_merge_requests.html.haml
+1
-1
app/views/users/_profile.html.haml
app/views/users/_profile.html.haml
+1
-1
app/views/users/_projects.html.haml
app/views/users/_projects.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file @
a41875d2
...
...
@@ -88,13 +88,10 @@
text-shadow
:
0
1px
1px
#fff
;
padding
:
10px
;
font-size
:
14px
;
line-height
:
20px
;
font-weight
:
normal
;
margin
:
0
;
h5
{
margin
:
0
;
}
>
a
{
text-shadow
:
0
1px
1px
#fff
;
}
...
...
@@ -106,7 +103,7 @@
.btn
{
position
:
relative
;
top
:
-2px
;
margin-
top
:
-2px
;
}
.nav-pills
{
...
...
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @
a41875d2
...
...
@@ -77,7 +77,6 @@
@mixin
md-typography
{
code
{
padding
:
0
4px
;
}
p
{
font-size
:
14px
;
}
h1
{
margin-top
:
30px
;}
h2
{
margin-top
:
25px
;}
h3
{
margin-top
:
20px
;}
...
...
app/assets/stylesheets/sections/dashboard.scss
View file @
a41875d2
...
...
@@ -10,8 +10,8 @@
margin
:
0px
;
box-shadow
:
none
;
>
.title
{
padding
:
2px
15px
;
.title
.btn
{
margin
:
0
;
}
.nav-projects-tabs
li
{
padding
:
0
;
}
}
...
...
@@ -37,8 +37,6 @@
padding
:
4px
6px
;
width
:
202px
;
float
:
left
;
margin-top
:
3px
;
margin-left
:
-2px
;
}
}
...
...
app/views/admin/dashboard/index.html.haml
View file @
a41875d2
.admin_dash.row
.span4
.ui-box
%h5
.title
Projects
.title
Projects
.data.padded
=
link_to
admin_projects_path
do
%h1
=
Project
.
count
...
...
@@ -9,7 +9,7 @@
=
link_to
'New Project'
,
new_project_path
,
class:
"btn btn-small"
.span4
.ui-box
%h5
.title
Users
.title
Users
.data.padded
=
link_to
admin_users_path
do
%h1
=
User
.
count
...
...
@@ -17,7 +17,7 @@
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-small"
.span4
.ui-box
%h5
.title
Groups
.title
Groups
.data.padded
=
link_to
admin_groups_path
do
%h1
=
Group
.
count
...
...
app/views/admin/groups/show.html.haml
View file @
a41875d2
...
...
@@ -8,7 +8,7 @@
.row
.span6
.ui-box
%h5
.title
.title
Group info:
%ul
.well-list
%li
...
...
@@ -50,7 +50,7 @@
=
@group
.
created_at
.
stamp
(
"March 1, 1999"
)
.ui-box
%h5
.title
.title
Projects
%small
(
#{
@group
.
projects
.
count
}
)
...
...
@@ -64,7 +64,7 @@
.span6
.ui-box
%h5
.title
.title
Add user(s) to the group:
.ui-box-body.form-holder
%p
.light
...
...
@@ -79,7 +79,7 @@
%hr
=
submit_tag
'Add users into group'
,
class:
"btn btn-create"
.ui-box
%h5
.title
.title
%strong
#{
@group
.
name
}
Group Members
%small
...
...
app/views/admin/projects/index.html.haml
View file @
a41875d2
...
...
@@ -41,7 +41,7 @@
=
link_to
"Reset"
,
admin_projects_path
,
class:
"btn"
.span8
.ui-box
%h5
.title
.title
Projects (
#{
@projects
.
total_count
}
)
%ul
.well-list
-
@projects
.
each
do
|
project
|
...
...
app/views/admin/projects/show.html.haml
View file @
a41875d2
...
...
@@ -7,7 +7,7 @@
.row
.span6
.ui-box
%h5
.title
.title
Project info:
%ul
.well-list
%li
...
...
@@ -76,7 +76,7 @@
.span6
-
if
@group
.ui-box
%h5
.title
.title
%strong
#{
@group
.
name
}
Group
members (
#{
@group
.
users_groups
.
count
}
)
.pull-right
...
...
@@ -87,7 +87,7 @@
=
render
'users_groups/users_group'
,
member:
member
,
show_controls:
false
.ui-box
%h5
.title
.title
Team
%small
(
#{
@project
.
users
.
count
}
)
...
...
app/views/admin/users/index.html.haml
View file @
a41875d2
...
...
@@ -32,7 +32,7 @@
.span9
.ui-box
%h5
.title
.title
Users (
#{
@users
.
total_count
}
)
%ul
.well-list
-
@users
.
each
do
|
user
|
...
...
app/views/admin/users/show.html.haml
View file @
a41875d2
...
...
@@ -21,7 +21,7 @@
.row
.span6
.ui-box
%h5
.title
.title
Account:
.pull-right
=
image_tag
gravatar_icon
(
@user
.
email
,
32
),
class:
"avatar s32"
...
...
@@ -65,7 +65,7 @@
-
if
@user
.
users_groups
.
present?
.ui-box
%h5
.title
Groups:
.title
Groups:
%ul
.well-list
-
@user
.
users_groups
.
each
do
|
user_group
|
-
group
=
user_group
.
group
...
...
@@ -76,7 +76,7 @@
.span6
.ui-box
%h5
.title
Projects (
#{
@projects
.
count
}
)
.title
Projects (
#{
@projects
.
count
}
)
%ul
.well-list
-
@projects
.
sort_by
(
&
:name_with_namespace
).
each
do
|
project
|
-
tm
=
project
.
team
.
find_tm
(
@user
.
id
)
...
...
app/views/dashboard/_groups.html.haml
View file @
a41875d2
.ui-box
%h5
.title.clearfix
.title.clearfix
=
search_field_tag
:filter_group
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter'
-
if
current_user
.
can_create_group?
%span
.pull-right
...
...
app/views/dashboard/_projects.html.haml
View file @
a41875d2
.ui-box
%h5
.title.clearfix
.title.clearfix
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter'
-
if
current_user
.
can_create_project?
%span
.pull-right
...
...
app/views/dashboard/issues.html.haml
View file @
a41875d2
...
...
@@ -13,7 +13,7 @@
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
%div
.ui-box
-
project
=
group
[
0
]
%h5
.title
.title
=
link_to_project
project
%i
.icon-angle-right
...
...
app/views/dashboard/projects.html.haml
View file @
a41875d2
...
...
@@ -22,7 +22,7 @@
.span9
.ui-box
%h5
.title
.title
Projects (
#{
@projects
.
total_count
}
)
.pull-right.light
%small
Last activity
...
...
app/views/groups/_projects.html.haml
View file @
a41875d2
.ui-box
%h5
.title
.title
Projects (
#{
projects
.
count
}
)
-
if
can?
current_user
,
:manage_group
,
@group
%span
.pull-right
...
...
app/views/groups/edit.html.haml
View file @
a41875d2
...
...
@@ -18,7 +18,7 @@
.tab-content
.tab-pane.active
#tab-edit
.ui-box
%h5
.title
.title
%strong
=
@group
.
name
Group Settings:
%div
.form-holder
...
...
@@ -42,7 +42,7 @@
.tab-pane
#tab-projects
.ui-box
%h5
.title
.title
%strong
=
@group
.
name
Projects:
-
if
can?
current_user
,
:manage_group
,
@group
...
...
@@ -67,7 +67,7 @@
.tab-pane
#tab-transfer
.ui-box.ui-box-danger
%h5
.title
Transfer group
.title
Transfer group
.ui-box-body
%p
Transferring group will cause loss of admin control over group and all child projects
...
...
@@ -78,7 +78,7 @@
.tab-pane
#tab-remove
.ui-box.ui-box-danger
%h5
.title
Remove group
.title
Remove group
.ui-box-body
%p
Remove of group will cause removing all child projects and resources.
...
...
app/views/groups/issues.html.haml
View file @
a41875d2
...
...
@@ -12,7 +12,7 @@
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
%div
.ui-box
-
project
=
group
[
0
]
%h5
.title
.title
=
link_to_project
project
%ul
.well-list.issues-list
-
group
[
1
].
each
do
|
issue
|
...
...
app/views/groups/members.html.haml
View file @
a41875d2
...
...
@@ -9,7 +9,7 @@
Only group owners can manage group members
.span6
.ui-box
%h5
.title
.title
%strong
#{
@group
.
name
}
Group Members
%small
...
...
app/views/help/index.html.haml
View file @
a41875d2
...
...
@@ -14,7 +14,7 @@
.span4
.ui-box
.title
%h5
Quick help
Quick help
%ul
.well-list
%li
Email your
...
...
@@ -38,7 +38,7 @@
.span4
.ui-box
.title
%h5
User documentation
User documentation
%ul
.well-list
%li
%strong
=
link_to
"Workflow"
,
help_workflow_path
...
...
@@ -67,7 +67,7 @@
.span4
.ui-box
.title
%h5
Admin documentation
Admin documentation
%ul
.well-list
%li
...
...
app/views/profiles/groups/index.html.haml
View file @
a41875d2
.ui-box
%h5
.title
.title
%strong
Groups
(
#{
@groups
.
count
}
)
-
if
current_user
.
can_create_group?
...
...
app/views/profiles/keys/index.html.haml
View file @
a41875d2
...
...
@@ -7,7 +7,7 @@
.ui-box
%h5
.title
.title
SSH Keys (
#{
@keys
.
count
}
)
.pull-right
=
link_to
"Add SSH Key"
,
new_profile_key_path
,
class:
"btn btn-small btn-primary"
...
...
app/views/profiles/keys/show.html.haml
View file @
a41875d2
.row
.span4
.ui-box
%h5
.title
.title
SSH Key
%ul
.well-list
%li
...
...
app/views/projects/commits/_commits.html.haml
View file @
a41875d2
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
sort
.
reverse
.
each
do
|
day
,
commits
|
%div
.ui-box
%h5
.title
.title
%i
.icon-calendar
%span
=
day
.
stamp
(
"28 Aug, 2010"
)
...
...
app/views/projects/compare/show.html.haml
View file @
a41875d2
...
...
@@ -13,7 +13,7 @@
-
if
@commits
.
present?
%div
.ui-box
%h5
.title
.title
Commits (
#{
@commits
.
count
}
)
%ul
.well-list
=
render
Commit
.
decorate
(
@commits
)
...
...
app/views/projects/edit.html.haml
View file @
a41875d2
...
...
@@ -2,7 +2,7 @@
.project-edit-errors
.project-edit-content
.ui-box.white
%h5
.title
.title
%strong
=
@project
.
name
Project Settings:
.form-holder
...
...
@@ -102,7 +102,7 @@
-
if
can?
(
current_user
,
:change_namespace
,
@project
)
.ui-box.ui-box-danger
%h5
.title
Transfer project
.title
Transfer project
.errors-holder
.form-holder
=
form_for
(
@project
,
url:
transfer_project_path
(
@project
),
remote:
true
,
html:
{
class:
'transfer-project'
})
do
|
f
|
...
...
@@ -122,7 +122,7 @@
%p
.nothing_here_message
Only project owner can transfer a project
.ui-box.ui-box-danger
%h5
.title
Rename repository
.title
Rename repository
.errors-holder
.form-holder
=
form_for
(
@project
)
do
|
f
|
...
...
@@ -140,7 +140,7 @@
-
if
can?
(
current_user
,
:remove_project
,
@project
)
.ui-box.ui-box-danger
%h5
.title
Remove project
.title
Remove project
.ui-box-body
%p
Remove of project will cause removing repository and all related resources like issues, merge requests etc.
...
...
app/views/projects/hooks/index.html.haml
View file @
a41875d2
...
...
@@ -21,7 +21,7 @@
-
if
@hooks
.
any?
.ui-box
%h5
.title
.title
Hooks (
#{
@hooks
.
count
}
)
%ul
.well-list
-
@hooks
.
each
do
|
hook
|
...
...
app/views/projects/merge_requests/show/_commits.html.haml
View file @
a41875d2
-
if
@commits
.
present?
.ui-box
%h5
.title
.title
%i
.icon-list
Commits (
#{
@commits
.
count
}
)
.commits
...
...
app/views/projects/milestones/_issues.html.haml
View file @
a41875d2
.ui-box
%h5
.title
=
title
.title
=
title
%ul
.well-list
-
issues
.
each
do
|
issue
|
%li
...
...
app/views/projects/milestones/show.html.haml
View file @
a41875d2
...
...
@@ -84,13 +84,13 @@
.row
.span6
.ui-box
%h5
.title
Open
.title
Open
%ul
.well-list
-
@merge_requests
.
opened
.
each
do
|
merge_request
|
=
render
'merge_request'
,
merge_request:
merge_request
.span6
.ui-box
%h5
.title
Closed
.title
Closed
%ul
.well-list
-
@merge_requests
.
closed
.
each
do
|
merge_request
|
=
render
'merge_request'
,
merge_request:
merge_request
...
...
app/views/projects/team_members/_group_members.html.haml
View file @
a41875d2
.ui-box
%h5
.title
.title
%strong
#{
@group
.
name
}
Group
members (
#{
@group
.
users_groups
.
count
}
)
.pull-right
...
...
app/views/projects/team_members/_team.html.haml
View file @
a41875d2
.team-table
-
can_admin_project
=
(
can?
current_user
,
:admin_project
,
@project
)
.ui-box
%h5
.title
.title
%strong
#{
@project
.
name
}
Project
members (
#{
members
.
count
}
)
%ul
.well-list
...
...
app/views/shared/_merge_requests.html.haml
View file @
a41875d2
...
...
@@ -2,7 +2,7 @@
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
.ui-box
-
project
=
group
[
0
]
%h5
.title
.title
=
link_to_project
project
%ul
.well-list.mr-list
-
group
[
1
].
each
do
|
merge_request
|
...
...
app/views/users/_profile.html.haml
View file @
a41875d2
.ui-box
%h5
.title
.title
Profile
%ul
.well-list
%li
...
...
app/views/users/_projects.html.haml
View file @
a41875d2
.ui-box
%h5
.title
Projects
.title
Projects
%ul
.well-list
-
@projects
.
each
do
|
project
|
%li
...
...
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