Skip to content

Commit

Permalink
Updating datatables to 1.10.4 and new DataTables bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
@challgren
challgren committed Dec 25, 2014
1 parent 7cdb888 commit 5cbc0b6
Show file tree
Hide file tree
Showing 15 changed files with 15,083 additions and 14,236 deletions.
176 changes: 128 additions & 48 deletions css/plugins/dataTables.bootstrap.css
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,63 @@
div.dataTables_length label {
float: left;
text-align: left;
font-weight: normal;
text-align: left;
white-space: nowrap;
}

div.dataTables_length select {
width: 75px;
display: inline-block;
}

div.dataTables_filter {
text-align: right;
}

div.dataTables_filter label {
float: right;
font-weight: normal;
white-space: nowrap;
text-align: left;
}

div.dataTables_filter input {
width: 16em;
margin-left: 0.5em;
display: inline-block;
}

div.dataTables_info {
padding-top: 8px;
white-space: nowrap;
}

div.dataTables_paginate {
float: right;
margin: 0;
white-space: nowrap;
text-align: right;
}

div.dataTables_paginate ul.pagination {
margin: 2px 0;
white-space: nowrap;
}

table.dataTable,
@media screen and (max-width: 767px) {
div.dataTables_length,
div.dataTables_filter,
div.dataTables_info,
div.dataTables_paginate {
text-align: center;
}
}


table.dataTable td,
table.dataTable th {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}


