From: Thierry Parmentelat Date: Wed, 27 Mar 2013 10:58:23 +0000 (+0100) Subject: restored the third-party area to the original dataTables.bootstrap.css and pack all... X-Git-Tag: myslice-django-0.1-3~24 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=bbc1d74500702158a62461fd3a20645c06728a83 restored the third-party area to the original dataTables.bootstrap.css and pack all the customization for datatables/hazelnut in the plugins/hazelnut area, including custom header stuff from plekit --- diff --git a/plugins/hazelnut/hazelnut.css b/plugins/hazelnut/hazelnut.css index 5b21e904..2439bd15 100644 --- a/plugins/hazelnut/hazelnut.css +++ b/plugins/hazelnut/hazelnut.css @@ -2,3 +2,42 @@ div.spacer { height:20px; clear: both; } + +div.Hazelnut table.dataTable th { + font: bold 10px/22px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; + color: #4f6b72; + border-right: 1px solid #C1DAD7; + border-bottom: 1px solid #C1DAD7; + border-top: 1px solid #C1DAD7; + letter-spacing: 1px; + text-transform: uppercase; + text-align: left; + padding: 8px 12px 4px 20px; + vertical-align:middle; + background: #CAE8EA url(../img/tablesort-header.jpg) no-repeat; +} + +div.Hazelnut table.dataTable td, div.Hazelnut table.dataTable textarea, div.Hazelnut table.dataTable input [type="text"] { + font: normal 11px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; + border-right: 1px solid #C1DAD7; + border-bottom: 1px solid #C1DAD7; +} +div.Hazelnut table.dataTable td { + padding: 4px 8px 4px 8px; + /* this applies on even rows only, odd ones have a setting in bootstrap of rbg 249.249.249 */ + background-color: #f0fff0; +} +div.Hazelnut table.dataTable td a { + font-weight:normal; +} +/* these come from bootstrap */ +div.Hazelnut div.dataTables_info { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +div.Hazelnut table.dataTable thead .sorting { background: url('../img/tablesort-header-sortable.png') no-repeat; } +div.Hazelnut table.dataTable thead .sorting_asc { background: url('../img/tablesort-header-up.png') no-repeat; } +div.Hazelnut table.dataTable thead .sorting_desc { background: url('../img/tablesort-header-down.png') no-repeat; } +/* former set did not have that exact equivalent - using an approximation for now */ +div.Hazelnut table.dataTable thead .sorting_asc_disabled { background: url('../img/tablesort-header-sortable.png') no-repeat; } +div.Hazelnut table.dataTable thead .sorting_desc_disabled { background: url('../img/tablesort-header-sortable.png') no-repeat; } diff --git a/plugins/hazelnut/img/README b/plugins/hazelnut/img/README new file mode 100644 index 00000000..5df2d69b --- /dev/null +++ b/plugins/hazelnut/img/README @@ -0,0 +1,2 @@ +these styling elements come from plekit with a simple transition to png +they're currently not all used in myslice diff --git a/plugins/hazelnut/img/tablesort-bullet1.png b/plugins/hazelnut/img/tablesort-bullet1.png new file mode 100644 index 00000000..4304f360 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-bullet1.png differ diff --git a/plugins/hazelnut/img/tablesort-bullet2.png b/plugins/hazelnut/img/tablesort-bullet2.png new file mode 100644 index 00000000..4f181e19 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-bullet2.png differ diff --git a/plugins/hazelnut/img/tablesort-col-alt.png b/plugins/hazelnut/img/tablesort-col-alt.png new file mode 100644 index 00000000..8179f830 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-col-alt.png differ diff --git a/plugins/hazelnut/img/tablesort-gradient.png b/plugins/hazelnut/img/tablesort-gradient.png new file mode 100644 index 00000000..26558a49 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-gradient.png differ diff --git a/plugins/hazelnut/img/tablesort-header-down.png b/plugins/hazelnut/img/tablesort-header-down.png new file mode 100644 index 00000000..c8ed6576 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-header-down.png differ diff --git a/plugins/hazelnut/img/tablesort-header-sortable.png b/plugins/hazelnut/img/tablesort-header-sortable.png new file mode 100644 index 00000000..0c169040 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-header-sortable.png differ diff --git a/plugins/hazelnut/img/tablesort-header-up.png b/plugins/hazelnut/img/tablesort-header-up.png new file mode 100644 index 00000000..d12fe2a5 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-header-up.png differ diff --git a/plugins/hazelnut/img/tablesort-header.png b/plugins/hazelnut/img/tablesort-header.png new file mode 100644 index 00000000..cff526f9 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-header.png differ diff --git a/plugins/hazelnut/img/tablesort-td-alt.png b/plugins/hazelnut/img/tablesort-td-alt.png new file mode 100644 index 00000000..ef5ab358 Binary files /dev/null and b/plugins/hazelnut/img/tablesort-td-alt.png differ diff --git a/plugins/hazelnut/img/toggle-hidden.png b/plugins/hazelnut/img/toggle-hidden.png new file mode 100755 index 00000000..023f22a8 Binary files /dev/null and b/plugins/hazelnut/img/toggle-hidden.png differ diff --git a/plugins/hazelnut/img/toggle-visible.png b/plugins/hazelnut/img/toggle-visible.png new file mode 100755 index 00000000..baf6c286 Binary files /dev/null and b/plugins/hazelnut/img/toggle-visible.png differ diff --git a/third-party/datatables/css/README b/third-party/datatables/css/README index c979ef91..1349295f 100644 --- a/third-party/datatables/css/README +++ b/third-party/datatables/css/README @@ -1,2 +1,2 @@ -manually replaced images/ with ../img/ in this css after downloading -remember url() gives a location relative to where the css file lies +we use different background images than the ones provided byt this package +this gets customized in hazelnut.css diff --git a/third-party/datatables/css/dataTables.bootstrap.css b/third-party/datatables/css/dataTables.bootstrap.css index 63fa1eb0..fc3dfbd7 100644 --- a/third-party/datatables/css/dataTables.bootstrap.css +++ b/third-party/datatables/css/dataTables.bootstrap.css @@ -36,12 +36,12 @@ table.table thead .sorting_desc_disabled { *cursor: hand; } -table.table thead .sorting { background: url('../img/sort_both.png') no-repeat center right; } -table.table thead .sorting_asc { background: url('../img/sort_asc.png') no-repeat center right; } -table.table thead .sorting_desc { background: url('../img/sort_desc.png') no-repeat center right; } +table.table thead .sorting { background: url('images/sort_both.png') no-repeat center right; } +table.table thead .sorting_asc { background: url('images/sort_asc.png') no-repeat center right; } +table.table thead .sorting_desc { background: url('images/sort_desc.png') no-repeat center right; } -table.table thead .sorting_asc_disabled { background: url('../img/sort_asc_disabled.png') no-repeat center right; } -table.table thead .sorting_desc_disabled { background: url('../img/sort_desc_disabled.png') no-repeat center right; } +table.table thead .sorting_asc_disabled { background: url('images/sort_asc_disabled.png') no-repeat center right; } +table.table thead .sorting_desc_disabled { background: url('images/sort_desc_disabled.png') no-repeat center right; } table.dataTable th:active { outline: none;