Fix Bootstrap buttons and table styles

AngelFQC · AngelFQC · commit 7670e7b67065 · 2019-02-26T11:45:48.000-05:00
diff --git a/css/ui.jqgrid.bootstrap4.css b/css/ui.jqgrid.bootstrap4.css
@@ -15,6 +15,9 @@
 .ui-jqgrid div {
 }
 .ui-jqgrid table {
+	border-collapse: separate;
+	border-spacing: 0;
+	border-width: 0;
 	border-style: none;
 }
 .ui-jqgrid table td {
@@ -31,6 +34,9 @@
 .ui-jqgrid > .ui-jqgrid-view *,
 .ui-jqgrid > .ui-jqgrid-view *:before,
 .ui-jqgrid > .ui-jqgrid-view *:after {
+	-webkit-box-sizing: inherit;
+	-moz-box-sizing: inherit;
+	box-sizing: inherit;
 }
 
 /* Caption of grid and title of ui-jqdialog */
@@ -54,6 +60,12 @@
 /* Close/Hide button */
 .ui-jqgrid-titlebar > .ui-jqgrid-titlebar-close,
 .ui-jqdialog-titlebar > .ui-jqdialog-titlebar-close {
+	-ms-touch-action: manipulation;
+	touch-action: manipulation;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
 }
 
 .ui-jqgrid-jquery-ui .ui-jqdialog-titlebar > .ui-jqdialog-titlebar-close {
@@ -78,13 +90,10 @@
 .ui-jqgrid .ui-jqgrid-errorbar-ltr .ui-jqgrid-error,
 .ui-jqdialog .ui-jqdialog-titlebar-ltr .ui-jqdialog-title {
 	position: relative;
-	left: .1em;
 }
 .ui-jqgrid .ui-jqgrid-caption-rtl .ui-jqgrid-title,
 .ui-jqgrid .ui-jqgrid-errorbar-rtl .ui-jqgrid-error,
 .ui-jqdialog .ui-jqdialog-titlebar-rtl .ui-jqdialog-title {
-	position: relative;
-	right: .1em;
 }
 .ui-jqgrid-titlebar > .ui-jqgrid-titlebar-close span {
 	margin-top: 0;
@@ -158,6 +167,8 @@
 .ui-jqdialog .ui-resizable-handle > .svg-inline--fa {
 	font-size: 12px;
 	right: -1px;
+	/*right: -2px;
+    bottom: -1px;*/
 	position: relative;
 }
 .ui-jqdialog .ui-resizable-handle > .glyphicon {
@@ -389,7 +400,14 @@
 .ui-jqgrid tr.jqfoot > td,
 .ui-jqgrid tr.ui-subgrid > td,
 .ui-jqgrid tr.ui-subtblcell > td {
+	overflow: hidden;
+	white-space: pre;
 	vertical-align: middle;
+	text-align: center;
+	/*! height: 22px; */
+	border-top: 0 none;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
 }
 .ui-jqgrid-jquery-ui.ui-jqgrid tr.jqgrow > td,
 .ui-jqgrid-jquery-ui.ui-jqgrid tr.jqgroup > td,
@@ -402,7 +420,6 @@
 .ui-jqgrid tr.jqfoot > td {
 }
 .ui-jqgrid tr.ui-subgrid > td {
-	padding: 0;
 }
 .ui-jqgrid tr.jqgfirstrow > td {
 	padding: 0 2px 0 2px;
@@ -563,14 +580,13 @@ span.ui-jqgrid-cell-wrapper {
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 	height: auto;
+	min-height: 22px;
 	overflow: hidden;
+	font-size: 11px;
 }
 .ui-jqgrid > .ui-jqgrid-pager *,
 .ui-jqgrid > .ui-jqgrid-pager *:before,
 .ui-jqgrid > .ui-jqgrid-pager *:after {
-	-webkit-box-sizing: inherit;
-	-moz-box-sizing: inherit;
-	box-sizing: inherit;
 }
 .ui-jqgrid .ui-jqgrid-toppager .ui-pager-control,
 .ui-jqgrid .ui-jqgrid-pager .ui-pager-control {
@@ -583,8 +599,6 @@ span.ui-jqgrid-cell-wrapper {
 	text-align: left;
 }
 .ui-pager-control .ui-jqgrid-pg-center {
-	text-align: center;
-	white-space: pre;
 }
 .ui-pager-control .ui-jqgrid-pg-right {
 	text-align: right;
@@ -620,20 +634,18 @@ span.ui-jqgrid-cell-wrapper {
 	height: auto;
 }
 .ui-jqgrid .ui-pg-button span {
+	display: block;
+	margin: 1px;
+	float: left;
 }
 .ui-jqgrid .ui-pg-table .ui-pg-input,
 .ui-jqgrid .ui-pg-table .ui-pg-selbox {
-	height: auto;
 	width: auto;
-	margin: 0;
-	line-height: inherit;
 }
 select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
 	height: auto;
 }
 .ui-jqgrid .ui-pg-table .ui-pg-selbox {
-	display: block;
-	padding: 1px;
 }
 .ui-jqgrid .ui-separator {
 	height: 12px;
@@ -649,6 +661,9 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
 	display: inline;
 }
 .ui-jqgrid .ui-jqgrid-pager .ui-pg-div {
+	padding: 1px 0;
+	float: left;
+	position: relative;
 }
 .ui-jqgrid .ui-jqgrid-pager .ui-pg-button {
 	cursor: pointer;
@@ -660,8 +675,11 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
 .ui-jqgrid td input,
 .ui-jqgrid td select,
 .ui-jqgrid td textarea {
+	/*! margin: 0; */
 }
 .ui-jqgrid td textarea {
+	width: auto;
+	height: auto;
 }
 .ui-jqgrid > .ui-jqgrid-view > .ui-jqgrid-toppager {
 	border-left: 0 none;
@@ -692,6 +710,8 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
 	vertical-align: middle;
 }
 .ui-jqgrid .navtable .ui-pg-div span.ui-pg-button-text {
+	padding-left: 0.2em;
+	padding-right: 0.2em;
 }
 .ui-pg-button:hover > .ui-pg-div > .ui-pg-button-text,
 .ui-pg-button.ui-state-hover > .ui-pg-div > .ui-pg-button-text {
@@ -763,13 +783,9 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
 	left: 45%;
 	width: auto;
 	z-index: 101;
-	padding: 6px;
-	margin: 5px;
 	text-align: center;
 	font-weight: bold;
 	display: none;
-	border-width: 2px;
-	font-size: 11px;
 }
 .ui-jqgrid .jqgrid-overlay {
 	display: none;
@@ -839,6 +855,8 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
 	margin: 0;
 }
 .ui-jqdialog-content .EditTable {
+	width: 100%;
+	margin-bottom: 0;
 }
 .ui-jqdialog-content .DelTable {
 	width: 100%;
@@ -854,11 +872,16 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
 	height: auto;
 }
 .ui-jqdialog-content td.EditButton {
-	padding-left: .25rem;
+	border-top: 0 none;
+	border-left: 0 none;
+	border-right: 0 none;
+	padding: 5px 0;
 }
 .ui-jqdialog-content td.EditButton-ltr {
+	text-align: right;
 }
 .ui-jqdialog-content td.EditButton-rtl {
+	text-align: left;
 }
 .ui-jqdialog-content td.navButton {
 	text-align: left;
@@ -922,12 +945,22 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {
 	width: auto;
 }
 .ui-jqdialog .fm-button {
+	display: inline-block;
+	padding: .4em .5em;
+	text-decoration: none;
+	cursor: pointer;
+	position: relative;
+	text-align: center;
+	zoom: 1;
+	margin-left: 0.25rem;
 }
 .ui-jqdialog.ui-jqgrid-bootstrap .navButton .fm-button {
 	padding: .375em .75em;
 	margin-left: .125em;
 }
 .ui-jqdialog .fm-button > span {
+	display: inline-block;
+	vertical-align: middle;
 }
 .ui-jqdialog .fm-button .fm-button-text {
 	padding: 0 .2em;
@@ -1224,9 +1257,9 @@ a.clearsearchclass {
 
 /* Bootstrap style support */
 .ui-jqgrid.ui-jqgrid-bootstrap {
-	border: 1px solid #ddd;
+	/*border: 1px solid #ddd;
 	-ms-border-radius: 6px;
-	border-radius: 6px;
+	border-radius: 6px;*/
 }
 .ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-view > .ui-jqgrid-toppager {
 	border-bottom-left-radius: 0;
@@ -1237,12 +1270,12 @@ a.clearsearchclass {
 }
 .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-hdiv,
 .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-legacy-subgrid > thead {
+	background-color: #e5e5e5;
 }
 .ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-view > .ui-jqgrid-sdiv td {
 	background-color: #f9f9f9
 }
 .ui-jqdialog.ui-jqgrid-bootstrap > .modal-dialog {
-	margin-top: 0;
 }
 .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-titlebar .ui-jqgrid-title,
 .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-errorbar .ui-jqgrid-error,
@@ -1255,6 +1288,7 @@ a.clearsearchclass {
 }
 .ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-view .fa,
 .ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-pager .fa {
+	font-size: 14px;
 }
 .ui-jqdialog.ui-jqgrid-bootstrap {
 }
@@ -1306,7 +1340,6 @@ a.clearsearchclass {
 	height: auto;
 }
 .ui-jqdialog.ui-jqgrid-bootstrap .modal-dialog {
-	width: auto;
 }
 .ui-jqdialog.ui-widget {
 	overflow: hidden;
@@ -1319,6 +1352,7 @@ a.clearsearchclass {
 }
 .ui-jqdialog.ui-jqgrid-bootstrap .modal-content {
 	overflow: hidden;
+	padding: 0;
 }
 .ui-jqdialog.ui-jqgrid-bootstrap .modal-content > .ui-resizable-handle.fa {
 	bottom: 1px;
@@ -1331,8 +1365,6 @@ a.clearsearchclass {
 }
 
 .ui-jqgrid.ui-jqgrid-bootstrap .disabled {
-	opacity: .35;
-	filter: Alpha(Opacity=35);
 }
 .ui-jqgrid-bootstrap.ui-jqgrid-resize-mark {
 	border: 1px solid #aaaaaa;
@@ -1356,6 +1388,7 @@ a.clearsearchclass {
 	margin: 0;
 }
 .ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-table .ui-pg-button {
+	margin: .25rem .25rem .25rem 0;
 }
 .ui-search-input .form-control:not([size]):not([multiple]) {
 	height: auto;
@@ -1399,13 +1432,12 @@ a.clearsearchclass {
 	border: 1px solid #333;
 }
 .ui-jqdialog.ui-jqgrid-bootstrap .ui-jqdialog-content {
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
 }
 .ui-jqgrid.ui-jqgrid-bootstrap .ui-pager-control .ui-pg-input {
 	display: inline-block;
 }
 .ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-pager {
+	font-size: 14px;
 }
 .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-bootstrap-corner-top {
 	border-top-left-radius: 6px;
@@ -1416,8 +1448,6 @@ a.clearsearchclass {
 	border-bottom-right-radius: 6px;
 }
 .ui-jqgrid.ui-jqgrid-bootstrap .ui-pager-control .ui-pg-selbox {
-	font-size: 12px;
-	padding: 0;
 }
 .ui-jqdialog.ui-jqgrid-bootstrap .FormData .CaptionTD {
 	font-size: 14px;
@@ -1448,10 +1478,13 @@ a.clearsearchclass {
 .searchFilter .form-control:not([size]):not([multiple]) {
 }
 .searchFilter .btn {
+	margin-left: .25em;
 }
 .ui-jqgrid .searchFilter table.group td {
+	padding: 0.25em;
 }
 .ui-jqgrid .searchFilter table {
+	border-spacing: 0px;
 }
 .ui-jqdialog.ui-jqgrid-bootstrap .modal-header .close {
 }
@@ -1470,6 +1503,9 @@ a.clearsearchclass {
 .ui-jqgrid .ui-pg-button span.glyphicon {
 	display: inline-block;
 	text-align: center;
+	/*margin-left: auto;
+	margin-right: auto;
+	padding: 0 .1em;*/
 	vertical-align: middle;
 }
 .ui-jqgrid-actions .glyphicon {
diff --git a/js/grid.base.js b/js/grid.base.js
@@ -981,19 +981,19 @@
 				toolbarBottom: "",
 				pager: {
 					pager: "card-footer",
-					pagerButton: "btn btn-sm",
-					pagerInput: "form-control",
-					pagerSelect: "form-control"
+					pagerButton: "btn btn-sm btn-secondary",
+					pagerInput: "form-control form-control-sm",
+					pagerSelect: "form-control form-control-sm"
 				},
 				navButton: "btn btn-sm",
 				searchDialog: {
-					operator: "form-control",
-					label: "form-control",
-					elem: "form-control",
+					operator: "form-control form-control-sm",
+					label: "form-control form-control-sm",
+					elem: "form-control form-control-sm",
 					operationGroup: "form-inline",
 					addRuleButton: "btn btn-sm btn-secondary",
 					deleteRuleButton: "btn btn-sm btn-primary",
-					operationSelect: "form-control",
+					operationSelect: "form-control form-control-sm",
 					addGroupButton: "btn btn-sm btn-secondary",
 					deleteGroupButton: "btn btn-sm btn-primary"
 				},

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`	`.ui-jqgrid div {`
`16`	`16`	`}`
`17`	`17`	`.ui-jqgrid table {`
	`18`	`+ border-collapse: separate;`
	`19`	`+ border-spacing: 0;`
	`20`	`+ border-width: 0;`
`18`	`21`	`border-style: none;`
`19`	`22`	`}`
`20`	`23`	`.ui-jqgrid table td {`
`@@ -31,6 +34,9 @@`
`31`	`34`	`.ui-jqgrid > .ui-jqgrid-view *,`
`32`	`35`	`.ui-jqgrid > .ui-jqgrid-view *:before,`
`33`	`36`	`.ui-jqgrid > .ui-jqgrid-view *:after {`
	`37`	`+ -webkit-box-sizing: inherit;`
	`38`	`+ -moz-box-sizing: inherit;`
	`39`	`+ box-sizing: inherit;`
`34`	`40`	`}`
`35`	`41`
`36`	`42`	`/* Caption of grid and title of ui-jqdialog */`
`@@ -54,6 +60,12 @@`
`54`	`60`	`/* Close/Hide button */`
`55`	`61`	`.ui-jqgrid-titlebar > .ui-jqgrid-titlebar-close,`
`56`	`62`	`.ui-jqdialog-titlebar > .ui-jqdialog-titlebar-close {`
	`63`	`+ -ms-touch-action: manipulation;`
	`64`	`+ touch-action: manipulation;`
	`65`	`+ -webkit-user-select: none;`
	`66`	`+ -moz-user-select: none;`
	`67`	`+ -ms-user-select: none;`
	`68`	`+ user-select: none;`
`57`	`69`	`}`
`58`	`70`
`59`	`71`	`.ui-jqgrid-jquery-ui .ui-jqdialog-titlebar > .ui-jqdialog-titlebar-close {`
`@@ -78,13 +90,10 @@`
`78`	`90`	`.ui-jqgrid .ui-jqgrid-errorbar-ltr .ui-jqgrid-error,`
`79`	`91`	`.ui-jqdialog .ui-jqdialog-titlebar-ltr .ui-jqdialog-title {`
`80`	`92`	`position: relative;`
`81`		`- left: .1em;`
`82`	`93`	`}`
`83`	`94`	`.ui-jqgrid .ui-jqgrid-caption-rtl .ui-jqgrid-title,`
`84`	`95`	`.ui-jqgrid .ui-jqgrid-errorbar-rtl .ui-jqgrid-error,`
`85`	`96`	`.ui-jqdialog .ui-jqdialog-titlebar-rtl .ui-jqdialog-title {`
`86`		`- position: relative;`
`87`		`- right: .1em;`
`88`	`97`	`}`
`89`	`98`	`.ui-jqgrid-titlebar > .ui-jqgrid-titlebar-close span {`
`90`	`99`	`margin-top: 0;`
`@@ -158,6 +167,8 @@`
`158`	`167`	`.ui-jqdialog .ui-resizable-handle > .svg-inline--fa {`
`159`	`168`	`font-size: 12px;`
`160`	`169`	`right: -1px;`
	`170`	`+ /*right: -2px;`
	`171`	`+ bottom: -1px;*/`
`161`	`172`	`position: relative;`
`162`	`173`	`}`
`163`	`174`	`.ui-jqdialog .ui-resizable-handle > .glyphicon {`
`@@ -389,7 +400,14 @@`
`389`	`400`	`.ui-jqgrid tr.jqfoot > td,`
`390`	`401`	`.ui-jqgrid tr.ui-subgrid > td,`
`391`	`402`	`.ui-jqgrid tr.ui-subtblcell > td {`
	`403`	`+ overflow: hidden;`
	`404`	`+ white-space: pre;`
`392`	`405`	`vertical-align: middle;`
	`406`	`+ text-align: center;`
	`407`	`+ /! height: 22px; /`
	`408`	`+ border-top: 0 none;`
	`409`	`+ border-bottom-width: 1px;`
	`410`	`+ border-bottom-style: solid;`
`393`	`411`	`}`
`394`	`412`	`.ui-jqgrid-jquery-ui.ui-jqgrid tr.jqgrow > td,`
`395`	`413`	`.ui-jqgrid-jquery-ui.ui-jqgrid tr.jqgroup > td,`
`@@ -402,7 +420,6 @@`
`402`	`420`	`.ui-jqgrid tr.jqfoot > td {`
`403`	`421`	`}`
`404`	`422`	`.ui-jqgrid tr.ui-subgrid > td {`
`405`		`- padding: 0;`
`406`	`423`	`}`
`407`	`424`	`.ui-jqgrid tr.jqgfirstrow > td {`
`408`	`425`	`padding: 0 2px 0 2px;`
`@@ -563,14 +580,13 @@ span.ui-jqgrid-cell-wrapper {`
`563`	`580`	`-webkit-box-sizing: border-box;`
`564`	`581`	`box-sizing: border-box;`
`565`	`582`	`height: auto;`
	`583`	`+ min-height: 22px;`
`566`	`584`	`overflow: hidden;`
	`585`	`+ font-size: 11px;`
`567`	`586`	`}`
`568`	`587`	`.ui-jqgrid > .ui-jqgrid-pager *,`
`569`	`588`	`.ui-jqgrid > .ui-jqgrid-pager *:before,`
`570`	`589`	`.ui-jqgrid > .ui-jqgrid-pager *:after {`
`571`		`- -webkit-box-sizing: inherit;`
`572`		`- -moz-box-sizing: inherit;`
`573`		`- box-sizing: inherit;`
`574`	`590`	`}`
`575`	`591`	`.ui-jqgrid .ui-jqgrid-toppager .ui-pager-control,`
`576`	`592`	`.ui-jqgrid .ui-jqgrid-pager .ui-pager-control {`
`@@ -583,8 +599,6 @@ span.ui-jqgrid-cell-wrapper {`
`583`	`599`	`text-align: left;`
`584`	`600`	`}`
`585`	`601`	`.ui-pager-control .ui-jqgrid-pg-center {`
`586`		`- text-align: center;`
`587`		`- white-space: pre;`
`588`	`602`	`}`
`589`	`603`	`.ui-pager-control .ui-jqgrid-pg-right {`
`590`	`604`	`text-align: right;`
`@@ -620,20 +634,18 @@ span.ui-jqgrid-cell-wrapper {`
`620`	`634`	`height: auto;`
`621`	`635`	`}`
`622`	`636`	`.ui-jqgrid .ui-pg-button span {`
	`637`	`+ display: block;`
	`638`	`+ margin: 1px;`
	`639`	`+ float: left;`
`623`	`640`	`}`
`624`	`641`	`.ui-jqgrid .ui-pg-table .ui-pg-input,`
`625`	`642`	`.ui-jqgrid .ui-pg-table .ui-pg-selbox {`
`626`		`- height: auto;`
`627`	`643`	`width: auto;`
`628`		`- margin: 0;`
`629`		`- line-height: inherit;`
`630`	`644`	`}`
`631`	`645`	`select.form-control.ui-pg-selbox:not([size]):not([multiple]) {`
`632`	`646`	`height: auto;`
`633`	`647`	`}`
`634`	`648`	`.ui-jqgrid .ui-pg-table .ui-pg-selbox {`
`635`		`- display: block;`
`636`		`- padding: 1px;`
`637`	`649`	`}`
`638`	`650`	`.ui-jqgrid .ui-separator {`
`639`	`651`	`height: 12px;`
`@@ -649,6 +661,9 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {`
`649`	`661`	`display: inline;`
`650`	`662`	`}`
`651`	`663`	`.ui-jqgrid .ui-jqgrid-pager .ui-pg-div {`
	`664`	`+ padding: 1px 0;`
	`665`	`+ float: left;`
	`666`	`+ position: relative;`
`652`	`667`	`}`
`653`	`668`	`.ui-jqgrid .ui-jqgrid-pager .ui-pg-button {`
`654`	`669`	`cursor: pointer;`
`@@ -660,8 +675,11 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {`
`660`	`675`	`.ui-jqgrid td input,`
`661`	`676`	`.ui-jqgrid td select,`
`662`	`677`	`.ui-jqgrid td textarea {`
	`678`	`+ /! margin: 0; /`
`663`	`679`	`}`
`664`	`680`	`.ui-jqgrid td textarea {`
	`681`	`+ width: auto;`
	`682`	`+ height: auto;`
`665`	`683`	`}`
`666`	`684`	`.ui-jqgrid > .ui-jqgrid-view > .ui-jqgrid-toppager {`
`667`	`685`	`border-left: 0 none;`
`@@ -692,6 +710,8 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {`
`692`	`710`	`vertical-align: middle;`
`693`	`711`	`}`
`694`	`712`	`.ui-jqgrid .navtable .ui-pg-div span.ui-pg-button-text {`
	`713`	`+ padding-left: 0.2em;`
	`714`	`+ padding-right: 0.2em;`
`695`	`715`	`}`
`696`	`716`	`.ui-pg-button:hover > .ui-pg-div > .ui-pg-button-text,`
`697`	`717`	`.ui-pg-button.ui-state-hover > .ui-pg-div > .ui-pg-button-text {`
`@@ -763,13 +783,9 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {`
`763`	`783`	`left: 45%;`
`764`	`784`	`width: auto;`
`765`	`785`	`z-index: 101;`
`766`		`- padding: 6px;`
`767`		`- margin: 5px;`
`768`	`786`	`text-align: center;`
`769`	`787`	`font-weight: bold;`
`770`	`788`	`display: none;`
`771`		`- border-width: 2px;`
`772`		`- font-size: 11px;`
`773`	`789`	`}`
`774`	`790`	`.ui-jqgrid .jqgrid-overlay {`
`775`	`791`	`display: none;`
`@@ -839,6 +855,8 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {`
`839`	`855`	`margin: 0;`
`840`	`856`	`}`
`841`	`857`	`.ui-jqdialog-content .EditTable {`
	`858`	`+ width: 100%;`
	`859`	`+ margin-bottom: 0;`
`842`	`860`	`}`
`843`	`861`	`.ui-jqdialog-content .DelTable {`
`844`	`862`	`width: 100%;`
`@@ -854,11 +872,16 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {`
`854`	`872`	`height: auto;`
`855`	`873`	`}`
`856`	`874`	`.ui-jqdialog-content td.EditButton {`
`857`		`- padding-left: .25rem;`
	`875`	`+ border-top: 0 none;`
	`876`	`+ border-left: 0 none;`
	`877`	`+ border-right: 0 none;`
	`878`	`+ padding: 5px 0;`
`858`	`879`	`}`
`859`	`880`	`.ui-jqdialog-content td.EditButton-ltr {`
	`881`	`+ text-align: right;`
`860`	`882`	`}`
`861`	`883`	`.ui-jqdialog-content td.EditButton-rtl {`
	`884`	`+ text-align: left;`
`862`	`885`	`}`
`863`	`886`	`.ui-jqdialog-content td.navButton {`
`864`	`887`	`text-align: left;`
`@@ -922,12 +945,22 @@ select.form-control.ui-pg-selbox:not([size]):not([multiple]) {`
`922`	`945`	`width: auto;`
`923`	`946`	`}`
`924`	`947`	`.ui-jqdialog .fm-button {`
	`948`	`+ display: inline-block;`
	`949`	`+ padding: .4em .5em;`
	`950`	`+ text-decoration: none;`
	`951`	`+ cursor: pointer;`
	`952`	`+ position: relative;`
	`953`	`+ text-align: center;`
	`954`	`+ zoom: 1;`
	`955`	`+ margin-left: 0.25rem;`
`925`	`956`	`}`
`926`	`957`	`.ui-jqdialog.ui-jqgrid-bootstrap .navButton .fm-button {`
`927`	`958`	`padding: .375em .75em;`
`928`	`959`	`margin-left: .125em;`
`929`	`960`	`}`
`930`	`961`	`.ui-jqdialog .fm-button > span {`
	`962`	`+ display: inline-block;`
	`963`	`+ vertical-align: middle;`
`931`	`964`	`}`
`932`	`965`	`.ui-jqdialog .fm-button .fm-button-text {`
`933`	`966`	`padding: 0 .2em;`
`@@ -1224,9 +1257,9 @@ a.clearsearchclass {`
`1224`	`1257`
`1225`	`1258`	`/* Bootstrap style support */`
`1226`	`1259`	`.ui-jqgrid.ui-jqgrid-bootstrap {`
`1227`		`- border: 1px solid #ddd;`
	`1260`	`+ /*border: 1px solid #ddd;`
`1228`	`1261`	`-ms-border-radius: 6px;`
`1229`		`- border-radius: 6px;`
	`1262`	`+ border-radius: 6px;*/`
`1230`	`1263`	`}`
`1231`	`1264`	`.ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-view > .ui-jqgrid-toppager {`
`1232`	`1265`	`border-bottom-left-radius: 0;`
`@@ -1237,12 +1270,12 @@ a.clearsearchclass {`
`1237`	`1270`	`}`
`1238`	`1271`	`.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-hdiv,`
`1239`	`1272`	`.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-legacy-subgrid > thead {`
	`1273`	`+ background-color: #e5e5e5;`
`1240`	`1274`	`}`
`1241`	`1275`	`.ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-view > .ui-jqgrid-sdiv td {`
`1242`	`1276`	`background-color: #f9f9f9`
`1243`	`1277`	`}`
`1244`	`1278`	`.ui-jqdialog.ui-jqgrid-bootstrap > .modal-dialog {`
`1245`		`- margin-top: 0;`
`1246`	`1279`	`}`
`1247`	`1280`	`.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-titlebar .ui-jqgrid-title,`
`1248`	`1281`	`.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-errorbar .ui-jqgrid-error,`
`@@ -1255,6 +1288,7 @@ a.clearsearchclass {`
`1255`	`1288`	`}`
`1256`	`1289`	`.ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-view .fa,`
`1257`	`1290`	`.ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-pager .fa {`
	`1291`	`+ font-size: 14px;`
`1258`	`1292`	`}`
`1259`	`1293`	`.ui-jqdialog.ui-jqgrid-bootstrap {`
`1260`	`1294`	`}`
`@@ -1306,7 +1340,6 @@ a.clearsearchclass {`
`1306`	`1340`	`height: auto;`
`1307`	`1341`	`}`
`1308`	`1342`	`.ui-jqdialog.ui-jqgrid-bootstrap .modal-dialog {`
`1309`		`- width: auto;`
`1310`	`1343`	`}`
`1311`	`1344`	`.ui-jqdialog.ui-widget {`
`1312`	`1345`	`overflow: hidden;`
`@@ -1319,6 +1352,7 @@ a.clearsearchclass {`
`1319`	`1352`	`}`
`1320`	`1353`	`.ui-jqdialog.ui-jqgrid-bootstrap .modal-content {`
`1321`	`1354`	`overflow: hidden;`
	`1355`	`+ padding: 0;`
`1322`	`1356`	`}`
`1323`	`1357`	`.ui-jqdialog.ui-jqgrid-bootstrap .modal-content > .ui-resizable-handle.fa {`
`1324`	`1358`	`bottom: 1px;`
`@@ -1331,8 +1365,6 @@ a.clearsearchclass {`
`1331`	`1365`	`}`
`1332`	`1366`
`1333`	`1367`	`.ui-jqgrid.ui-jqgrid-bootstrap .disabled {`
`1334`		`- opacity: .35;`
`1335`		`- filter: Alpha(Opacity=35);`
`1336`	`1368`	`}`
`1337`	`1369`	`.ui-jqgrid-bootstrap.ui-jqgrid-resize-mark {`
`1338`	`1370`	`border: 1px solid #aaaaaa;`
`@@ -1356,6 +1388,7 @@ a.clearsearchclass {`
`1356`	`1388`	`margin: 0;`
`1357`	`1389`	`}`
`1358`	`1390`	`.ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-table .ui-pg-button {`
	`1391`	`+ margin: .25rem .25rem .25rem 0;`
`1359`	`1392`	`}`
`1360`	`1393`	`.ui-search-input .form-control:not([size]):not([multiple]) {`
`1361`	`1394`	`height: auto;`
`@@ -1399,13 +1432,12 @@ a.clearsearchclass {`
`1399`	`1432`	`border: 1px solid #333;`
`1400`	`1433`	`}`
`1401`	`1434`	`.ui-jqdialog.ui-jqgrid-bootstrap .ui-jqdialog-content {`
`1402`		`- border-top-left-radius: 0;`
`1403`		`- border-top-right-radius: 0;`
`1404`	`1435`	`}`
`1405`	`1436`	`.ui-jqgrid.ui-jqgrid-bootstrap .ui-pager-control .ui-pg-input {`
`1406`	`1437`	`display: inline-block;`
`1407`	`1438`	`}`
`1408`	`1439`	`.ui-jqgrid.ui-jqgrid-bootstrap > .ui-jqgrid-pager {`
	`1440`	`+ font-size: 14px;`
`1409`	`1441`	`}`
`1410`	`1442`	`.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-bootstrap-corner-top {`
`1411`	`1443`	`border-top-left-radius: 6px;`
`@@ -1416,8 +1448,6 @@ a.clearsearchclass {`
`1416`	`1448`	`border-bottom-right-radius: 6px;`
`1417`	`1449`	`}`
`1418`	`1450`	`.ui-jqgrid.ui-jqgrid-bootstrap .ui-pager-control .ui-pg-selbox {`
`1419`		`- font-size: 12px;`
`1420`		`- padding: 0;`
`1421`	`1451`	`}`
`1422`	`1452`	`.ui-jqdialog.ui-jqgrid-bootstrap .FormData .CaptionTD {`
`1423`	`1453`	`font-size: 14px;`
`@@ -1448,10 +1478,13 @@ a.clearsearchclass {`
`1448`	`1478`	`.searchFilter .form-control:not([size]):not([multiple]) {`
`1449`	`1479`	`}`
`1450`	`1480`	`.searchFilter .btn {`
	`1481`	`+ margin-left: .25em;`
`1451`	`1482`	`}`
`1452`	`1483`	`.ui-jqgrid .searchFilter table.group td {`
	`1484`	`+ padding: 0.25em;`
`1453`	`1485`	`}`
`1454`	`1486`	`.ui-jqgrid .searchFilter table {`
	`1487`	`+ border-spacing: 0px;`
`1455`	`1488`	`}`
`1456`	`1489`	`.ui-jqdialog.ui-jqgrid-bootstrap .modal-header .close {`
`1457`	`1490`	`}`
`@@ -1470,6 +1503,9 @@ a.clearsearchclass {`
`1470`	`1503`	`.ui-jqgrid .ui-pg-button span.glyphicon {`
`1471`	`1504`	`display: inline-block;`
`1472`	`1505`	`text-align: center;`
	`1506`	`+ /*margin-left: auto;`
	`1507`	`+ margin-right: auto;`
	`1508`	`+ padding: 0 .1em;*/`
`1473`	`1509`	`vertical-align: middle;`
`1474`	`1510`	`}`
`1475`	`1511`	`.ui-jqgrid-actions .glyphicon {`