diff options
author | friendica <info@friendica.com> | 2014-05-14 17:11:35 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-05-14 17:11:35 -0700 |
commit | 5660e31459cb89724323b4cf5997cdda0a73c4e6 (patch) | |
tree | b446305d2cdb31b9482a53ae35d6ee7da6cd63b8 | |
parent | 9af818b133202ce1a6dc8c2785d42a34b899e47c (diff) | |
parent | ce25601ed0ac252b35e42326a5ef28706557d983 (diff) | |
download | volse-hubzilla-5660e31459cb89724323b4cf5997cdda0a73c4e6.tar.gz volse-hubzilla-5660e31459cb89724323b4cf5997cdda0a73c4e6.tar.bz2 volse-hubzilla-5660e31459cb89724323b4cf5997cdda0a73c4e6.zip |
Merge https://github.com/friendica/red into pending_merge
-rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index b6573af8c..70b42b6cd 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -36,11 +36,12 @@ {{include file="field_input.tpl" field=$reply_photo}} {{include file="field_checkbox.tpl" field=$sloppy_photos}} <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(); - $('#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_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour,#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker(); - }); + $(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(); + $('#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'}); + }); </script> <div class="settings-submit-wrapper"> |