diff options
| author | friendica <info@friendica.com> | 2014-10-10 14:12:03 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-10 14:12:03 -0700 |
| commit | 82d4d156ead2c85fe2c4af9da49837d53ebb3438 (patch) | |
| tree | cc9979512081a6ac80dd6e8fde368799571c379b /view/theme/redbasic/tpl/theme_settings.tpl | |
| parent | 0991a5a494efcd1357e37a1144feb30b586ad891 (diff) | |
| parent | f8aabd376b563b7f336f944458b84289ef2954b3 (diff) | |
| download | volse-hubzilla-82d4d156ead2c85fe2c4af9da49837d53ebb3438.tar.gz volse-hubzilla-82d4d156ead2c85fe2c4af9da49837d53ebb3438.tar.bz2 volse-hubzilla-82d4d156ead2c85fe2c4af9da49837d53ebb3438.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/theme/redbasic/tpl/theme_settings.tpl')
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 3 |
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> |