Skip to content

Commit 8bbbfee

Browse files
committed
Set font for table extension
Close mar10#897
1 parent fae3e90 commit 8bbbfee

File tree

15 files changed

+29
-2
lines changed

15 files changed

+29
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# 2.30.1-0 / Unreleased
2-
* [FIXED] #896 _requireExtension: order managment
2+
* [Fixed] #896 _requireExtension: order managment
3+
* [Changed] #897 Set font for table extension
34

45
# 2.30.0 / 2018-09-02
56
* [Changed] ext-edit trigger 'clickActive' now only triggers if no modifier keys

src/jquery.fancytree.multi.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $.ui.fancytree.registerExtension({
4747
// Default options for this extension.
4848
options: {
4949
allowNoSelect: false, //
50-
mode: "sameParent", //
50+
mode: "sameParent" //
5151
// Events:
5252
// beforeSelect: $.noop // Return false to prevent cancel/save (data.input is available)
5353
},

src/skin-awesome/ui.fancytree.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ ul.fancytree-container.fancytree-rtl.fancytree-no-connector > li {
320320
* 'table' extension
321321
*----------------------------------------------------------------------------*/
322322
table.fancytree-ext-table {
323+
font-family: tahoma, arial, helvetica;
324+
font-size: 10pt;
323325
border-collapse: collapse;
324326
/* ext-ariagrid */
325327
}

src/skin-bootstrap-n/ui.fancytree.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ ul.fancytree-container.fancytree-rtl.fancytree-no-connector > li {
320320
* 'table' extension
321321
*----------------------------------------------------------------------------*/
322322
table.fancytree-ext-table {
323+
font-family: tahoma, arial, helvetica;
324+
font-size: 10pt;
323325
border-collapse: collapse;
324326
/* ext-ariagrid */
325327
}

src/skin-bootstrap/ui.fancytree.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ ul.fancytree-container.fancytree-rtl.fancytree-no-connector > li {
320320
* 'table' extension
321321
*----------------------------------------------------------------------------*/
322322
table.fancytree-ext-table {
323+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
324+
font-size: 14px;
323325
border-collapse: collapse;
324326
/* ext-ariagrid */
325327
}

src/skin-common.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,8 @@ ul.fancytree-container.fancytree-rtl {
652652
*----------------------------------------------------------------------------*/
653653

654654
table.fancytree-ext-table {
655+
font-family: @fancy-font-family;
656+
font-size: @fancy-font-size;
655657
border-collapse: collapse;
656658
span.fancytree-node {
657659
display: inline-block; // #117

src/skin-lion/ui.fancytree.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,8 @@ ul.fancytree-container.fancytree-rtl.fancytree-no-connector > li {
485485
* 'table' extension
486486
*----------------------------------------------------------------------------*/
487487
table.fancytree-ext-table {
488+
font-family: tahoma, arial, helvetica;
489+
font-size: 10pt;
488490
border-collapse: collapse;
489491
/* ext-ariagrid */
490492
}

src/skin-material/ui.fancytree.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ ul.fancytree-container.fancytree-rtl.fancytree-no-connector > li {
320320
* 'table' extension
321321
*----------------------------------------------------------------------------*/
322322
table.fancytree-ext-table {
323+
font-family: "Roboto Regular", tahoma, arial, helvetica;
324+
font-size: 24px;
323325
border-collapse: collapse;
324326
/* ext-ariagrid */
325327
}

src/skin-themeroller/ui.fancytree.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,8 @@ ul.fancytree-container.fancytree-rtl.fancytree-no-connector > li {
481481
* 'table' extension
482482
*----------------------------------------------------------------------------*/
483483
table.fancytree-ext-table {
484+
font-family: tahoma, arial, helvetica;
485+
font-size: 10pt;
484486
border-collapse: collapse;
485487
/* ext-ariagrid */
486488
}

src/skin-vista/ui.fancytree.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,8 @@ ul.fancytree-container.fancytree-rtl.fancytree-no-connector > li {
495495
* 'table' extension
496496
*----------------------------------------------------------------------------*/
497497
table.fancytree-ext-table {
498+
font-family: tahoma, arial, helvetica;
499+
font-size: 10pt;
498500
border-collapse: collapse;
499501
/* ext-ariagrid */
500502
}

0 commit comments

Comments
 (0)