Clean merge/commit.

This commit is contained in:
Brinken
2012-07-05 15:13:18 +02:00
parent 6e6da07f45
commit 1ed1c5ed63
78 changed files with 6639 additions and 37249 deletions
File diff suppressed because it is too large Load Diff
-143
View File
@@ -1,143 +0,0 @@
.dataTables_wrapper {
border-radius: 5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
width: 100%;
background-color: #313131;
min-height: 155px;
clear: both;
_height: 302px;
zoom: 1; /* Feeling sorry for IE */
}
.dataTables_processing {
position: absolute;
top: 50%;
left: 50%;
width: 20px;
height: 30px;
margin-left: -125px;
margin-top: -15px;
padding: 14px 0 2px 0;
border: 1px solid #ddd;
text-align: center;
color: #999;
font-size: 14px;
background-color: #343434;
}
.dataTables_length {
/*
* Look in styles.css
* */
}
.dataTables_filter {
/*
* Look in style.css
* */
}
.dataTables_info {
/*
* Look in style.css
* */
}
.dataTables_paginate {
width: 44px;
* width: 50px;
float: right;
text-align: right;
margin-top: 15px;
}
/* Pagination nested */
.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
height: 19px;
width: 19px;
margin-left: 3px;
float: left;
}
.paginate_disabled_previous {
background-image: url('../images/back_disabled.jpg');
}
.paginate_enabled_previous {
background-image: url('../images/back_enabled.jpg');
}
.paginate_disabled_next {
background-image: url('../images/forward_disabled.jpg');
}
.paginate_enabled_next {
background-image: url('../images/forward_enabled.jpg');
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* DataTables display
*/
table.display {
margin: auto;
width: 100%;
clear: both;
/* Note Firefox 3.5 and before have a bug with border-collapse
* ( https://bugzilla.mozilla.org/show%5Fbug.cgi?id=155955 )
* border-spacing: 0; is one possible option. Conditional-css.com is
* useful for this kind of thing
*
* Further note IE 6/7 has problems when calculating widths with border width.
* It subtracts one px relative to the other browsers from the first column, and
* adds one to the end...
*
* If you want that effect I'd suggest setting a border-top/left on th/td's and
* then filling in the gaps with other borders.
*/
}
table.display thead th {
/*Moved*/
}
table.display tfoot th {
/*Moved*/
}
table.display tr.heading2 td {
border-bottom: 1px solid #aaa;
}
table.display td {
/* Moved */
}
table.display td.center {
text-align: center;
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* DataTables sorting
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* DataTables row classes
*/
/*Downloaded*/
/*Moved*/
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Misc
*/
@@ -21,9 +21,18 @@
position: absolute;
top: 0;
right: 0;
width: 10px;
width: 14px;
height: 100%;
background: red;
border-left: 1px solid rgba(255,255,255,0.1);
padding: 1px;
background: rgb(55,65,76); /* Old browsers */
background: -moz-linear-gradient(left, rgba(55,65,76,1) 0%, rgba(45,53,63,1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, right top, color-stop(0%,rgba(55,65,76,1)), color-stop(100%,rgba(45,53,63,1))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(left, rgba(55,65,76,1) 0%,rgba(45,53,63,1) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(left, rgba(55,65,76,1) 0%,rgba(45,53,63,1) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(left, rgba(55,65,76,1) 0%,rgba(45,53,63,1) 100%); /* IE10+ */
background: linear-gradient(left, rgba(55,65,76,1) 0%,rgba(45,53,63,1) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#37414c', endColorstr='#2d353f',GradientType=1 ); /* IE6-9 */
}
.jspHorizontalBar
@@ -33,7 +42,6 @@
left: 0;
width: 100%;
height: 10px;
background: red;
}
.jspVerticalBar *,
@@ -41,6 +49,7 @@
{
margin: 0;
padding: 0;
}
.jspCap
@@ -55,23 +64,38 @@
.jspTrack
{
background: rgb(10,10,10);
position: relative;
border-radius: 1em;
background: rgb(13,15,17); /* Old browsers */
background: -moz-linear-gradient(left, rgba(13,15,17,1) 0%, rgba(23,28,33,1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, right top, color-stop(0%,rgba(13,15,17,1)), color-stop(100%,rgba(23,28,33,1))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(left, rgba(13,15,17,1) 0%,rgba(23,28,33,1) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(left, rgba(13,15,17,1) 0%,rgba(23,28,33,1) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(left, rgba(13,15,17,1) 0%,rgba(23,28,33,1) 100%); /* IE10+ */
background: linear-gradient(left, rgba(13,15,17,1) 0%,rgba(23,28,33,1) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0d0f11', endColorstr='#171c21',GradientType=1 ); /* IE6-9 */
}
.jspDrag
{
background: rgb(90,0,10);
position: relative;
top: 0;
left: 0;
cursor: pointer;
border-radius: 20px;
border-left: 1px solid rgba(255,255,255,0.1);
border-radius: 1em;
background: rgb(112,135,158); /* Old browsers */
background: -moz-linear-gradient(left, rgba(112,135,158,1) 0%, rgba(76,90,107,1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, right top, color-stop(0%,rgba(112,135,158,1)), color-stop(100%,rgba(76,90,107,1))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(left, rgba(112,135,158,1) 0%,rgba(76,90,107,1) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(left, rgba(112,135,158,1) 0%,rgba(76,90,107,1) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(left, rgba(112,135,158,1) 0%,rgba(76,90,107,1) 100%); /* IE10+ */
background: linear-gradient(left, rgba(112,135,158,1) 0%,rgba(76,90,107,1) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#70879e', endColorstr='#4c5a6b',GradientType=1 ); /* IE6-9 */
}
.jspDrag:active,
.jspDrag:hover
{
background: rgb(160,0,10);
}
.jspHorizontalBar .jspTrack,
@@ -83,36 +107,35 @@
.jspArrow
{
background: #50506d;
text-indent: -20000px;
display: block;
cursor: pointer;
font-family: 'WebSymbolsRegular';
font-size: 0.1em;
}
.jspArrow.jspDisabled
{
cursor: default;
background: #80808d;
}
.jspVerticalBar .jspArrow .jspArrowUp {
background: url(../images/arrow-up.png) no-repeat 50% 50%;
.jspVerticalBar .jspArrow .jspArrowUp:after {
content: ':';
}
.jspVerticalBar .jspArrow .jspArrowDown {
background: url(../images/arrow-down.png) no-repeat 50% 50%;
.jspVerticalBar .jspArrow .jspArrowDown:after {
content: ';';
}
.jspVerticalBar .jspArrow
{
height: 10px;
height: 16px;
width: 100%;
}
.jspHorizontalBar .jspArrow
{
width: 10px;
width: 16px;
float: left;
height: 100%;
background-image: url(../images/arrow-up.png);
}
.jspVerticalBar .jspArrow:focus
File diff suppressed because it is too large Load Diff