aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/tpl/theme_settings.tpl
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-09 20:47:29 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-09 20:47:29 -0700
commit328ed8bb1b5f73626a032091a78609aea312f5ae (patch)
tree1cb3dc14a29e42ce31ef9c4733b085dd7d410181 /view/theme/redbasic/tpl/theme_settings.tpl
parent1b0b847fc80827022c513a74a7fa817c7d640da0 (diff)
parentc78227292709f8f36206c7234dbf3548e476d442 (diff)
downloadvolse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.tar.gz
volse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.tar.bz2
volse-hubzilla-328ed8bb1b5f73626a032091a78609aea312f5ae.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/redbasic/tpl/theme_settings.tpl')
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl3
1 files changed, 2 insertions, 1 deletions
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 70b42b6cd..73e0f3476 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -24,6 +24,7 @@
{{include file="field_input.tpl" field=$comment_indent}}
{{include file="field_colorinput.tpl" field=$toolicon_colour}}
{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
+{{include file="field_colorinput.tpl" field=$genericcontent_bgcolour}}
{{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_colorinput.tpl" field=$font_colour}}
@@ -40,7 +41,7 @@
$('#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();
$('#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_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'});
+ $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour,#id_redbasic_genericcontent_bgcolour').colorpicker({format: 'rgba'});
});
</script>