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
8ca0b75d
Commit
8ca0b75d
authored
12 years ago
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tables refactored
parent
c7cfe3d8
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
97 additions
and
93 deletions
+97
-93
app/assets/stylesheets/gitlab_bootstrap/tables.scss
app/assets/stylesheets/gitlab_bootstrap/tables.scss
+28
-24
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+21
-35
app/views/admin/hooks/index.html.haml
app/views/admin/hooks/index.html.haml
+1
-1
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
+7
-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
+9
-5
app/views/hooks/index.html.haml
app/views/hooks/index.html.haml
+6
-5
app/views/keys/index.html.haml
app/views/keys/index.html.haml
+1
-1
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+2
-2
app/views/projects/_team.html.haml
app/views/projects/_team.html.haml
+1
-1
app/views/projects/files.html.haml
app/views/projects/files.html.haml
+6
-1
app/views/protected_branches/index.html.haml
app/views/protected_branches/index.html.haml
+1
-1
app/views/refs/_tree.html.haml
app/views/refs/_tree.html.haml
+1
-1
app/views/repositories/branches.html.haml
app/views/repositories/branches.html.haml
+1
-1
app/views/repositories/show.html.haml
app/views/repositories/show.html.haml
+1
-1
app/views/repositories/tags.html.haml
app/views/repositories/tags.html.haml
+1
-1
app/views/search/show.html.haml
app/views/search/show.html.haml
+3
-3
app/views/snippets/index.html.haml
app/views/snippets/index.html.haml
+1
-1
app/views/team_members/show.html.haml
app/views/team_members/show.html.haml
+2
-2
app/views/wikis/history.html.haml
app/views/wikis/history.html.haml
+1
-1
app/views/wikis/pages.html.haml
app/views/wikis/pages.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/tables.scss
View file @
8ca0b75d
table
{
@extend
.table
;
@extend
.table-striped
;
@include
solid_shade
;
border
:
1px
solid
#bbb
;
width
:
100%
;
th
{
padding-top
:
9px
;
font-weight
:
bold
;
vertical-align
:
middle
;
border-bottom
:
1px
solid
#bbb
;
text-shadow
:
0
1px
1px
#fff
;
@include
bg-dark-gray-gradient
;
}
th
,
td
{
padding
:
10px
10px
9
px
;
padding
:
8
px
;
line-height
:
18px
;
text-align
:
left
;
}
&
.bordered-table
{
border
:
1px
solid
#DDD
;
border-collapse
:
separate
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
}
td
{
border-color
:
#f1f1f1
;
&
:first-child
{
border-left
:
1px
solid
#bbb
;
}
&
.zebra-striped
{
@extend
.table-striped
;
&
:last-child
{
border-right
:
1px
solid
#bbb
;
}
}
}
table
.admin-table
{
@extend
.table-bordered
;
@extend
.zebra-striped
;
@include
solid_shade
;
th
{
border-color
:
#CCC
;
border-bottom
:
1px
solid
#bbb
;
@include
bg-gray-gradient
;
&
.bordered
{
@extend
.table-bordered
;
}
}
table
.no-borders
{
border
:none
;
tr
,
td
{
border
:none
}
&
.lite
{
border
:none
;
box-shadow
:none
;
tr
,
td
{
border
:none
;
background
:none
!
important
;
}
}
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/tree.scss
View file @
8ca0b75d
#tree-holder
{
#tree-holder
{
#tree-content-holder
{
float
:left
;
width
:
100%
;
...
...
@@ -11,40 +11,44 @@
padding
:
12px
;
background
:
#F7F7F7
;
pre
{
pre
{
overflow
:
auto
;
}
}
}
.tree_progress
{
.tree_progress
{
display
:none
;
margin
:
20px
;
&
.loading
{
&
.loading
{
display
:block
;
}
}
#tree-slider
{
@include
border-radius
(
0
);
.tree-item
{
&
:hover
{
td
{
background
:
$hover
;
}
.tree-item
{
&
:hover
{
td
{
background
:
$hover
;
border-top
:
1px
solid
#FEA
;
border-bottom
:
1px
solid
#FEA
;
}
cursor
:pointer
;
}
}
}
.tree-item
{
.tree-item-file-name
{
.tree-item
{
.tree-item-file-name
{
vertical-align
:middle
;
a
{
&
:hover
{
a
{
&
:hover
{
color
:
$blue_link
;
}
}
img
{
img
{
position
:
relative
;
top
:
-1px
;
}
...
...
@@ -52,37 +56,19 @@
}
#tree-slider
{
@include
solid_shade
;
width
:
100%
;
border-color
:
#ccc
;
td
{
padding
:
8px
;
border-color
:
#f1f1f1
;
#tree-slider
{
td
{
background
:
#fafafa
;
}
tr
:first-child
td
:first-child
,
tr
:first-child
td
:last-child
{
border-radius
:
0
;
}
th
{
border-color
:
#CCC
;
border-bottom
:
1px
solid
#bbb
;
@include
bg-gray-gradient
;
}
}
.tree-commit-link
{
.tree-commit-link
{
color
:
#333
;
}
a
.tree-commit-link
{
a
.tree-commit-link
{
color
:
#666
;
&
:hover
{
&
:hover
{
text-decoration
:
underline
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/hooks/index.html.haml
View file @
8ca0b75d
...
...
@@ -23,7 +23,7 @@
Hooks
%small
(
#{
@hooks
.
count
}
)
%br
%table
.admin-table
%table
%tr
%th
URL
%th
Method
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/projects/index.html.haml
View file @
8ca0b75d
...
...
@@ -6,7 +6,7 @@
=
text_field_tag
:name
,
params
[
:name
],
class:
"xlarge"
=
submit_tag
"Search"
,
class:
"btn submit primary"
%table
.admin-table
%table
%thead
%th
Name
%th
Path
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/projects/show.html.haml
View file @
8ca0b75d
...
...
@@ -3,7 +3,11 @@
=
link_to
'Edit'
,
edit_admin_project_path
(
@admin_project
),
class:
"btn right small"
%br
%table
.zebra-striped.table-bordered
%table
.zebra-striped
%thead
%tr
%th
Project
%th
%tr
%td
%b
...
...
@@ -40,7 +44,7 @@
%small
(
#{
@admin_project
.
users_projects
.
count
}
)
%br
%table
.zebra-striped
.table-bordered
%table
.zebra-striped
%thead
%tr
%th
Name
...
...
@@ -60,7 +64,7 @@
%h3
Add new team member
%br
=
form_tag
team_update_admin_project_path
(
@admin_project
),
class:
"bulk_import"
,
method: :put
do
%table
.zebra-striped
.table-bordered
%table
.zebra-striped
%thead
%tr
%th
Users
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/users/index.html.haml
View file @
8ca0b75d
...
...
@@ -19,7 +19,7 @@
=
link_to
admin_users_path
(
filter:
"wop"
)
do
Without projects
%table
.admin-table
%table
%thead
%th
Admin
%th
Name
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/users/show.html.haml
View file @
8ca0b75d
...
...
@@ -8,7 +8,11 @@
%br
%table
.zebra-striped.table-bordered
%table
.zebra-striped
%thead
%tr
%th
Profile
%th
%tr
%td
%b
...
...
@@ -57,7 +61,7 @@
%h3
Add User to Projects
%br
=
form_tag
team_update_admin_user_path
(
@admin_user
),
class:
"bulk_import"
,
method: :put
do
%table
.table-bordered
%table
%thead
%tr
%th
Projects
...
...
@@ -78,9 +82,9 @@
%h3
Projects
%br
%table
.zebra-striped
.table-bordered
%t
r
%t
head
%table
.zebra-striped
%t
head
%t
r
%th
Name
%th
Project Access
%th
...
...
This diff is collapsed.
Click to expand it.
app/views/hooks/index.html.haml
View file @
8ca0b75d
...
...
@@ -26,11 +26,12 @@
Hooks
%small
(
#{
@hooks
.
count
}
)
%br
%table
.admin-table
%tr
%th
URL
%th
Method
%th
%table
%thead
%tr
%th
URL
%th
Method
%th
-
@hooks
.
each
do
|
hook
|
%tr
%td
...
...
This diff is collapsed.
Click to expand it.
app/views/keys/index.html.haml
View file @
8ca0b75d
...
...
@@ -7,7 +7,7 @@
SSH key allows you to establish a secure connection between your computer and Gitlab
%table
#keys-table
.admin-table
%table
#keys-table
%thead
%tr
%th
Name
...
...
This diff is collapsed.
Click to expand it.
app/views/milestones/show.html.haml
View file @
8ca0b75d
...
...
@@ -42,7 +42,7 @@
.row
.span6
%table
.admin-table
%table
%thead
%th
Open Issues
-
@issues
.
each
do
|
issue
|
...
...
@@ -56,7 +56,7 @@
=
paginate
@issues
,
theme:
"gitlab"
.span6
%table
.admin-table
%table
%thead
%th
Participants
-
@users
.
each
do
|
user
|
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/_team.html.haml
View file @
8ca0b75d
%table
.admin-table
%table
%thead
%tr
%th
User
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/files.html.haml
View file @
8ca0b75d
=
render
"project_head"
-
unless
@notes
.
empty?
%table
.zebra-striped.borders
%table
%thead
%tr
%th
File name
%th
-
@notes
.
each
do
|
note
|
%tr
%td
...
...
This diff is collapsed.
Click to expand it.
app/views/protected_branches/index.html.haml
View file @
8ca0b75d
...
...
@@ -24,7 +24,7 @@
=
f
.
submit
'Protect'
,
class:
"primary btn"
-
unless
@branches
.
empty?
%table
.admin-table
%table
%thead
%tr
%th
Name
...
...
This diff is collapsed.
Click to expand it.
app/views/refs/_tree.html.haml
View file @
8ca0b75d
...
...
@@ -13,7 +13,7 @@
=
render
partial:
"refs/tree_file"
,
locals:
{
name:
tree
.
name
,
content:
tree
.
data
,
file:
tree
}
-
else
-
contents
=
tree
.
contents
%table
#tree-slider
.bordered-table.table
{
class:
"table_#{@hex_path}"
}
%table
#tree-slider
{
class:
"table_#{@hex_path}"
}
%thead
%th
Name
%th
Last Update
...
...
This diff is collapsed.
Click to expand it.
app/views/repositories/branches.html.haml
View file @
8ca0b75d
=
render
"repositories/branches_head"
-
unless
@branches
.
empty?
%table
.admin-table
%table
%thead
%tr
%th
Name
...
...
This diff is collapsed.
Click to expand it.
app/views/repositories/show.html.haml
View file @
8ca0b75d
=
render
"branches_head"
%table
.admin-table
%table
%thead
%tr
%th
Name
...
...
This diff is collapsed.
Click to expand it.
app/views/repositories/tags.html.haml
View file @
8ca0b75d
=
render
"commits/head"
-
unless
@tags
.
empty?
%table
.admin-table
%table
%thead
%tr
%th
Name
...
...
This diff is collapsed.
Click to expand it.
app/views/search/show.html.haml
View file @
8ca0b75d
...
...
@@ -14,7 +14,7 @@
.search_results
.row
.span6
%table
.admin-table
%table
%tr
%th
Projects
%tbody
...
...
@@ -31,7 +31,7 @@
%td
%h4
.nothing_here_message
No Projects
%br
%table
.admin-table
%table
%tr
%th
Merge Requests
%tbody
...
...
@@ -49,7 +49,7 @@
%td
%h4
.nothing_here_message
No Merge Requests
.span6
%table
.admin-table
%table
%tr
%th
Issues
%tbody
...
...
This diff is collapsed.
Click to expand it.
app/views/snippets/index.html.haml
View file @
8ca0b75d
...
...
@@ -8,7 +8,7 @@
%br
To add new snippet - click on button.
%table
.admin-table
%table
%thead
%tr
%th
Title
...
...
This diff is collapsed.
Click to expand it.
app/views/team_members/show.html.haml
View file @
8ca0b75d
...
...
@@ -19,7 +19,7 @@
%br
.row
.span6
%table
.
no-borders
%table
.
lite
%tr
%td
Email
%td
=
mail_to
user
.
email
...
...
@@ -39,7 +39,7 @@
%td
Bio
%td
=
user
.
bio
.span6
%table
.
no-borders
%table
.
lite
%tr
%td
Member since
%td
=
@team_member
.
created_at
.
stamp
(
"Aug 21, 2011"
)
...
...
This diff is collapsed.
Click to expand it.
app/views/wikis/history.html.haml
View file @
8ca0b75d
...
...
@@ -2,7 +2,7 @@
%span
.cgray
History for
=
@wikis
.
last
.
title
%br
%table
.admin-table
%table
%thead
%tr
%th
#
...
...
This diff is collapsed.
Click to expand it.
app/views/wikis/pages.html.haml
View file @
8ca0b75d
%h3
.page_title
All Pages
%br
%table
.admin-table
%table
%thead
%tr
%th
Title
...
...
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