Skip to content

Commit

Permalink
7099db386b1f372bd2fc6db24739dcf34ec9f802 WIP: Improvements to dropdow…
Browse files Browse the repository at this point in the history
…n icon to allow any button to have one

Sync to source repo @7099db386b1f372bd2fc6db24739dcf34ec9f802
  • Loading branch information
dtbuild committed Oct 10, 2024
1 parent adcc751 commit 077588f
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
5 changes: 5 additions & 0 deletions css/buttons.bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ div.dt-buttons div.dt-button-collection .dropdown-menu {
div.dt-buttons div.dt-button-collection .dropdown-menu li {
position: relative;
}
div.dt-buttons div.dt-button-collection .dropdown-menu li span.caret {
position: absolute;
right: 9px;
top: 14px;
}
div.dt-buttons div.dt-button-collection .dropdown-menu div.dt-button-split {
display: flex;
flex-direction: row;
Expand Down
2 changes: 1 addition & 1 deletion css/buttons.bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion datatables.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
],
"src-repo": "http://github.com/DataTables/Buttons",
"last-tag": "3.1.2",
"last-sync": "70c236b07d2fb7c41887b178e59c10c3258fe9ab"
"last-sync": "7099db386b1f372bd2fc6db24739dcf34ec9f802"
}
10 changes: 4 additions & 6 deletions js/buttons.bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,11 @@ $.extend(true, DataTable.Buttons.defaults, {
},
button: {
className: 'btn btn-default',
active: 'active'
active: 'active',
dropHtml: '<span class="caret"></span>',
dropClass: ''
},
collection: {
action: {
dropHtml: '<span class="caret"></span>'
},
container: {
tag: 'div',
className: 'dt-button-collection',
Expand Down Expand Up @@ -97,9 +96,8 @@ $.extend(true, DataTable.Buttons.defaults, {
},
dropdown: {
tag: 'button',
dropHtml: '<span class="caret"></span>',
className:
'btn btn-default dt-button-split-drop dropdown-toggle dropdown-toggle-split',
'btn btn-default dt-button-split-drop dropdown-toggle-split',
closeButton: false,
align: 'split-left',
splitAlignClass: 'dt-button-split-left'
Expand Down
2 changes: 1 addition & 1 deletion js/buttons.bootstrap.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/buttons.bootstrap.min.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Bootstrap integration for DataTables' Buttons
* © SpryMedia Ltd - datatables.net/license
*/
import jQuery from"jquery";import DataTable from"datatables.net-bs";import Buttons from"datatables.net-buttons";let $=jQuery;$.extend(!0,DataTable.Buttons.defaults,{dom:{container:{className:"dt-buttons btn-group flex-wrap"},button:{className:"btn btn-default",active:"active"},collection:{action:{dropHtml:'<span class="caret"></span>'},container:{tag:"div",className:"dt-button-collection",content:{tag:"ul",className:"dropdown-menu"}},closeButton:!1,button:{tag:"li",className:"dt-button",active:"dt-button-active-a",disabled:"disabled",liner:{tag:"a"},spacer:{className:"divider",tag:"li"}}},split:{action:{tag:"a",className:"btn btn-default dt-button-split-drop-button",closeButton:!1},dropdown:{tag:"button",dropHtml:'<span class="caret"></span>',className:"btn btn-default dt-button-split-drop dropdown-toggle dropdown-toggle-split",closeButton:!1,align:"split-left",splitAlignClass:"dt-button-split-left"},wrapper:{tag:"div",className:"dt-button-split btn-group",closeButton:!1}}}});export default DataTable;
import jQuery from"jquery";import DataTable from"datatables.net-bs";import Buttons from"datatables.net-buttons";let $=jQuery;$.extend(!0,DataTable.Buttons.defaults,{dom:{container:{className:"dt-buttons btn-group flex-wrap"},button:{className:"btn btn-default",active:"active",dropHtml:'<span class="caret"></span>',dropClass:""},collection:{container:{tag:"div",className:"dt-button-collection",content:{tag:"ul",className:"dropdown-menu"}},closeButton:!1,button:{tag:"li",className:"dt-button",active:"dt-button-active-a",disabled:"disabled",liner:{tag:"a"},spacer:{className:"divider",tag:"li"}}},split:{action:{tag:"a",className:"btn btn-default dt-button-split-drop-button",closeButton:!1},dropdown:{tag:"button",className:"btn btn-default dt-button-split-drop dropdown-toggle-split",closeButton:!1,align:"split-left",splitAlignClass:"dt-button-split-left"},wrapper:{tag:"div",className:"dt-button-split btn-group",closeButton:!1}}}});export default DataTable;
10 changes: 4 additions & 6 deletions js/buttons.bootstrap.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ $.extend(true, DataTable.Buttons.defaults, {
},
button: {
className: 'btn btn-default',
active: 'active'
active: 'active',
dropHtml: '<span class="caret"></span>',
dropClass: ''
},
collection: {
action: {
dropHtml: '<span class="caret"></span>'
},
container: {
tag: 'div',
className: 'dt-button-collection',
Expand Down Expand Up @@ -54,9 +53,8 @@ $.extend(true, DataTable.Buttons.defaults, {
},
dropdown: {
tag: 'button',
dropHtml: '<span class="caret"></span>',
className:
'btn btn-default dt-button-split-drop dropdown-toggle dropdown-toggle-split',
'btn btn-default dt-button-split-drop dropdown-toggle-split',
closeButton: false,
align: 'split-left',
splitAlignClass: 'dt-button-split-left'
Expand Down

0 comments on commit 077588f

Please sign in to comment.