Skip to content

Commit 94b5b24

Browse files
AngelFQCAngelFQC
committed
Minor - Grunt files
1 parent 635ba50 commit 94b5b24

23 files changed

+60
-120
lines changed

‎css/ui.jqgrid.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@
412412
margin: 1px 0 0 0;
413413
}
414414

415-
/* Grig body */
415+
/* Grig body */
416416
.ui-jqgrid .ui-jqgrid-bdiv {
417417
min-height: 1px;
418418
position: relative;
@@ -1178,7 +1178,7 @@ a.clearsearchclass {
11781178
.ui-menu-jqueryui .ui-jqgrid-menu-item .g-menu-item:hover {
11791179
font-weight: normal;
11801180
}
1181-
1181+
11821182
.ui-search-oper {
11831183
padding: 0;
11841184
}

‎css/ui.jqgrid.min.css

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

‎css/ui.jqgrid.min.css.map

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

‎dist/css/ui.jqgrid.bootstrap4.css

+13-82
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
.ui-jqgrid .ui-jqgrid-titlebar,
3838
.ui-jqgrid .ui-jqgrid-errorbar,
3939
.ui-jqdialog .ui-jqdialog-titlebar {
40-
padding: .3em .3em .3em .3em;
41-
position: relative;
42-
font-size: 12px;
43-
border-left: 0 none;
44-
border-right: 0 none;
45-
border-top: 0 none;
4640
}
4741
.ui-jqgrid-errorbar {
4842
max-height: 100px;
@@ -60,28 +54,6 @@
6054
/* Close/Hide button */
6155
.ui-jqgrid-titlebar > .ui-jqgrid-titlebar-close,
6256
.ui-jqdialog-titlebar > .ui-jqdialog-titlebar-close {
63-
vertical-align: middle;
64-
text-align: center;
65-
text-decoration: none;
66-
position: absolute;
67-
top: 50%;
68-
width: 1.4em;
69-
line-height: 1.5em;
70-
font-size: 12px;
71-
margin: -0.7em 0 0 0;
72-
padding: .2em;
73-
border: 1px solid transparent;
74-
height: 1.4em;
75-
cursor: pointer;
76-
-webkit-box-sizing: border-box;
77-
-moz-box-sizing: border-box;
78-
box-sizing: border-box;
79-
-ms-touch-action: manipulation;
80-
touch-action: manipulation;
81-
-webkit-user-select: none;
82-
-moz-user-select: none;
83-
-ms-user-select: none;
84-
user-select: none;
8557
}
8658

8759
.ui-jqgrid-jquery-ui .ui-jqdialog-titlebar > .ui-jqdialog-titlebar-close {
@@ -94,15 +66,12 @@
9466
left: .1em;
9567
}
9668
.ui-jqdialog .ui-jqdialog-titlebar-ltr .ui-jqdialog-titlebar-close {
97-
right: .3em;
9869
}
9970
.ui-jqdialog .ui-jqdialog-titlebar-rtl .ui-jqdialog-titlebar-close {
10071
left: .3em;
10172
}
10273
.ui-jqgrid-titlebar > .ui-jqgrid-titlebar-close,
10374
.ui-jqdialog-titlebar > .ui-jqdialog-titlebar-close {
104-
-ms-border-radius: .5em;
105-
border-radius: .5em;
10675
}
10776

10877
.ui-jqgrid .ui-jqgrid-caption .ui-jqgrid-title,
@@ -159,7 +128,7 @@
159128
.ui-jqdialog-titlebar-close > .svg-inline--fa {
160129
display: block;
161130
margin-left: .0625em;
162-
margin-top: -.0625em;
131+
margin-top: -.0625em;
163132
}
164133
.ui-jqgrid .ui-jqgrid-titlebar > .ui-jqgrid-titlebar-close > span.glyphicon {
165134
margin-left: -2px;
@@ -179,18 +148,16 @@
179148
}*/
180149
.ui-jqdialog .ui-resizable-handle > .ui-icon {
181150
right: -1px;
182-
bottom: -1px;
151+
bottom: -1px;
183152
}
184153
.ui-jqdialog .ui-resizable-handle > .fa {
185-
font-size: 12px;
186-
right: -2px;
187-
position: relative;
154+
font-size: 12px;
155+
right: -2px;
156+
position: relative;
188157
}
189158
.ui-jqdialog .ui-resizable-handle > .svg-inline--fa {
190159
font-size: 12px;
191-
right: -1px;
192-
/*right: -2px;
193-
bottom: -1px;*/
160+
right: -1px;
194161
position: relative;
195162
}
196163
.ui-jqdialog .ui-resizable-handle > .glyphicon {
@@ -361,7 +328,7 @@
361328
top: -16px;
362329
}
363330
.ui-jqgrid .s-ico > .ui-icon-triangle-1-s {
364-
background-position: -65px -16px;
331+
background-position: -65px -16px;
365332
}
366333
.ui-jqgrid .s-ico > .ui-icon.ui-sort-ltr {
367334
margin-left: -3px;
@@ -398,7 +365,7 @@
398365
margin: 1px 0 0 0;
399366
}
400367

401-
/* Grig body */
368+
/* Grig body */
402369
.ui-jqgrid .ui-jqgrid-bdiv {
403370
min-height: 1px;
404371
position: relative;
@@ -693,11 +660,8 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
693660
.ui-jqgrid td input,
694661
.ui-jqgrid td select,
695662
.ui-jqgrid td textarea {
696-
margin: 0;
697663
}
698664
.ui-jqgrid td textarea {
699-
width: auto;
700-
height: auto;
701665
}
702666
.ui-jqgrid > .ui-jqgrid-view > .ui-jqgrid-toppager {
703667
border-left: 0 none;
@@ -751,7 +715,7 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
751715
box-sizing: content-box;
752716
}
753717
.subgrid-data > .tablediv > .ui-jqgrid > .ui-jqgrid-view {
754-
-moz-box-sizing: border-box;
718+
-moz-box-sizing: border-box;
755719
-webkit-box-sizing: border-box;
756720
box-sizing: border-box;
757721
}
@@ -828,13 +792,11 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
828792

829793
/* Modal Window */
830794
.ui-jqgrid .ui-jqdialog {
831-
font-size: 11px;
832795
}
833796
.ui-jqdialog {
834797
display: none;
835798
width: 300px;
836799
position: absolute;
837-
font-size: 11px;
838800
overflow: visible;
839801
}
840802
.ui-jqdialog.ui-jqgrid-jquery-ui {
@@ -877,8 +839,6 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
877839
margin: 0;
878840
}
879841
.ui-jqdialog-content .EditTable {
880-
width: 100%;
881-
margin-bottom: 0;
882842
}
883843
.ui-jqdialog-content .DelTable {
884844
width: 100%;
@@ -894,16 +854,11 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
894854
height: auto;
895855
}
896856
.ui-jqdialog-content td.EditButton {
897-
border-top: 0 none;
898-
border-left: 0 none;
899-
border-right: 0 none;
900-
padding: 5px 0;
857+
padding-left: .25rem;
901858
}
902859
.ui-jqdialog-content td.EditButton-ltr {
903-
text-align: right;
904860
}
905861
.ui-jqdialog-content td.EditButton-rtl {
906-
text-align: left;
907862
}
908863
.ui-jqdialog-content td.navButton {
909864
text-align: left;
@@ -967,21 +922,12 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
967922
width: auto;
968923
}
969924
.ui-jqdialog .fm-button {
970-
display: inline-block;
971-
padding: .4em .5em;
972-
text-decoration: none;
973-
cursor: pointer;
974-
position: relative;
975-
text-align: center;
976-
zoom: 1;
977925
}
978926
.ui-jqdialog.ui-jqgrid-bootstrap .navButton .fm-button {
979927
padding: .375em .75em;
980928
margin-left: .125em;
981929
}
982930
.ui-jqdialog .fm-button > span {
983-
display: inline-block;
984-
vertical-align: middle;
985931
}
986932
.ui-jqdialog .fm-button .fm-button-text {
987933
padding: 0 .2em;
@@ -1110,7 +1056,7 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
11101056
width: 100%;
11111057
}
11121058
.table-hover .ui-search-table tbody tr:hover {
1113-
background-color: inherit;
1059+
background-color: inherit;
11141060
}
11151061
.ui-jqgrid .ui-jqgrid-htable .ui-search-toolbar th {
11161062
padding: 0 .1em;
@@ -1140,7 +1086,7 @@ a.clearsearchclass {
11401086
.ui-menu-jqueryui .ui-jqgrid-menu-item .g-menu-item:hover {
11411087
font-weight: normal;
11421088
}
1143-
1089+
11441090
.ui-search-oper {
11451091
padding: 0;
11461092
}
@@ -1301,7 +1247,6 @@ a.clearsearchclass {
13011247
.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-titlebar .ui-jqgrid-title,
13021248
.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-errorbar .ui-jqgrid-error,
13031249
.ui-jqdialog.ui-jqgrid-bootstrap .ui-jqdialog-titlebar .ui-jqdialog-title {
1304-
font-size: 16px;
13051250
}
13061251
.ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-view {
13071252
}
@@ -1343,10 +1288,6 @@ a.clearsearchclass {
13431288
}
13441289
.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-caption,
13451290
.ui-jqdialog.ui-jqgrid-bootstrap .ui-jqdialog-titlebar {
1346-
-ms-border-top-left-radius: 6px;
1347-
border-top-left-radius: 6px;
1348-
-ms-border-top-right-radius: 6px;
1349-
border-top-right-radius: 6px;
13501291
}
13511292

13521293
.modal-backdrop.jqgrid-overlay {
@@ -1503,23 +1444,16 @@ a.clearsearchclass {
15031444
padding: .2em .1em;
15041445
}
15051446
.searchFilter .form-control {
1506-
padding: .1em;
15071447
}
15081448
.searchFilter .form-control:not([size]):not([multiple]) {
1509-
height: 2em;
15101449
}
15111450
.searchFilter .btn {
1512-
margin-left: .125em;
1513-
padding: .2em .375em;
15141451
}
15151452
.ui-jqgrid .searchFilter table.group td {
1516-
padding: 1px;
15171453
}
15181454
.ui-jqgrid .searchFilter table {
1519-
border-spacing: 2px;
15201455
}
15211456
.ui-jqdialog.ui-jqgrid-bootstrap .modal-header .close {
1522-
margin-top: -0.7em;
15231457
}
15241458
.ui-jqdialog .glyphicon,
15251459
.ui-jqgrid .glyphicon {
@@ -1536,9 +1470,6 @@ a.clearsearchclass {
15361470
.ui-jqgrid .ui-pg-button span.glyphicon {
15371471
display: inline-block;
15381472
text-align: center;
1539-
/*margin-left: auto;
1540-
margin-right: auto;
1541-
padding: 0 .1em;*/
15421473
vertical-align: middle;
15431474
}
15441475
.ui-jqgrid-actions .glyphicon {
@@ -1561,7 +1492,7 @@ a.clearsearchclass {
15611492
}
15621493
.subgrid-data .ui-jqgrid-bootstrap .ui-jqgrid-hdiv .ui-jqgrid-htable,
15631494
.subgrid-data .ui-jqgrid-bootstrap .ui-jqgrid-bdiv .ui-jqgrid-btable {
1564-
background-color: transparent;
1495+
background-color: transparent;
15651496
}
15661497
.subgrid-data .ui-jqgrid-legacy-subgrid {
15671498
margin: 0;

‎dist/css/ui.jqgrid.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@
412412
margin: 1px 0 0 0;
413413
}
414414

415-
/* Grig body */
415+
/* Grig body */
416416
.ui-jqgrid .ui-jqgrid-bdiv {
417417
min-height: 1px;
418418
position: relative;
@@ -1178,7 +1178,7 @@ a.clearsearchclass {
11781178
.ui-menu-jqueryui .ui-jqgrid-menu-item .g-menu-item:hover {
11791179
font-weight: normal;
11801180
}
1181-
1181+
11821182
.ui-search-oper {
11831183
padding: 0;
11841184
}

‎dist/css/ui.jqgrid.min.css

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

‎dist/css/ui.jqgrid.min.css.map

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

‎dist/jquery.jqgrid.min.js

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

‎dist/jquery.jqgrid.min.js.map

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

‎dist/jquery.jqgrid.src.js

+9-6
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,7 @@
733733
},
734734
dialog: {
735735
header: "ui-widget-header ui-dialog-titlebar ui-corner-all ui-helper-clearfix",
736+
title: "",
736737
window: "ui-jqgrid-jquery-ui ui-widget ui-widget-content ui-corner-all ui-front",
737738
document: "",
738739
subdocument: "",
@@ -825,6 +826,7 @@
825826
},
826827
dialog: {
827828
header: "modal-header",
829+
title: "modal-title",
828830
window: "modal ui-jqgrid-bootstrap",
829831
document: "modal-dialog",
830832
subdocument: "modal-content",
@@ -931,14 +933,15 @@
931933
},
932934
dialog: {
933935
header: "modal-header",
936+
title: "modal-title h5",
934937
window: "modal ui-jqgrid-bootstrap",
935938
document: "modal-dialog",
936939
subdocument: "modal-content",
937940
body: "modal-body",
938941
footer: "modal-footer",
939942
content: "modal-content",
940943
hr: "d-none",
941-
closeButton: "btn btn-sm btn-outline-primary",
944+
closeButton: "close",
942945
fmButton: "btn btn-outline-secondary",
943946
dataField: "form-control",
944947
viewCellLabel: "",
@@ -988,11 +991,11 @@
988991
label: "form-control",
989992
elem: "form-control",
990993
operationGroup: "form-inline",
991-
addRuleButton: "btn btn-sm btn-default",
992-
deleteRuleButton: "btn btn-sm btn-default",
994+
addRuleButton: "btn btn-sm btn-secondary",
995+
deleteRuleButton: "btn btn-sm btn-primary",
993996
operationSelect: "form-control",
994-
addGroupButton: "btn btn-sm btn-default",
995-
deleteGroupButton: "btn btn-sm btn-default"
997+
addGroupButton: "btn btn-sm btn-secondary",
998+
deleteGroupButton: "btn btn-sm btn-primary"
996999
},
9971000
searchToolbar: {
9981001
menu: "dropdown-menu",
@@ -9194,7 +9197,7 @@
91949197
"dialog.header",
91959198
"ui-jqdialog-titlebar " + (rtlsup ? "ui-jqdialog-titlebar-rtl" : "ui-jqdialog-titlebar-ltr"));
91969199
mh.id = aIDs.modalhead;
9197-
$(mh).append("<span class='ui-jqdialog-title'>" + o.caption + "</span>");
9200+
$(mh).append("<span class='" + getGuiStyles.call(this, "dialog.title", "ui-jqdialog-title") + "'>" + o.caption + "</span>");
91989201
var hoverClasses = getGuiStyles.call(this, "states.hover"),
91999202
ahr = $("<a aria-label='Close' class='" + getGuiStyles.call(this, "dialog.closeButton", "ui-jqdialog-titlebar-close") + "'></a>")
92009203
.hover(function () { ahr.addClass(hoverClasses); },

0 commit comments

Comments
 (0)