Commit 95875061 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Dont override default table with bootstrap class. Refactor table css

parent 550c1828
......@@ -62,6 +62,5 @@ $baseLineHeight: 18px !default;
@import "gitlab_bootstrap/buttons.scss";
@import "gitlab_bootstrap/blocks.scss";
@import "gitlab_bootstrap/files.scss";
@import "gitlab_bootstrap/tables.scss";
@import "gitlab_bootstrap/lists.scss";
@import "gitlab_bootstrap/forms.scss";
......@@ -6,6 +6,10 @@
border: 1px solid #CCC;
margin-bottom: 1em;
table {
@extend .table;
}
.file-title {
border-bottom: 1px solid #bbb;
@include bg-dark-gray-gradient;
......
......@@ -95,6 +95,14 @@
font-size: 14px;
line-height: 1.5;
}
table {
@extend .table;
@extend .table-bordered;
th {
background: #EEE;
}
}
}
@mixin page-title {
......
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;
}
}
}
......@@ -13,13 +13,21 @@
}
.tree-table {
@extend .table;
@include border-radius(0);
.tree-item {
td {
tr {
td, th {
padding: 8px 10px;
strong {
font-weight: normal;
}
line-height: 20px;
}
th {
font-weight: normal;
font-size: 15px;
border-bottom: 1px solid #CCC;
}
td {
border-color: #F1F1F1;
}
&:hover {
td {
......@@ -29,12 +37,11 @@
}
cursor: pointer;
}
&.selected {
td {
background: $hover;
border-top: 1px solid #ADF;
border-bottom: 1px solid #ADF;
background: #f5f5f5;
border-top: 1px solid #EEE;
border-bottom: 1px solid #EEE;
}
}
}
......@@ -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 {
padding-right: 8px;
......@@ -125,4 +117,4 @@
.tree-ref-holder {
float: left;
margin-top: 5px;
}
\ No newline at end of file
}
......@@ -26,7 +26,7 @@
= link_to @commit.short_id, project_commit_path(@project, @commit)
–
= 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?
%tr.tree-item
......
%tr{ class: "tree-item #{tree_hex_class(tree_item)}" }
%td.tree-item-file-name
= tree_icon(type)
%strong= link_to truncate(tree_item.name, length: 40), project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name))
%span= 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
%span.log_loading.hide
Loading commit data...
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment