From 1e1815d2bafa2636aa8fcc328a8969d8c2aada95 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 23 Aug 2015 13:20:09 +0200 Subject: [PATCH] Fix Glyph plugin: Missing margin-left for span.fancytree-custom-icon Close #484 --- CHANGELOG.md | 1 + src/skin-awesome/ui.fancytree.css | 1 + src/skin-bootstrap-n/ui.fancytree.css | 1 + src/skin-bootstrap/ui.fancytree.css | 1 + src/skin-common.less | 1 + src/skin-lion/ui.fancytree.css | 1 + src/skin-vista/ui.fancytree.css | 1 + src/skin-win7/ui.fancytree.css | 1 + src/skin-win8-n/ui.fancytree.css | 1 + src/skin-win8-xxl/ui.fancytree.css | 1 + src/skin-win8/ui.fancytree.css | 1 + src/skin-xp/ui.fancytree.css | 1 + 12 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffe3c737..6dc319f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * [Improved] Add `highlight` and `fuzzy` options to ext-filter * [Improved] Add `fireActivate` option to ext-persist (default: true) * [Fixed] #475 Font color while editing node title with bootstrap skin + * [Fixed] #484 Glyph plugin: Missing margin-left for span.fancytree-custom-icon # 2.11.0 / 2015-07-26 * [Changed] Adding `fancytree-plain` class to container (if not table), allowing for more efficient css diff --git a/src/skin-awesome/ui.fancytree.css b/src/skin-awesome/ui.fancytree.css index 3775c67a..04a8022b 100644 --- a/src/skin-awesome/ui.fancytree.css +++ b/src/skin-awesome/ui.fancytree.css @@ -87,6 +87,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 0.5em; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-bootstrap-n/ui.fancytree.css b/src/skin-bootstrap-n/ui.fancytree.css index 31797d1f..f06e52f8 100644 --- a/src/skin-bootstrap-n/ui.fancytree.css +++ b/src/skin-bootstrap-n/ui.fancytree.css @@ -87,6 +87,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 0.5em; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-bootstrap/ui.fancytree.css b/src/skin-bootstrap/ui.fancytree.css index 979ecaff..07ca7c5e 100644 --- a/src/skin-bootstrap/ui.fancytree.css +++ b/src/skin-bootstrap/ui.fancytree.css @@ -87,6 +87,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 0.5em; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-common.less b/src/skin-common.less index af0d0e73..ad0b0aa7 100644 --- a/src/skin-common.less +++ b/src/skin-common.less @@ -176,6 +176,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: @fancy-icon-spacing; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-lion/ui.fancytree.css b/src/skin-lion/ui.fancytree.css index 2a69a444..c844357e 100644 --- a/src/skin-lion/ui.fancytree.css +++ b/src/skin-lion/ui.fancytree.css @@ -94,6 +94,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 3px; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-vista/ui.fancytree.css b/src/skin-vista/ui.fancytree.css index 305ce942..921e6e1c 100644 --- a/src/skin-vista/ui.fancytree.css +++ b/src/skin-vista/ui.fancytree.css @@ -104,6 +104,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 3px; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-win7/ui.fancytree.css b/src/skin-win7/ui.fancytree.css index eeb13bda..b558bc2d 100644 --- a/src/skin-win7/ui.fancytree.css +++ b/src/skin-win7/ui.fancytree.css @@ -88,6 +88,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 3px; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-win8-n/ui.fancytree.css b/src/skin-win8-n/ui.fancytree.css index 720e30ee..dc50e69a 100644 --- a/src/skin-win8-n/ui.fancytree.css +++ b/src/skin-win8-n/ui.fancytree.css @@ -88,6 +88,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 3px; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-win8-xxl/ui.fancytree.css b/src/skin-win8-xxl/ui.fancytree.css index 2a3c8893..8b8a423c 100644 --- a/src/skin-win8-xxl/ui.fancytree.css +++ b/src/skin-win8-xxl/ui.fancytree.css @@ -88,6 +88,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 6px; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-win8/ui.fancytree.css b/src/skin-win8/ui.fancytree.css index 7545bc8f..32a97f7f 100644 --- a/src/skin-win8/ui.fancytree.css +++ b/src/skin-win8/ui.fancytree.css @@ -88,6 +88,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 3px; } /* Used by 'icon' node option: */ img.fancytree-icon { diff --git a/src/skin-xp/ui.fancytree.css b/src/skin-xp/ui.fancytree.css index 401bfe68..8619375e 100644 --- a/src/skin-xp/ui.fancytree.css +++ b/src/skin-xp/ui.fancytree.css @@ -88,6 +88,7 @@ span.fancytree-custom-icon { /* Used by iconclass option and iconClass callback: */ span.fancytree-custom-icon { display: inline-block; + margin-left: 3px; } /* Used by 'icon' node option: */ img.fancytree-icon {