From 50d1abf4ca76ea6428a9e6c6918b0d2c3726aba2 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan@datatables.net>
Date: Wed, 5 Apr 2017 15:43:10 +0100
Subject: [PATCH] Merge branch 'master' of github.com:DataTables/DataTablesSrc

---
 .datatables-commit-sync               | 2 +-
 media/js/dataTables.bootstrap4.js     | 8 ++++----
 media/js/dataTables.bootstrap4.min.js | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.datatables-commit-sync b/.datatables-commit-sync
index 3a05690a..54c31926 100644
--- a/.datatables-commit-sync
+++ b/.datatables-commit-sync
@@ -1 +1 @@
-8aaae086602caaf61793d812ccef193d2a9d86d4
+36d1ea0c3a8b91b12af7471418b52dab37e80244
diff --git a/media/js/dataTables.bootstrap4.js b/media/js/dataTables.bootstrap4.js
index 41f1057c..935e0d73 100644
--- a/media/js/dataTables.bootstrap4.js
+++ b/media/js/dataTables.bootstrap4.js
@@ -56,9 +56,9 @@ $.extend( true, DataTable.defaults, {
 /* Default class modification */
 $.extend( DataTable.ext.classes, {
 	sWrapper:      "dataTables_wrapper container-fluid dt-bootstrap4",
-	sFilterInput:  "form-control input-sm",
-	sLengthSelect: "form-control input-sm",
-	sProcessing:   "dataTables_processing panel panel-default",
+	sFilterInput:  "form-control form-control-sm",
+	sLengthSelect: "form-control form-control-sm",
+	sProcessing:   "dataTables_processing card",
 	sPageButton:   "paginate_button page-item"
 } );
 
@@ -170,7 +170,7 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu
 	catch (e) {}
 
 	attach(
-		$(host).empty().html('<ul class="pagination"/>').children('ul'),
+		$(host).empty().html('<ul class="pagination pagination-sm"/>').children('ul'),
 		buttons
 	);
 
diff --git a/media/js/dataTables.bootstrap4.min.js b/media/js/dataTables.bootstrap4.min.js
index e7161e53..0db09613 100644
--- a/media/js/dataTables.bootstrap4.min.js
+++ b/media/js/dataTables.bootstrap4.min.js
@@ -6,6 +6,6 @@ var $jscomp={scope:{},findInternal:function(a,b,c){a instanceof String&&(a=Strin
 $jscomp.getGlobal=function(a){return"undefined"!=typeof window&&window===a?a:"undefined"!=typeof global&&null!=global?global:a};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(a,b,c,e){if(b){c=$jscomp.global;a=a.split(".");for(e=0;e<a.length-1;e++){var d=a[e];d in c||(c[d]={});c=c[d]}a=a[a.length-1];e=c[a];b=b(e);b!=e&&null!=b&&$jscomp.defineProperty(c,a,{configurable:!0,writable:!0,value:b})}};
 $jscomp.polyfill("Array.prototype.find",function(a){return a?a:function(a,c){return $jscomp.findInternal(this,a,c).v}},"es6-impl","es3");
 (function(a){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(b){return a(b,window,document)}):"object"===typeof exports?module.exports=function(b,c){b||(b=window);c&&c.fn.dataTable||(c=require("datatables.net")(b,c).$);return a(c,b,b.document)}:a(jQuery,window,document)})(function(a,b,c,e){var d=a.fn.dataTable;a.extend(!0,d.defaults,{dom:"<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
-renderer:"bootstrap"});a.extend(d.ext.classes,{sWrapper:"dataTables_wrapper container-fluid dt-bootstrap4",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default",sPageButton:"paginate_button page-item"});d.ext.renderer.pageButton.bootstrap=function(b,k,v,q,n,r){var m=new d.Api(b),w=b.oClasses,p=b.oLanguage.oPaginate,x=b.oLanguage.oAria.paginate||{},g,h,t=0,u=function(c,d){var e,k,l,f,q=function(b){b.preventDefault();a(b.currentTarget).hasClass("disabled")||
+renderer:"bootstrap"});a.extend(d.ext.classes,{sWrapper:"dataTables_wrapper container-fluid dt-bootstrap4",sFilterInput:"form-control form-control-sm",sLengthSelect:"form-control form-control-sm",sProcessing:"dataTables_processing card",sPageButton:"paginate_button page-item"});d.ext.renderer.pageButton.bootstrap=function(b,k,v,q,n,r){var m=new d.Api(b),w=b.oClasses,p=b.oLanguage.oPaginate,x=b.oLanguage.oAria.paginate||{},g,h,t=0,u=function(c,d){var e,k,l,f,q=function(b){b.preventDefault();a(b.currentTarget).hasClass("disabled")||
 m.page()==b.data.action||m.page(b.data.action).draw("page")};e=0;for(k=d.length;e<k;e++)if(f=d[e],a.isArray(f))u(c,f);else{h=g="";switch(f){case "ellipsis":g="&#x2026;";h="disabled";break;case "first":g=p.sFirst;h=f+(0<n?"":" disabled");break;case "previous":g=p.sPrevious;h=f+(0<n?"":" disabled");break;case "next":g=p.sNext;h=f+(n<r-1?"":" disabled");break;case "last":g=p.sLast;h=f+(n<r-1?"":" disabled");break;default:g=f+1,h=n===f?"active":""}g&&(l=a("<li>",{"class":w.sPageButton+" "+h,id:0===v&&
-"string"===typeof f?b.sTableId+"_"+f:null}).append(a("<a>",{href:"#","aria-controls":b.sTableId,"aria-label":x[f],"data-dt-idx":t,tabindex:b.iTabIndex,"class":"page-link"}).html(g)).appendTo(c),b.oApi._fnBindAction(l,{action:f},q),t++)}},l;try{l=a(k).find(c.activeElement).data("dt-idx")}catch(y){}u(a(k).empty().html('<ul class="pagination"/>').children("ul"),q);l!==e&&a(k).find("[data-dt-idx="+l+"]").focus()};return d});
+"string"===typeof f?b.sTableId+"_"+f:null}).append(a("<a>",{href:"#","aria-controls":b.sTableId,"aria-label":x[f],"data-dt-idx":t,tabindex:b.iTabIndex,"class":"page-link"}).html(g)).appendTo(c),b.oApi._fnBindAction(l,{action:f},q),t++)}},l;try{l=a(k).find(c.activeElement).data("dt-idx")}catch(y){}u(a(k).empty().html('<ul class="pagination pagination-sm"/>').children("ul"),q);l!==e&&a(k).find("[data-dt-idx="+l+"]").focus()};return d});