mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 17:21:39 +09:00
Merge branch 'rhymix:master' into master
This commit is contained in:
commit
2fd8df9de6
57 changed files with 384 additions and 162 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<load target="./js/content_widget.js" cond="$widget_info->page_count || (is_countable($widget_info->tab) && count($widget_info->tab))" />
|
||||
<!--// Check layout. If it is Simple World, select layout primary colors as a primary color of this skin -->
|
||||
{@$layout_info = Context::get('layout_info')}
|
||||
{@$layout_info = Context::get('layout_info') ?? new stdClass();}
|
||||
<block cond="$layout_info->extra_var->primary_color->type === 'select' || $layout_info->extra_var->customized_primary_color->type === 'colorpicker'">
|
||||
{@
|
||||
if(!$layout_info->primary_color)
|
||||
|
|
@ -85,4 +85,4 @@
|
|||
<!--@end-->
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue