diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 86 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 32 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 24 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/boxy.php | 19 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 13 |
7 files changed, 94 insertions, 90 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ba26f8910..262819469 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -535,6 +535,12 @@ aside li { font-size: 0.7em; } +.app-name { + width: 125px; + overflow: none; +} + + .pager { padding: 10px; text-align: center; @@ -1180,6 +1186,9 @@ brain is weird like that */ margin-bottom: 15px; } +#cloud-index td { + padding:5px; +} /** @@ -1542,21 +1551,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; @@ -1856,11 +1850,11 @@ img.mail-list-sender-photo { } #profile-jot-text::-webkit-input-placeholder { - font-size:1.5em; + font-size:18px; } #profile-jot-text::-moz-placeholder { - font-size:1.5em; + font-size:18px; } #profile-jot-text:focus::-webkit-input-placeholder { @@ -1899,7 +1893,6 @@ img.mail-list-sender-photo { .wall-item-content-wrapper { background-color: $item_colour; - opacity: $item_opacity; padding: 10px; } @@ -1908,30 +1901,31 @@ img.mail-list-sender-photo { border-top-left-radius: $radiuspx; } -.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; } .wall-item-comment-wrapper { - background-color: $comment_item_colour; - border: 1px solid $item_colour; + padding: 7px 10px; + background-color: $item_colour; border-radius: 0px; border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; + margin-top: 3px; +} + +.wall-item-comment-wrapper-wc { + margin-top: 0px; } .wall-item-like, @@ -1980,37 +1974,15 @@ padding-left: 42px; color: $toolicon_colour; } -.item-tool:hover { - /*color: $toolicon_activecolour;*/ -} - .like-rotator { color: $toolicon_colour; } -.my-comment-photo { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; -} - -.comment-edit-photo img { - width: $reply_photo; -} - -[class^="comment-edit-bb"] { - list-style: none; -} - .comment-icon { - font-size: 1.2em; + font-size: 0.8em; color: $toolicon_colour; } -.comment-icon:hover { - color: $toolicon_activecolour; -} - .comment-edit-text-empty, .comment-edit-text-full { border: 1px solid #ccc; @@ -2019,6 +1991,7 @@ padding-left: 42px; .comment-edit-text-empty { color: gray; + font-size: 11px; } .comment-edit-text-full { @@ -2118,8 +2091,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{ @@ -2263,7 +2234,6 @@ blockquote { .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ border:1px solid $navtabs_borderc; - border-bottom:1px solid transparent; } .nav-tabs.nav-justified > li > a { @@ -2274,7 +2244,6 @@ blockquote { text-decoration: $navtabs_decohover; background-color: $navtabs_bgchover; border-color: transparent; - border-bottom-color: $navtabs_borderc; $navtabs_linkchover } @@ -2299,7 +2268,7 @@ blockquote { .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { background-color: $editbuttons_bghover; - border-color: $editbuttons_bordercolour; + border-color: $editbuttons_bordercolourhover; color: $input_colourhover; text-decoration: $input_decohover; } @@ -2308,9 +2277,6 @@ blockquote { text-decoration: none; } -.btn-preview, .btn-preview:hover, .btn-preview:focus, .btn-preview:active { - margin-right: 1px; -} @media screen and (max-width: 767px) { aside#region_1 { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 20902fe1a..58acc1b95 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -1,23 +1,23 @@ -function cmtBbOpen(comment, id) { - if($(comment).hasClass('comment-edit-text-full')) { - $(".comment-edit-bb-" + id).show(); - return true; - } - return false; +function commentOpenRedbasic(obj,id) { + $(document).click(function() { + if(obj.value == aStr['comment']) { + obj.value = ''; + $("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty"); + $("#comment-tools-" + id).show(); + } + }); } -function cmtBbClose(comment, id) { -// if($(comment).hasClass('comment-edit-text-empty')) { -// $(".comment-edit-bb-" + id).hide(); -// return true; -// } - return false; +function commentCloseRedbasic(obj,id) { + $(document).click(function() { + if(obj.value == '') { + obj.value = aStr['comment']; + $("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty"); + $("#comment-tools-" + id).hide(); + } + }); } -//document.jotpermslock = 'icon-lock'; -//document.jotpermsunlock = 'icon-unlock'; - - $(document).ready(function() { $('#expand-aside').click(function() { 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..950b43198 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"); @@ -167,6 +167,8 @@ if(! $a->install) { $editbuttons_bgcolour = "transparent"; if (! $editbuttons_bordercolour) $editbuttons_bordercolour = "#ccc"; + if (! $editbuttons_bordercolourhover) + $editbuttons_bordercolourhover = "#adadad"; if (! $editbuttons_colour) $editbuttons_colour = "#333"; if (! $editbuttons_bghover) @@ -248,6 +250,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 +302,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, @@ -312,6 +324,7 @@ $options = array ( '$notif_itemhovercolour' => $notif_itemhovercolour, '$editbuttons_bgcolour' => $editbuttons_bgcolour, '$editbuttons_bordercolour' => $editbuttons_bordercolour, +'$editbuttons_bordercolourhover' => $editbuttons_bordercolourhover, '$editbuttons_colour' => $editbuttons_colour, '$editbuttons_bghover' => $editbuttons_bghover, '$dropdown_bgcolour' => $dropdown_bgcolour, @@ -357,7 +370,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/schema/dark.php b/view/theme/redbasic/schema/dark.php index 4da020116..4bf22db78 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -71,13 +71,13 @@ if (! $code_bgcolour) $code_bgcolour = "#000"; if (! $code_txtcolour) - $code_txtcolour = "#bbb"; + $code_txtcolour = "#fff"; if (! $pre_borderc) $pre_borderc = "#090909"; if (! $pre_bgcolour) $pre_bgcolour = "#000"; if (! $pre_txtcolour) - $pre_txtcolour = "#bbb"; + $pre_txtcolour = "#fff"; if (! $item_bordercolour) $item_bordercolour = "#333"; if (! $notif_itemcolour) 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"> |