Skip to content

Commit 53b81da

Browse files
authored
Update React 16.2.0
1 parent c54a5a2 commit 53b81da

32 files changed

+11136
-10
lines changed

public/assets/jqwidgets/styles/jqx.android.css

Lines changed: 523 additions & 0 deletions
Large diffs are not rendered by default.

public/assets/jqwidgets/styles/jqx.arctic.css

Lines changed: 536 additions & 0 deletions
Large diffs are not rendered by default.

public/assets/jqwidgets/styles/jqx.base.css

Lines changed: 220 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ button.jqx-button, input[type=button].jqx-button, input[type=submit].jqx-button
250250
*color: expression(this.parentNode.currentStyle['color']) !important;
251251
outline: none;
252252
font-weight: normal !important;
253+
line-height:14px;
253254
}
254255
.jqx-grid-menu-item-touch {
255256
padding-top: 6px !important;
@@ -295,9 +296,9 @@ button.jqx-button, input[type=button].jqx-button, input[type=submit].jqx-button
295296
border-style: solid;
296297
border-width: 0px 0px 0px 1px;
297298
border-color: transparent;
298-
background-image: url('images/menubutton.png');
299+
background-image: url('images/icon-menu-small.png') !important;
299300
background-repeat: no-repeat;
300-
background-position: center;
301+
background-position: center !important;
301302
cursor: pointer;
302303
}
303304
.jqx-grid-column-menubutton-rtl {
@@ -362,7 +363,7 @@ button.jqx-button, input[type=button].jqx-button, input[type=submit].jqx-button
362363
/*applied to the sort ascending menu item in the Grid's Context Menu*/
363364
.jqx-grid-sortasc-icon
364365
{
365-
background-image: url('images/sortasc.png');
366+
background-image: url('images/icon-sort-asc.png');
366367
background-repeat: no-repeat;
367368
background-position: left center;
368369
width: 16px;
@@ -374,7 +375,7 @@ button.jqx-button, input[type=button].jqx-button, input[type=submit].jqx-button
374375
/*applied to the sort ascending menu item in the Grid's Context Menu*/
375376
.jqx-grid-sortdesc-icon
376377
{
377-
background-image: url('images/sortdesc.png');
378+
background-image: url('images/icon-sort-desc.png');
378379
background-repeat: no-repeat;
379380
background-position: left center;
380381
width: 16px;
@@ -386,7 +387,7 @@ button.jqx-button, input[type=button].jqx-button, input[type=submit].jqx-button
386387
/*applied to the grid menu's sort remove item/*/
387388
.jqx-grid-sortremove-icon
388389
{
389-
background-image: url('images/sortremove.png');
390+
background-image: url('images/icon-sort-remove.png');
390391
background-repeat: no-repeat;
391392
background-position: left center;
392393
width: 16px;
@@ -528,6 +529,7 @@ button.jqx-button, input[type=button].jqx-button, input[type=submit].jqx-button
528529
overflow: hidden;
529530
position: absolute !important;
530531
height: 100%;
532+
outline:none;
531533
}
532534
.jqx-grid-cell-locked {
533535
color: #aaa !important;
@@ -3181,7 +3183,10 @@ of the horizontal scrollbar.*/
31813183
margin-top: -7.5px !important;
31823184
}
31833185
/*applied to Inputs*/
3184-
.jqx-input{overflow: hidden; background-color: inherit; border-color: #c7c7c7;}
3186+
.jqx-input-widget{
3187+
box-sizing: border-box !important;
3188+
}
3189+
.jqx-input{ overflow: hidden; background-color: inherit; border-color: #c7c7c7;}
31853190
.jqx-input-invalid {
31863191
color: red !important;
31873192
}
@@ -5692,7 +5697,10 @@ ol li .jqx-listmenu-item-label:before
56925697
{
56935698
overflow: auto;
56945699
}
5695-
.jqx-responsive-panel, .jqx-responsive-panel-button
5700+
.jqx-responsive-panel{
5701+
border-width:0px;
5702+
}
5703+
.jqx-responsive-panel-button
56965704
{
56975705
border-width: 1px;
56985706
border-style: solid;
@@ -6767,14 +6775,14 @@ ol li .jqx-listmenu-item-label:before
67676775
.jqx-element {
67686776
overflow: hidden;
67696777
border-style: solid;
6770-
border-width: 1px;
6771-
border-color: #c7c7c7;
6778+
border-width: 0px;
6779+
border-color: transparent;
6780+
box-sizing:border-box;
67726781
}
67736782
.jqx-element-no-border {
67746783
border-width:0px;
67756784
}
67766785
.jqx-element-container {
6777-
border-width: 0px !important;
67786786
}
67796787
.jqx-resize-trigger, .jqx-resize-trigger-shrink {
67806788
position: absolute;
@@ -6799,4 +6807,206 @@ ol li .jqx-listmenu-item-label:before
67996807
pointer-events: none;
68006808
z-index: -1;
68016809
visibility:hidden;
6810+
}
6811+
6812+
/* jqxPivotGrid */
6813+
.jqx-pivotgrid
6814+
{
6815+
background-color: #DEDEDE;
6816+
}
6817+
6818+
.jqx-pivotgrid-item
6819+
{
6820+
white-space: nowrap;
6821+
overflow: hidden;
6822+
position: absolute;
6823+
padding: 0px;
6824+
text-overflow: ellipsis;
6825+
}
6826+
6827+
.jqx-pivotgrid-content-wrapper
6828+
{
6829+
align: left;
6830+
valign: top;
6831+
overflow: hidden;
6832+
border: solid 1px grey;
6833+
}
6834+
6835+
.jqx-pivotgrid-menu-button
6836+
{
6837+
border: none;
6838+
background-image: url('images/icon-menu-small.png');
6839+
background-repeat: no-repeat;
6840+
background-position: center;
6841+
cursor: pointer;
6842+
}
6843+
.jqx-pivotgrid-expand-button
6844+
{
6845+
outline: none;
6846+
background-image: url('images/icon_expand.png');
6847+
background-repeat: no-repeat;
6848+
cursor: pointer;
6849+
margin: 0 0 0 0;
6850+
padding: 0 0 0 0;
6851+
position: relative;
6852+
left: 5px;
6853+
float: left;
6854+
vertical-align: middle;
6855+
}
6856+
6857+
.jqx-pivotgrid-collapse-button
6858+
{
6859+
outline: none;
6860+
background-image: url('images/icon_collapse.png');
6861+
background-repeat: no-repeat;
6862+
cursor: pointer;
6863+
margin: 0 0 0 0;
6864+
padding: 0 0 0 0;
6865+
position: relative;
6866+
left: 5px;
6867+
float: left;
6868+
vertical-align: middle;
6869+
}
6870+
6871+
6872+
.jqx-pivotgrid-sortasc-icon
6873+
{
6874+
background-image: url('images/icon-sort-asc.png');
6875+
background-repeat: no-repeat;
6876+
background-position: left center;
6877+
width: 16px;
6878+
height: 16px;
6879+
float: left;
6880+
margin-left: -4px;
6881+
margin-right: 4px;
6882+
}
6883+
6884+
.jqx-pivotgrid-sortdesc-icon
6885+
{
6886+
background-image: url('images/icon-sort-desc.png');
6887+
background-repeat: no-repeat;
6888+
background-position: left center;
6889+
width: 16px;
6890+
height: 16px;
6891+
float: left;
6892+
margin-left: -4px;
6893+
margin-right: 4px;
6894+
}
6895+
6896+
.jqx-pivotgrid-sortremove-icon
6897+
{
6898+
background-image: url('images/icon-sort-remove.png');
6899+
background-repeat: no-repeat;
6900+
background-position: left center;
6901+
width: 16px;
6902+
height: 16px;
6903+
float: left;
6904+
margin-left: -4px;
6905+
margin-right: 4px;
6906+
}
6907+
6908+
.jqx-pivotgrid-settings-icon
6909+
{
6910+
background-image: url('images/icon-menu-small.png');
6911+
background-repeat: no-repeat;
6912+
background-position: left center;
6913+
width: 16px;
6914+
height: 16px;
6915+
float: left;
6916+
margin-left: -4px;
6917+
margin-right: 4px;
6918+
}
6919+
6920+
jqx-bullet-chart{
6921+
width:800px;
6922+
height:80px;
6923+
}
6924+
jqx-scroll-view{
6925+
width:600px;
6926+
}
6927+
jqx-bar-gauge, jqx-draw {
6928+
width: 850px;
6929+
height: 600px;
6930+
}
6931+
jqx-menu {
6932+
width:600px;
6933+
}
6934+
jqx-data-table, jqx-pivotgrid, jqx-grid, jqx-scheduler, jqx-tree-grid, jqx-docking-layout, jqx-layout, jqx-tree-map, jqx-splitter, jqx-kanban {
6935+
width: 850px;
6936+
}
6937+
jqx-nav-bar {
6938+
height:50px;
6939+
}
6940+
jqx-chart{
6941+
width: 850px;
6942+
height: 400px;
6943+
}
6944+
jqx-docking-layout, jqx-layout {
6945+
width: 850px;
6946+
height: 600px;
6947+
}
6948+
jqx-ribbon, jqx-panel{
6949+
width: 450px;
6950+
height: 300px;
6951+
}
6952+
jqx-scheduler {
6953+
height: 600px;
6954+
}
6955+
jqx-list-box, jqx-text-area{
6956+
width: 200px;
6957+
height: 200px;
6958+
}
6959+
jqx-file-upload {
6960+
width: 300px;
6961+
}
6962+
jqx-complex-input, jqx-formatted-input, jqx-password-input, jqx-input, jqx-number-input, jqx-slider,
6963+
jqx-masked-input, jqx-drop-down-list, jqx-combo-box, jqx-date-time-input, jqx-drop-down-button{
6964+
width: 300px;
6965+
height: 35px;
6966+
}
6967+
jqx-loader{
6968+
width:100px !important;
6969+
height:60px !important;
6970+
}
6971+
jqx-expander, jqx-navigation-bar {
6972+
width:350px;
6973+
}
6974+
jqx-navigation-bar{
6975+
height:450px;
6976+
}
6977+
jqx-range-selector{
6978+
width:600px;
6979+
}
6980+
jqx-tabs{
6981+
width:800px;
6982+
}
6983+
jqx-tool-bar {
6984+
width:800px;
6985+
height: 35px;
6986+
}
6987+
jqx-editor {
6988+
width: 600px;
6989+
height: 400px;
6990+
}
6991+
jqx-tree-map{
6992+
width: 850px;
6993+
height: 600px;
6994+
}
6995+
jqx-tree{
6996+
width:250px;
6997+
}
6998+
jqx-linear-gauge{
6999+
width:100px;
7000+
}
7001+
jqx-color-picker, jqx-calendar{
7002+
width: 200px;
7003+
height: 200px;
7004+
}
7005+
jqx-scroll-bar {
7006+
width:400px;
7007+
height:20px;
7008+
}
7009+
jqx-knob {
7010+
width:600px;
7011+
height:600px;
68027012
}

0 commit comments

Comments
 (0)