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
95875061
Commit
95875061
authored
Sep 24, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont override default table with bootstrap class. Refactor table css
parent
550c1828
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
96 deletions
+31
-96
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+0
-1
app/assets/stylesheets/gitlab_bootstrap/files.scss
app/assets/stylesheets/gitlab_bootstrap/files.scss
+4
-0
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+8
-0
app/assets/stylesheets/gitlab_bootstrap/tables.scss
app/assets/stylesheets/gitlab_bootstrap/tables.scss
+0
-68
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+17
-25
app/views/projects/tree/_tree.html.haml
app/views/projects/tree/_tree.html.haml
+1
-1
app/views/projects/tree/_tree_item.html.haml
app/views/projects/tree/_tree_item.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
95875061
...
@@ -62,6 +62,5 @@ $baseLineHeight: 18px !default;
...
@@ -62,6 +62,5 @@ $baseLineHeight: 18px !default;
@import
"gitlab_bootstrap/buttons.scss"
;
@import
"gitlab_bootstrap/buttons.scss"
;
@import
"gitlab_bootstrap/blocks.scss"
;
@import
"gitlab_bootstrap/blocks.scss"
;
@import
"gitlab_bootstrap/files.scss"
;
@import
"gitlab_bootstrap/files.scss"
;
@import
"gitlab_bootstrap/tables.scss"
;
@import
"gitlab_bootstrap/lists.scss"
;
@import
"gitlab_bootstrap/lists.scss"
;
@import
"gitlab_bootstrap/forms.scss"
;
@import
"gitlab_bootstrap/forms.scss"
;
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @
95875061
...
@@ -6,6 +6,10 @@
...
@@ -6,6 +6,10 @@
border
:
1px
solid
#CCC
;
border
:
1px
solid
#CCC
;
margin-bottom
:
1em
;
margin-bottom
:
1em
;
table
{
@extend
.table
;
}
.file-title
{
.file-title
{
border-bottom
:
1px
solid
#bbb
;
border-bottom
:
1px
solid
#bbb
;
@include
bg-dark-gray-gradient
;
@include
bg-dark-gray-gradient
;
...
...
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @
95875061
...
@@ -95,6 +95,14 @@
...
@@ -95,6 +95,14 @@
font-size
:
14px
;
font-size
:
14px
;
line-height
:
1
.5
;
line-height
:
1
.5
;
}
}
table
{
@extend
.table
;
@extend
.table-bordered
;
th
{
background
:
#EEE
;
}
}
}
}
@mixin
page-title
{
@mixin
page-title
{
...
...
app/assets/stylesheets/gitlab_bootstrap/tables.scss
deleted
100644 → 0
View file @
550c1828
table
{
@extend
.table
;
@extend
.table-striped
;
border
:
1px
solid
#CCC
;
width
:
100%
;
&
.low
{
td
{
line-height
:
18px
;
}
}
&
.headless
{
tr
:first-child
td
{
border-top
:
1px
solid
#CCC
;
}
}
th
{
font-weight
:
normal
;
font-size
:
15px
;
vertical-align
:
middle
;
border-bottom
:
1px
solid
#CCC
;
text-shadow
:
0
1px
1px
#fff
;
ul
.nav
{
text-shadow
:
none
;
margin
:
0
;
}
}
th
,
td
{
padding
:
10px
;
line-height
:
18px
;
text-align
:
left
;
}
td
{
border-color
:
#f1f1f1
;
line-height
:
28px
;
.s16
{
margin-top
:
5px
;
margin-right
:
5px
;
}
&
:first-child
{
border-left
:
1px
solid
#CCC
;
}
&
:last-child
{
border-right
:
1px
solid
#CCC
;
}
}
&
.bordered
{
@extend
.table-bordered
;
}
&
.lite
{
border
:
none
;
box-shadow
:
none
;
tr
,
td
{
border
:
none
;
background
:none
!
important
;
}
}
}
app/assets/stylesheets/sections/tree.scss
View file @
95875061
...
@@ -13,13 +13,21 @@
...
@@ -13,13 +13,21 @@
}
}
.tree-table
{
.tree-table
{
@extend
.table
;
@include
border-radius
(
0
);
@include
border-radius
(
0
);
.tree-item
{
td
{
tr
{
td
,
th
{
padding
:
8px
10px
;
padding
:
8px
10px
;
strong
{
line-height
:
20px
;
font-weight
:
normal
;
}
}
th
{
font-weight
:
normal
;
font-size
:
15px
;
border-bottom
:
1px
solid
#CCC
;
}
td
{
border-color
:
#F1F1F1
;
}
}
&
:hover
{
&
:hover
{
td
{
td
{
...
@@ -29,12 +37,11 @@
...
@@ -29,12 +37,11 @@
}
}
cursor
:
pointer
;
cursor
:
pointer
;
}
}
&
.selected
{
&
.selected
{
td
{
td
{
background
:
$hover
;
background
:
#f5f5f5
;
border-top
:
1px
solid
#
ADF
;
border-top
:
1px
solid
#
EEE
;
border-bottom
:
1px
solid
#
ADF
;
border-bottom
:
1px
solid
#
EEE
;
}
}
}
}
}
}
...
@@ -56,21 +63,6 @@
...
@@ -56,21 +63,6 @@
}
}
}
}
.tree-table
{
border
:
none
;
th
.btn
{
margin
:
-2px
-1px
;
padding
:
2px
10px
;
}
td
{
line-height
:
20px
;
background
:
#fff
;
border-left
:
none
;
border-right
:
none
;
}
}
.tree_author
{
.tree_author
{
padding-right
:
8px
;
padding-right
:
8px
;
...
@@ -125,4 +117,4 @@
...
@@ -125,4 +117,4 @@
.tree-ref-holder
{
.tree-ref-holder
{
float
:
left
;
float
:
left
;
margin-top
:
5px
;
margin-top
:
5px
;
}
}
\ No newline at end of file
app/views/projects/tree/_tree.html.haml
View file @
95875061
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
=
link_to
@commit
.
short_id
,
project_commit_path
(
@project
,
@commit
)
=
link_to
@commit
.
short_id
,
project_commit_path
(
@project
,
@commit
)
–
–
=
truncate
(
@commit
.
title
,
length:
50
)
=
truncate
(
@commit
.
title
,
length:
50
)
%th
=
link_to
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"
btn btn-tiny
pull-right"
%th
=
link_to
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"pull-right"
-
if
tree
.
up_dir?
-
if
tree
.
up_dir?
%tr
.tree-item
%tr
.tree-item
...
...
app/views/projects/tree/_tree_item.html.haml
View file @
95875061
%tr
{
class:
"tree-item #{tree_hex_class(tree_item)}"
}
%tr
{
class:
"tree-item #{tree_hex_class(tree_item)}"
}
%td
.tree-item-file-name
%td
.tree-item-file-name
=
tree_icon
(
type
)
=
tree_icon
(
type
)
%s
trong
=
link_to
truncate
(
tree_item
.
name
,
length:
40
),
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
tree_item
.
name
))
%s
pan
=
link_to
truncate
(
tree_item
.
name
,
length:
40
),
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
tree_item
.
name
))
%td
.tree_time_ago.cgray
%td
.tree_time_ago.cgray
%span
.log_loading.hide
%span
.log_loading.hide
Loading commit data...
Loading commit data...
...
...
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