table.dataTable {
clear: both;
margin-top: 6px !important;
Expand All @@ -54,32 +73,23 @@ table.dataTable thead .sorting_desc_disabled {
cursor: pointer;
}

table.dataTable thead .sorting {
background: url('../images/sort_both.png') no-repeat center right;
}

table.dataTable thead .sorting_asc {
background: url('../images/sort_asc.png') no-repeat center right;
}

table.dataTable thead .sorting_desc {
background: url('../images/sort_desc.png') no-repeat center right;
}
table.dataTable thead .sorting { background: url('../images/sort_both.png') no-repeat center right; }
table.dataTable thead .sorting_asc { background: url('../images/sort_asc.png') no-repeat center right; }
table.dataTable thead .sorting_desc { background: url('../images/sort_desc.png') no-repeat center right; }

table.dataTable thead .sorting_asc_disabled {
background: url('../images/sort_asc_disabled.png') no-repeat center right;
}
table.dataTable thead .sorting_asc_disabled { background: url('../images/sort_asc_disabled.png') no-repeat center right; }
table.dataTable thead .sorting_desc_disabled { background: url('../images/sort_desc_disabled.png') no-repeat center right; }

table.dataTable thead .sorting_desc_disabled {
background: url('../images/sort_desc_disabled.png') no-repeat center right;
table.dataTable thead > tr > th {
padding-left: 18px;
padding-right: 18px;
}

table.dataTable th:active {
outline: none;
}

/* Scrolling */

div.dataTables_scrollHead table {
margin-bottom: 0 !important;
border-bottom-left-radius: 0;
Expand All @@ -93,9 +103,9 @@ div.dataTables_scrollHead table thead tr:last-child td:first-child {
}

div.dataTables_scrollBody table {
border-top: none;
margin-top: 0 !important;
margin-bottom: 0 !important;
border-top: none;
}

div.dataTables_scrollBody tbody tr:first-child th,
Expand All @@ -108,45 +118,68 @@ div.dataTables_scrollFoot table {
border-top: none;
}

/* Frustratingly the border-collapse:collapse used by Bootstrap makes the column
width calculations when using scrolling impossible to align columns. We have
to use separate
*/
table.table-bordered.dataTable {
border-collapse: separate !important;
}
table.table-bordered thead th,
table.table-bordered thead td {
border-left-width: 0;
border-top-width: 0;
}
table.table-bordered tbody th,
table.table-bordered tbody td {
border-left-width: 0;
border-bottom-width: 0;
}
table.table-bordered th:last-child,
table.table-bordered td:last-child {
border-right-width: 0;
}
div.dataTables_scrollHead table.table-bordered {
border-bottom-width: 0;
}




/*
* TableTools styles
*/

.table tbody tr.active td,
.table tbody tr.active th {
color: white;
.table.dataTable tbody tr.active td,
.table.dataTable tbody tr.active th {
background-color: #08C;
color: white;
}

.table tbody tr.active:hover td,
.table tbody tr.active:hover th {
.table.dataTable tbody tr.active:hover td,
.table.dataTable tbody tr.active:hover th {
background-color: #0075b0 !important;
}

.table tbody tr.active a {
.table.dataTable tbody tr.active th > a,
.table.dataTable tbody tr.active td > a {
color: white;
}

.table-striped tbody tr.active:nth-child(odd) td,
.table-striped tbody tr.active:nth-child(odd) th {
.table-striped.dataTable tbody tr.active:nth-child(odd) td,
.table-striped.dataTable tbody tr.active:nth-child(odd) th {
background-color: #017ebc;
}

table.DTTT_selectable tbody tr {
cursor: pointer;
}

div.DTTT .btn {
font-size: 12px;
color: #333 !important;
}

div.DTTT .btn:hover {
text-decoration: none !important;
}

ul.DTTT_dropdown.dropdown-menu {
z-index: 2003;
z-index: 2003;
}

ul.DTTT_dropdown.dropdown-menu a {
Expand All @@ -158,48 +191,86 @@ ul.DTTT_dropdown.dropdown-menu li {
}

ul.DTTT_dropdown.dropdown-menu li:hover a {
color: white !important;
background-color: #0088cc;
color: white !important;
}

div.DTTT_collection_background {
z-index: 2002;
}

/* TableTools information display */

div.DTTT_print_info.modal {
div.DTTT_print_info {
position: fixed;
top: 50%;
left: 50%;
width: 400px;
height: 150px;
margin-left: -200px;
margin-top: -75px;
text-align: center;
color: #333;
padding: 10px 30px;
opacity: 0.95;

background-color: white;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 6px;

-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
}

div.DTTT_print_info h6 {
margin: 1em;
font-size: 28px;
font-weight: normal;
font-size: 28px;
line-height: 28px;
margin: 1em;
}

div.DTTT_print_info p {
font-size: 14px;
line-height: 20px;
}

div.dataTables_processing {
position: absolute;
top: 50%;
left: 50%;
width: 100%;
height: 60px;
margin-left: -50%;
margin-top: -25px;
padding-top: 20px;
padding-bottom: 20px;
text-align: center;
font-size: 1.2em;
background-color: white;
background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));
background: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
background: -ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
background: -o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
}



/*
* FixedColumns styles
*/

div.DTFC_LeftHeadWrapper table,
div.DTFC_LeftFootWrapper table,
div.DTFC_RightHeadWrapper table,
div.DTFC_RightFootWrapper table,
table.DTFC_Cloned tr.even {
background-color: white;
margin-bottom: 0;
}

div.DTFC_RightHeadWrapper table,
div.DTFC_RightHeadWrapper table ,
div.DTFC_LeftHeadWrapper table {
border-bottom: none !important;
margin-bottom: 0 !important;
border-top-right-radius: 0 !important;
border-bottom-left-radius: 0 !important;
Expand All @@ -216,8 +287,8 @@ div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child {

div.DTFC_RightBodyWrapper table,
div.DTFC_LeftBodyWrapper table {
margin-bottom: 0 !important;
border-top: none;
margin: 0 !important;
}

div.DTFC_RightBodyWrapper tbody tr:first-child th,
Expand All @@ -230,4 +301,13 @@ div.DTFC_LeftBodyWrapper tbody tr:first-child td {
div.DTFC_RightFootWrapper table,
div.DTFC_LeftFootWrapper table {
border-top: none;
}
margin-top: 0 !important;
}


/*
* FixedHeader styles
*/
div.FixedHeader_Cloned table {
margin: 0 !important
}
Binary file added images/Sorting icons.psd
View file
Binary file not shown.
Binary file added images/back_disabled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/back_enabled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/back_enabled_hover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/forward_disabled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/forward_enabled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/forward_enabled_hover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sort_asc.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sort_asc_disabled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sort_both.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sort_desc.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sort_desc_disabled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5cbc0b6

Please sign in to comment.