commit cc3ec05fb968486764b6d84449f7818d592da6cc
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2022-08-02T15:17:51Z |
|---|
| subject | Fixed some css inheritence order |
|---|
commit cc3ec05fb968486764b6d84449f7818d592da6cc
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2022-08-02T15:17:51Z
Fixed some css inheritence order
---
botanjs/service/jclassresv.py | 11 ++++++++---
botanjs/src/Astro/Starfall/Element/Header.js | 1 +
botanjs/src/externs/Libraries.SyntaxHighLighter.js | 1 +
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/botanjs/service/jclassresv.py b/botanjs/service/jclassresv.py
index f43636e..d030e38 100644
--- a/botanjs/service/jclassresv.py
+++ b/botanjs/service/jclassresv.py
@@ -173,8 +173,9 @@ class BotanClassResolver:
cssFile = os.path.splitext( f )[0] + ".css"
+ cssGroup = []
if not cdef[ "css" ] == "1":
- cssList.append( cdef )
+ cssGroup.append( cdef )
f = f.split( PY_SEP )
l = len( f )
@@ -184,9 +185,13 @@ class BotanClassResolver:
_def = self.resv.locate( key )
if _def and not _def[ "css" ] == "1":
- cssList.append( _def )
+ cssGroup.append( _def )
- cssList.sort( key = lambda x : x[ "src" ] )
+ cssGroup.sort( key = lambda x : x[ "src" ] )
+ cssList.extend( cssGroup )
+
+ for k in cssList:
+ print( k[ "src" ] )
def getCache( self, fileList, cName, mode ):
diff --git a/botanjs/src/Astro/Starfall/Element/Header.js b/botanjs/src/Astro/Starfall/Element/Header.js
index 3c369c5..3b7455b 100644
--- a/botanjs/src/Astro/Starfall/Element/Header.js
+++ b/botanjs/src/Astro/Starfall/Element/Header.js
@@ -1 +1,2 @@
// __namespace( "Astro.Starfall.Element.Header" );
+// __import( "Astro.Bootstrap" );
diff --git a/botanjs/src/externs/Libraries.SyntaxHighLighter.js b/botanjs/src/externs/Libraries.SyntaxHighLighter.js
index 5d71f54..e17140a 100644
--- a/botanjs/src/externs/Libraries.SyntaxHighLighter.js
+++ b/botanjs/src/externs/Libraries.SyntaxHighLighter.js
@@ -1,4 +1,5 @@
/** @constructor */
+SyntaxHighlighter = {};
Libraries.SyntaxHighlighter = function (){};
/** @type {Function} */