Merge branch 'master' of github.com:hyoo-ru/mam_mol

build/build.node.ts

@@ -864,7 +864,7 @@ namespace $ {
 			if( !bundle || bundle === 'readme.md' ) {
 				res = res.concat( this.bundleReadmeMd( { path , exclude : [ 'web' ] } ) )
 			}
-			
+
 			if( !bundle || bundle === 'index.html' ) {
 				res = res.concat( this.bundleIndexHtml( { path } ) )
 			}
@@ -1302,14 +1302,23 @@ namespace $ {
 
 			const start = Date.now()
 			const html = pack.resolve( 'index.html' )
+			const tree = pack.resolve( 'index.xml.tree' )
+			const target = pack.resolve( '-/index.html' )
+
+			if( tree.exists() ) {
+				const xml_tree = this.$.$mol_tree2_from_string( tree.text() )
+				const text = this.$.$mol_tree2_xml_to_text( xml_tree )
+				const xml = this.$.$mol_tree2_text_to_string( text )
+				target.text( xml )
+			} else if( html.exists() ) {
+				target.text( html.text() )
+			}
 
-			if ( html.exists() ) {
-				const html_target = pack.resolve( '-/index.html' )
-				html_target.text( html.text() )
-				targets.push( html_target )
-				this.logBundle( html_target , Date.now() - start )	
+			if( target.exists() ) {
+				targets.push( target )
+				this.logBundle( target, Date.now() - start )
 			}
-			
+
 			return targets
 		}
 

scroll/scroll.view.css.ts

@@ -2,14 +2,10 @@ namespace $.$$ {
 
 	const { per , rem , px } = $mol_style_unit
 
-	$mol_style_define( $mol_scroll , {
-		overflow: 'auto',
-	} )
-
 	$mol_style_define( $mol_scroll , {
 
 		display: 'flex',
-		overflow: 'overlay',
+		overflow: 'auto',
 		flex: {
 			direction: 'column',
 			grow: 1,
@@ -46,13 +42,6 @@ namespace $.$$ {
 			height: rem(.25),
 		},
 
-		':hover': {
-			'::-webkit-scrollbar': {
-				width: rem(.5),
-				height: rem(.5),
-			},
-		},
-
 		'@media' : {
 			'print' : {
 				overflow: 'visible',