[Kimchi-devel] [PATCH] [Wok 2/3] Fixed minor issue with sortable icons on Datatables.net CSS and with default DOM in JS

sguimaraes943 at gmail.com sguimaraes943 at gmail.com
Wed Aug 24 22:03:58 UTC 2016


From: Samuel Guimarães <sguimaraes943 at gmail.com>

Signed-off-by: Samuel Guimarães <sguimaraes943 at gmail.com>
---
 ui/css/datatables.bootstrap.css      | 9 +++++++++
 ui/css/src/datatables.bootstrap.scss | 8 ++++++++
 ui/js/src/wok.datatables.js          | 2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ui/css/datatables.bootstrap.css b/ui/css/datatables.bootstrap.css
index e039ce8..6d4e19d 100644
--- a/ui/css/datatables.bootstrap.css
+++ b/ui/css/datatables.bootstrap.css
@@ -79,6 +79,10 @@ div.dataTables_wrapper div.dataTables_filter .form-control {
   height: 34px;
 }
 
+div.dataTables_wrapper div.datatable-footer {
+  margin: 15px 0;
+}
+
 div.dataTables_wrapper div.dataTables_info {
   padding-top: 8px;
   white-space: nowrap;
@@ -183,6 +187,10 @@ table.dataTable tfoot {
   display: none;
 }
 
+table.dataTable tbody td.tabular-data {
+  font-feature-settings: "tnum";
+}
+
 div.dataTables_scrollHead table.dataTable {
   margin-bottom: 0 !important;
 }
@@ -193,6 +201,7 @@ div.dataTables_scrollBody table {
   margin-bottom: 0 !important;
 }
 
+div.dataTables_scrollBody table thead .sorting:before,
 div.dataTables_scrollBody table thead .sorting:after,
 div.dataTables_scrollBody table thead .sorting_asc:after,
 div.dataTables_scrollBody table thead .sorting_desc:after {
diff --git a/ui/css/src/datatables.bootstrap.scss b/ui/css/src/datatables.bootstrap.scss
index 854fbe0..7f0c841 100644
--- a/ui/css/src/datatables.bootstrap.scss
+++ b/ui/css/src/datatables.bootstrap.scss
@@ -105,6 +105,10 @@ div.dataTables_wrapper {
         }
     }
 
+    div.datatable-footer {
+        margin: 15px 0;
+    }
+
     div.dataTables_info {
         padding-top: 8px;
         white-space: nowrap;
@@ -204,6 +208,9 @@ table.dataTable tfoot {
     display: none; // Wok doesn't have tfoot on tables
 }
 
+table.dataTable tbody td.tabular-data {
+    font-feature-settings: "tnum";
+}
 
 // Scrolling
 div.dataTables_scrollHead table.dataTable {
@@ -217,6 +224,7 @@ div.dataTables_scrollBody {
         margin-bottom: 0 !important;
 
         thead { // Hide sort icons
+            .sorting:before,
             .sorting:after,
             .sorting_asc:after,
             .sorting_desc:after {
diff --git a/ui/js/src/wok.datatables.js b/ui/js/src/wok.datatables.js
index 19eda57..663868d 100644
--- a/ui/js/src/wok.datatables.js
+++ b/ui/js/src/wok.datatables.js
@@ -35,7 +35,7 @@ wok.initCompleteDataTableCallback = function(e) {
 
 $.extend( true, $.fn.dataTable.defaults, {
     "sPaginationType": "full_numbers",
-    "dom": '<"row"<"col-sm-12 filter"<"pull-right"l><"pull-right"f>>><"row"<"col-sm-12"t>><"row"<"col-sm-6 pages"p><"col-sm-6 info"i>>',
+    "dom": '<"row"<"col-sm-12 filter"<"pull-right"l><"pull-right"f>>><"row"<"col-sm-12"t>><"row datatable-footer"<"col-sm-6 pages"p><"col-sm-6 info"i>>',
     "initComplete": function(settings, json) {
         wok.initCompleteDataTableCallback(settings);
     }
-- 
2.5.5




More information about the Kimchi-devel mailing list