From 21c079684741590d8b8071ed81ee8d40440533dd Mon Sep 17 00:00:00 2001 From: hengsin Date: Mon, 5 Sep 2022 14:12:29 +0800 Subject: [PATCH] Sync with billboard version. Fix a css conflict with zk. --- org.idempiere.zk.billboard/META-INF/MANIFEST.MF | 2 +- org.idempiere.zk.billboard/README.md | 2 ++ org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml | 5 ++++- .../src/org/idempiere/zk/billboard/Version.java | 2 +- .../src/web/js/zul/billboard/css/billboard.css | 6 +++--- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/org.idempiere.zk.billboard/META-INF/MANIFEST.MF b/org.idempiere.zk.billboard/META-INF/MANIFEST.MF index 3687477..ff68153 100644 --- a/org.idempiere.zk.billboard/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.billboard/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Billboard Bundle-SymbolicName: org.idempiere.zk.billboard -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 3.5.1.qualifier Bundle-Vendor: iDempiere Fragment-Host: org.adempiere.ui.zk;bundle-version="8.2.0" Automatic-Module-Name: org.idempiere.zk.billboard diff --git a/org.idempiere.zk.billboard/README.md b/org.idempiere.zk.billboard/README.md index fbef136..7e9d713 100644 --- a/org.idempiere.zk.billboard/README.md +++ b/org.idempiere.zk.billboard/README.md @@ -3,3 +3,5 @@ 1. Wrap https://github.com/naver/billboard.js as zk component. 2. To update, replace billboard.pkgd.js and billboard.pkgd.src.js with latest billboard.pkgd.js and billboard.pkgd.min.js from https://github.com/naver/billboard.js (Note that due to naming convention of zk, billboard.pkgd.js=billboard.pkgd.min.js and billboard.pkgd.src.js=billboard.pkgd.js ). + +3. To update, replace billboard.css with latest billboard.css from https://github.com/naver/billboard.js. Add !important to padding and text-align of .bb-tooltip th and padding of .bb-tooltip td to fix conflict with zk css diff --git a/org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml b/org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml index 458bdbd..22391a8 100644 --- a/org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml +++ b/org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml @@ -6,7 +6,7 @@ xul/html org.idempiere.zk.billboard.Version - 3.5.1.202200901 + 3.5.1.20220905 billboard @@ -19,4 +19,7 @@ + + + \ No newline at end of file diff --git a/org.idempiere.zk.billboard/src/org/idempiere/zk/billboard/Version.java b/org.idempiere.zk.billboard/src/org/idempiere/zk/billboard/Version.java index 581667e..28d5577 100644 --- a/org.idempiere.zk.billboard/src/org/idempiere/zk/billboard/Version.java +++ b/org.idempiere.zk.billboard/src/org/idempiere/zk/billboard/Version.java @@ -32,5 +32,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "3.5.1.202200901"; + public static final String UID = "3.5.1.20220905"; } diff --git a/org.idempiere.zk.billboard/src/web/js/zul/billboard/css/billboard.css b/org.idempiere.zk.billboard/src/web/js/zul/billboard/css/billboard.css index 6288453..a786873 100644 --- a/org.idempiere.zk.billboard/src/web/js/zul/billboard/css/billboard.css +++ b/org.idempiere.zk.billboard/src/web/js/zul/billboard/css/billboard.css @@ -150,12 +150,12 @@ .bb-tooltip th { background-color: #aaa; font-size: 14px; - padding: 2px 5px; - text-align: left; + padding: 2px 5px !important; + text-align: left !important; color: #FFF; } .bb-tooltip td { font-size: 13px; - padding: 3px 6px; + padding: 3px 6px !important; background-color: #fff; border-left: 1px dotted #999; } .bb-tooltip td > span, .bb-tooltip td > svg {