diff options
Diffstat (limited to 'view/theme/redbasic')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 47 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 21 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/boxy.php | 19 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 13 |
5 files changed, 70 insertions, 36 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ba26f8910..f7df3bf52 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1542,21 +1542,6 @@ header { padding: 7px 7px 0px 0px; } - -#nav-notify-menu, #nav-network-menu, #nav-home-menu { - background-color: $notify_bgcolour; - border-top: none; - margin-top: $notify_topmargin; -} - -#nav-notify-menu a, #nav-network-menu a, #nav-home-menu a { - color: $notify_linkcolour; -} - -#nav-notify-menu a:hover, #nav-network-menu a:hover, #nav-home-menu a:hover { - background: $notify_bghover; -} - .notify-seen a { background: $notifyseen_bgcolour; color: $notifyseen_linkcolour !important; @@ -1911,29 +1896,45 @@ img.mail-list-sender-photo { .wall-item-content-wrapper:hover { z-index:99; } -/* .comment .wall-item-body { -padding-left: 42px; + padding-left: $comment_padding; } - */ + .hide-comments-outer, .wall-item-content-wrapper.comment { background-color: $comment_item_colour; - border-left: 1px solid $comment_border_colour; - border-right: 1px solid $comment_border_colour; - border-bottom: 1px solid $comment_border_colour; + border-left: $comment_border_left $comment_border_colour; + border-right: $comment_border_right $comment_border_colour; + + border-bottom: $comment_border_bottom $comment_border_colour; border-radius: 0px; padding: 7px 10px 7px 7px; } +/* +.thread-wrapper.toplevel_item{ + border-bottom: $comment_border_bottom $comment_border_colour; + border-right: $comment_border_right $item_colour; + border-left: $comment_border_left $item_colour; + + border-top-right-radius: $radiuspx; + border-top-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radiuspx; +} + */ .wall-item-comment-wrapper { background-color: $comment_item_colour; - border: 1px solid $item_colour; + /* border-top: $comment_border_top $item_colour; */ + border-right: $comment_border_right $item_colour; + border-left: $comment_border_left $item_colour; + border-bottom: $comment_border_bottom $item_colour; border-radius: 0px; border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; } + .wall-item-like, .wall-item-dislike { font-size: 11px; @@ -2118,8 +2119,6 @@ nav .dropdown-menu { border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; background-color: $notify_bgcolour; - border-top: none; - margin-top: $notify_topmargin; } nav .dropdown-menu .divider{ diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index a40fe67f2..6855c8c32 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -22,7 +22,7 @@ function theme_content(&$a) { $arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' ); $arr['comment_item_colour'] = get_pconfig(local_user(),'redbasic', 'comment_item_colour' ); $arr['comment_border_colour'] = get_pconfig(local_user(),'redbasic', 'comment_border_colour' ); - $arr['item_opacity'] = get_pconfig(local_user(),'redbasic', 'item_opacity' ); + $arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' ); $arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour'); $arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour'); $arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' ); @@ -60,7 +60,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']); set_pconfig(local_user(), 'redbasic', 'comment_item_colour', $_POST['redbasic_comment_item_colour']); set_pconfig(local_user(), 'redbasic', 'comment_border_colour', $_POST['redbasic_comment_border_colour']); - set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']); + set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']); set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); @@ -117,7 +117,7 @@ if(feature_enabled(local_user(),'expert')) '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']), '$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background colour of comments'), $arr['comment_item_colour']), '$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border colour of comments'), $arr['comment_border_colour']), - '$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']), + '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']), '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']), '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 698adaf4d..881ddcf4f 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -27,7 +27,7 @@ if(! $a->install) { $item_colour = get_pconfig($uid, "redbasic", "item_colour"); $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); - $item_opacity = get_pconfig($uid, "redbasic", "item_opacity"); + $comment_indent = get_pconfig($uid, "redbasic", "comment_indent"); $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); $font_size = get_pconfig($uid, "redbasic", "font_size"); $font_colour = get_pconfig($uid, "redbasic", "font_colour"); @@ -248,6 +248,17 @@ if(! $a->install) { $reply_photo = '32px'; if(! $infomess_bgcolour) $infomess_bgcolour = "#F0F0F0"; + if (!$comment_padding) + $comment_padding="0px"; + if (!$comment_border_left) + $comment_border_left="3px solid"; + if (!$comment_border_right) + $comment_border_right="0px solid"; + if (!$comment_border_top) + $comment_border_top="0px solid"; + if (!$comment_border_bottom) + $comment_border_bottom="0px solid"; + if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; @@ -289,7 +300,6 @@ $options = array ( '$item_colour' => $item_colour, '$comment_item_colour' => $comment_item_colour, '$comment_border_colour' => $comment_border_colour, -'$item_opacity' => $item_opacity, '$toolicon_colour' => $toolicon_colour, '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, @@ -357,7 +367,12 @@ $options = array ( '$pmenu_reply' => $pmenu_reply, '$wwtop' => $wwtop, '$comment_indent' => $comment_indent, -'$body_width' => $body_width +'$body_width' => $body_width, +'$comment_padding' => $comment_padding, +'$comment_border_left' =>$comment_border_left, +'$comment_border_right' =>$comment_border_right, +'$comment_border_top' =>$comment_border_top, +'$comment_border_bottom' =>$comment_border_bottom, ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php new file mode 100644 index 000000000..1de2f98cd --- /dev/null +++ b/view/theme/redbasic/schema/boxy.php @@ -0,0 +1,19 @@ +<?php + +if (!$comment_padding) + $comment_padding="42px"; + +if (!$comment_border_left) + $comment_border_left="1px solid"; + +if (!$comment_border_right) + $comment_border_right="1px solid"; + +if (!$comment_border_top) + $comment_border_top="1px solid"; + +if (!$comment_border_bottom) + $comment_border_bottom="1px solid"; +if (! $radiuspx) + $radiuspx = "4"; +
\ No newline at end of file diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index effdc6705..70b42b6cd 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -21,7 +21,7 @@ {{include file="field_colorinput.tpl" field=$item_colour}} {{include file="field_colorinput.tpl" field=$comment_item_colour}} {{include file="field_colorinput.tpl" field=$comment_border_colour}} -{{include file="field_input.tpl" field=$item_opacity}} +{{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_input.tpl" field=$body_font_size}} @@ -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"> |