Skip to content

Commit 32109fa

Browse files
author
[email protected]
committed
0593e5b2c60fc79eb62dbc0a1923c0a12d075a1d
Sync to source repo @c70336269ac5698f374e9e00356b3f80e0876dad
1 parent 7cb97f1 commit 32109fa

4 files changed

+270
-5
lines changed

‎css/searchBuilder.dataTables.css

+263
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,263 @@
1+
div.dt-button-collection {
2+
overflow: visible !important;
3+
z-index: 2002 !important;
4+
}
5+
div.dt-button-collection div.dtsb-searchBuilder {
6+
padding-left: 1em !important;
7+
padding-right: 1em !important;
8+
}
9+
10+
div.dt-button-collection.dtb-collection-closeable div.dtsb-titleRow {
11+
padding-right: 40px;
12+
}
13+
14+
.dtsb-greyscale {
15+
border: 1px solid #cecece !important;
16+
}
17+
18+
div.dtsb-logicContainer .dtsb-greyscale {
19+
border: none !important;
20+
}
21+
22+
div.dtsb-searchBuilder {
23+
justify-content: space-evenly;
24+
cursor: default;
25+
margin-bottom: 1em;
26+
text-align: left;
27+
}
28+
div.dtsb-searchBuilder button.dtsb-button,
29+
div.dtsb-searchBuilder select {
30+
font-size: 1em;
31+
}
32+
div.dtsb-searchBuilder div.dtsb-titleRow {
33+
justify-content: space-evenly;
34+
margin-bottom: 0.5em;
35+
}
36+
div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title {
37+
display: inline-block;
38+
padding-top: 14px;
39+
}
40+
div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title:empty {
41+
display: inline;
42+
}
43+
div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll {
44+
float: right;
45+
margin-bottom: 0.8em;
46+
}
47+
div.dtsb-searchBuilder div.dtsb-vertical .dtsb-value, div.dtsb-searchBuilder div.dtsb-vertical .dtsb-data, div.dtsb-searchBuilder div.dtsb-vertical .dtsb-condition {
48+
display: block;
49+
}
50+
div.dtsb-searchBuilder div.dtsb-group {
51+
position: relative;
52+
clear: both;
53+
margin-bottom: 0.8em;
54+
}
55+
div.dtsb-searchBuilder div.dtsb-group button.dtsb-search {
56+
float: right;
57+
}
58+
div.dtsb-searchBuilder div.dtsb-group button.dtsb-clearGroup {
59+
margin: 2px;
60+
text-align: center;
61+
padding: 0;
62+
}
63+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer {
64+
-webkit-transform: rotate(90deg);
65+
-moz-transform: rotate(90deg);
66+
-o-transform: rotate(90deg);
67+
-ms-transform: rotate(90deg);
68+
transform: rotate(90deg);
69+
position: absolute;
70+
margin-top: 0.8em;
71+
margin-right: 0.8em;
72+
}
73+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria {
74+
margin-bottom: 0.8em;
75+
display: flex;
76+
justify-content: start;
77+
flex-flow: row wrap;
78+
}
79+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown,
80+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input {
81+
padding: 0.4em;
82+
margin-right: 0.8em;
83+
min-width: 5em;
84+
max-width: 20em;
85+
color: inherit;
86+
}
87+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown option.dtsb-notItalic,
88+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input option.dtsb-notItalic {
89+
font-style: normal;
90+
}
91+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-italic {
92+
font-style: italic;
93+
}
94+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont {
95+
flex: 1;
96+
white-space: nowrap;
97+
}
98+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont span.dtsp-joiner {
99+
margin-right: 0.8em;
100+
}
101+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont input.dtsb-value {
102+
width: 33%;
103+
}
104+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont select,
105+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont input {
106+
height: 100%;
107+
box-sizing: border-box;
108+
}
109+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer {
110+
margin-left: auto;
111+
display: inline-block;
112+
}
113+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-delete, div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-right, div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-left {
114+
margin-right: 0.8em;
115+
}
116+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-delete:last-child, div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-right:last-child, div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-left:last-child {
117+
margin-right: 0;
118+
}
119+
@media screen and (max-width: 550px) {
120+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria {
121+
display: flex;
122+
flex-flow: none;
123+
flex-direction: column;
124+
justify-content: start;
125+
padding-right: calc(35px + 0.8em);
126+
margin-bottom: 0px;
127+
}
128+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:first-child), div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:nth-child(2)), div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:last-child) {
129+
padding-top: 0.8em;
130+
}
131+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:first-child, div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:nth-child(2), div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:last-child {
132+
padding-top: 0em;
133+
}
134+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown,
135+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input {
136+
max-width: none;
137+
width: 100%;
138+
margin-bottom: 0.8em;
139+
margin-right: 0.8em;
140+
}
141+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont {
142+
margin-right: 0.8em;
143+
}
144+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer {
145+
position: absolute;
146+
width: 35px;
147+
display: flex;
148+
flex-wrap: wrap-reverse;
149+
right: 0;
150+
}
151+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button {
152+
margin-right: 0px !important;
153+
}
154+
}
155+
156+
div.dtsb-searchBuilder button,
157+
div.dtsb-searchBuilder select.dtsb-dropDown,
158+
div.dtsb-searchBuilder input {
159+
background-color: #f9f9f9;
160+
}
161+
div.dtsb-searchBuilder button.dtsb-button {
162+
position: relative;
163+
display: inline-block;
164+
box-sizing: border-box;
165+
padding: 0.5em 1em;
166+
border: 1px solid rgba(0, 0, 0, 0.3);
167+
border-radius: 2px;
168+
cursor: pointer;
169+
font-size: 0.88em;
170+
line-height: 1.6em;
171+
color: inherit;
172+
white-space: nowrap;
173+
overflow: hidden;
174+
background-color: rgba(0, 0, 0, 0.1); /* Fallback */
175+
background: linear-gradient(to bottom, rgba(230, 230, 230, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
176+
-webkit-user-select: none;
177+
-moz-user-select: none;
178+
-ms-user-select: none;
179+
user-select: none;
180+
text-decoration: none;
181+
outline: none;
182+
text-overflow: ellipsis;
183+
}
184+
div.dtsb-searchBuilder button.dtsb-button:hover {
185+
background-color: #cecece;
186+
cursor: pointer;
187+
}
188+
div.dtsb-searchBuilder div.dtsb-logicContainer {
189+
border: 1px solid rgba(0, 0, 0, 0.3);
190+
background-color: rgba(0, 0, 0, 0.1); /* Fallback */
191+
background: linear-gradient(to right, rgba(230, 230, 230, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
192+
}
193+
div.dtsb-searchBuilder div.dtsb-logicContainer button {
194+
border: 1px solid transparent;
195+
background: transparent;
196+
}
197+
div.dtsb-searchBuilder button.dtsb-clearGroup {
198+
min-width: 2em;
199+
padding: 0;
200+
}
201+
div.dtsb-searchBuilder button.dtsb-iptbtn {
202+
min-width: 100px;
203+
text-align: left;
204+
}
205+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer {
206+
border: 1px solid;
207+
border-color: #cecece;
208+
border-radius: 3px;
209+
display: flex;
210+
flex-direction: row;
211+
flex-wrap: wrap;
212+
justify-content: flex-start;
213+
align-content: flex-start;
214+
align-items: flex-start;
215+
}
216+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-logic {
217+
border: none;
218+
border-radius: 0px;
219+
flex-grow: 1;
220+
flex-shrink: 0;
221+
flex-basis: 3em;
222+
margin: 0px;
223+
}
224+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-clearGroup {
225+
border: none;
226+
border-radius: 0px;
227+
width: 2em;
228+
margin: 0px;
229+
}
230+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown,
231+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input {
232+
border: 1px solid;
233+
border-radius: 3px;
234+
}
235+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-condition {
236+
border-color: #48b13c;
237+
}
238+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-data {
239+
border-color: #e70f00;
240+
}
241+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-value, div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-value {
242+
border-color: #0069ba;
243+
}
244+
245+
html.dark div.dtsb-searchBuilder button.dtsb-button,
246+
html.dark div.dtsb-searchBuilder select.dtsb-dropDown,
247+
html.dark div.dtsb-searchBuilder input.dtsb-input {
248+
background-color: rgb(66, 69, 73) !important;
249+
color-scheme: dark;
250+
}
251+
html.dark div.dtsb-searchBuilder button.dtsb-button {
252+
border: 1px solid rgb(89, 91, 94);
253+
background: rgba(255, 255, 255, 0.15);
254+
}
255+
html.dark div.dtsb-searchBuilder button.dtsb-button:hover {
256+
background: rgba(179, 179, 179, 0.15);
257+
}
258+
html.dark div.dtsb-searchBuilder div.dtsb-logicContainer {
259+
border: 1px solid rgb(89, 91, 94);
260+
}
261+
html.dark div.dtsb-searchBuilder .dtsb-greyscale {
262+
border-color: rgba(255, 255, 255, 0.2) !important;
263+
}

‎css/searchBuilder.dataTables.min.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎datatables.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
],
1515
"src-repo": "http://github.com/DataTables/SearchBuilder",
1616
"last-tag": "1.6.0",
17-
"last-sync": "0593e5b2c60fc79eb62dbc0a1923c0a12d075a1d"
17+
"last-sync": "c70336269ac5698f374e9e00356b3f80e0876dad"
1818
}

‎types/searchBuilder.dataTables.d.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/*! DataTables integration for DataTables' SearchBuilder
2-
* © SpryMedia Ltd - datatables.net/license
3-
*/
4-
declare var DataTable: any;
1+
2+
import DataTable from 'datatables.net-searchbuilder';
3+
4+
export default DataTable;
5+
export * from 'datatables.net-searchbuilder';

0 commit comments

Comments
 (0)