aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/tpl/theme_settings.tpl
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-26 14:40:20 -0700
committerzotlabs <mike@macgirvin.com>2017-03-26 14:40:20 -0700
commit5cbf60320355845e2abdec0422055d3fe321e84e (patch)
tree76f88c1ef52a9f05582e0b3fac4267ab3683db73 /view/theme/redbasic/tpl/theme_settings.tpl
parentdc59817a9d683d9a262397f3b4d6909e44779847 (diff)
parentc327b00efa7807374776a341a7cec4023f61497b (diff)
downloadvolse-hubzilla-5cbf60320355845e2abdec0422055d3fe321e84e.tar.gz
volse-hubzilla-5cbf60320355845e2abdec0422055d3fe321e84e.tar.bz2
volse-hubzilla-5cbf60320355845e2abdec0422055d3fe321e84e.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/theme/redbasic/tpl/theme_settings.tpl')
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl14
1 files changed, 3 insertions, 11 deletions
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 3d748464c..f90e37ac3 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -4,14 +4,9 @@
{{include file="field_input.tpl" field=$font_size}}
{{if $expert}}
{{include file="field_colorinput.tpl" field=$nav_bg}}
- {{include file="field_colorinput.tpl" field=$nav_gradient_top}}
- {{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
- {{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
- {{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
- {{include file="field_colorinput.tpl" field=$nav_bd}}
{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
- {{include file="field_input.tpl" field=$nav_min_opacity}}
+ {{include file="field_colorinput.tpl" field=$banner_colour}}
{{include file="field_colorinput.tpl" field=$bgcolour}}
{{include file="field_colorinput.tpl" field=$background_image}}
{{include file="field_colorinput.tpl" field=$item_colour}}
@@ -20,9 +15,6 @@
{{*include file="field_input.tpl" field=$comment_indent*}}
{{include file="field_colorinput.tpl" field=$font_colour}}
{{include file="field_colorinput.tpl" field=$link_colour}}
- {{include file="field_colorinput.tpl" field=$banner_colour}}
- {{include file="field_colorinput.tpl" field=$toolicon_colour}}
- {{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
{{include file="field_input.tpl" field=$radius}}
{{include file="field_input.tpl" field=$shadow}}
{{include file="field_input.tpl" field=$top_photo}}
@@ -30,8 +22,8 @@
<script>
$(function(){
- $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'});
- $('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
+ $('#id_redbasic_nav_bg, #id_redbasic_nav_icon_colour, #id_redbasic_nav_active_icon_colour, #id_redbasic_banner_colour').colorpicker({format: 'rgba'});
+ $('#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
$('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
});