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

hyoo-ru · Apr 24, 2024 · 4f10137 · 4f10137
2 parents 8dd71f3 + 2122173
commit 4f10137
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/catalog/catalog.view.css b/catalog/catalog.view.css
@@ -26,7 +26,7 @@
 }
 
 [hyoo_toys_catalog_goods] {
-	align-items: stretch;
+	align-items: flex-start;
 	min-height: 1rem;
 	padding: .375rem;
 }
@@ -46,6 +46,8 @@
 	flex: 0 0 14rem;
 	width: 100%;
 	aspect-ratio: 1;
+	object-fit: scale-down;
+	background: white;
 }
 
 [hyoo_toys_catalog_toy_main] {

diff --git a/toys.view.tree b/toys.view.tree
@@ -1,6 +1,6 @@
 $hyoo_toys $mol_book2
 	attr * mol_theme \$mol_theme_dark
-	toy!id $hyoo_toys_toy
+	toy* $hyoo_toys_toy
 	Placeholder null
 	plugins /
 		<= Hotkey $mol_hotkey
@@ -11,26 +11,26 @@ $hyoo_toys $mol_book2
 		body /
 			<= Filter_type $mol_switch
 				value?val <=> filter_type?val \all
-				options <= filter_type_options *
+				options <= filter_type_options *string
 					all <= filter_type_option_all @ \All types
 			<= Filter_size $mol_switch
 				value?val <=> filter_size?val \all
-				options <= filter_size_options *
+				options <= filter_size_options *string
 					all <= filter_size_option_all @ \All sizes
 			<= Filter_flags $mol_list rows /
 				<= Filter_popular $mol_check
 					checked?val <=> filter_popular?val false
 					title <= filter_popular_title @ \Only popular
 			<= Sort $mol_switch
 				value?val <=> sort_key?val \price
-				options <= sort_items *
+				options <= sort_items *string
 					price <= sort_option_price @ \Sort by price
 					size <= sort_option_size @ \Sort by size
 					title <= sort_option_title @ \Sort by title
 	Catalog $hyoo_toys_catalog
 		title @ \Toys for all
 		toys <= toys /
-		toy!id <= toy!id -
+		toy* <= toy* -
 		filter_type <= filter_type
 		filter_size <= filter_size
 		filter_popular <= filter_popular