aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/tpl
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-11 05:41:14 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-11 05:41:14 -0700
commit89faf23aacaaabf07ccf9a6c7b8f0af5b1e581bd (patch)
tree598928300196120d90a28aac79e57d213dd61779 /view/theme/redbasic/tpl
parent328ed8bb1b5f73626a032091a78609aea312f5ae (diff)
parentbde8c6d39e1ccf7a53569cc652a62b5447d3243f (diff)
downloadvolse-hubzilla-89faf23aacaaabf07ccf9a6c7b8f0af5b1e581bd.tar.gz
volse-hubzilla-89faf23aacaaabf07ccf9a6c7b8f0af5b1e581bd.tar.bz2
volse-hubzilla-89faf23aacaaabf07ccf9a6c7b8f0af5b1e581bd.zip
Merge branch 'master' of https://github.com/habeascodice/red
Diffstat (limited to 'view/theme/redbasic/tpl')
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl3
1 files changed, 1 insertions, 2 deletions
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 73e0f3476..70b42b6cd 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -24,7 +24,6 @@
{{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}}
@@ -41,7 +40,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,#id_redbasic_genericcontent_bgcolour').colorpicker({format: 'rgba'});
+ $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
});
</script>