diff options
Diffstat (limited to 'view/theme/redbasic')
19 files changed, 139 insertions, 192 deletions
diff --git a/view/theme/redbasic/css/align_left.css b/view/theme/redbasic/css/align_left.css new file mode 100644 index 000000000..acb2893e3 --- /dev/null +++ b/view/theme/redbasic/css/align_left.css @@ -0,0 +1,8 @@ +main { + margin-left: 0px; +} + +aside#region_3 { + width: auto; + padding: 0px 0px 0px 0px; +} diff --git a/view/theme/redbasic/css/converse_center.css b/view/theme/redbasic/css/converse_center.css deleted file mode 100644 index 9b4246a5b..000000000 --- a/view/theme/redbasic/css/converse_center.css +++ /dev/null @@ -1,10 +0,0 @@ -main { - margin-left: auto; - margin-right: auto; -} - -aside#region_3 { - width: $aside_widthpx; - min-width: $aside_widthpx; - max-width: $aside_widthpx; -} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 702c7238e..b25ca333b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -24,13 +24,15 @@ body { height: 100%; } -aside#region_1 { +aside { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; } main { + margin-left: auto; + margin-right: auto; max-width: $main_widthpx; } @@ -127,7 +129,7 @@ pre code { code { font-size: 1em; - padding: 5px; + padding: 1em; border: 1px solid #ccc; background: #ccc; color: #000; @@ -199,13 +201,14 @@ nav #banner #logo-text a:hover { text-decoration: none; } .nav-channel-select { margin-left: 8px; } header #banner { -/* overflow: hidden; */ - text-align: center; - font-size: 14px; - font-family: tahoma, "Lucida Sans", sans; - color: $banner_colour; - font-weight: bold; - margin-top: 14px; + z-index: 1040; + margin-top: 14px; + text-align: center; + font-size: 14px; + font-family: tahoma, "Lucida Sans", sans; + color: $banner_colour; + font-weight: bold; + whitespace: nowrap; } header #banner a, @@ -213,15 +216,17 @@ header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: #FFF; - text-decoration: none; - outline: none; - vertical-align: bottom; + color: $banner_colour; + text-decoration: none; + outline: none; + vertical-align: bottom; } + header #banner #logo-img { height: 22px; margin-top: 5px; } + header #banner #logo-text { font-size: 22px; } @@ -347,7 +352,7 @@ footer { .vcard { margin-bottom: 10px; padding: 10px; - background-color: $comment_item_colour; + background-color: rgba(254,254,254,0.5); border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; @@ -698,7 +703,7 @@ a.rateme, div.rateme { #contact-block { width: 100%; float: left; - background-color: $comment_item_colour; + background-color: rgba(254,254,254,0.5); border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; @@ -751,8 +756,7 @@ a.rateme, div.rateme { } .wall-item-conv { - padding-top: 5px; - padding-bottom: 10px; + padding: 7px 10px; } @@ -1301,15 +1305,8 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { padding: 0; } -/* header */ -header { - position: fixed; - left: 43%; - right: 43%; - margin: 0px; - padding: 0px; - z-index: 1040; - color: #fff; +.widget .conv-participants { + color: $font_colour; } .notif-item a { @@ -1435,7 +1432,10 @@ header { .profile-match-connect { margin-top: 5px; } .reshared-content { margin-left: 20px; } -.shared_header img { margin-right: 10px; } +.shared_header img { + border-radius: $radiuspx; + margin-right: 10px; +} .tag1 { font-size : 0.9em !important; @@ -1529,22 +1529,6 @@ a .drop-icons:hover { margin-right: 10px; color: #FF0000; } - -.attachlink { - float: left; - border: 1px solid black; - padding: 5px; - margin-right: 8px; -} - -.attach-icons { - font-size: 1.4em; -} - -.attach-clip { - margin-right: 3px; - font-size: 1.8em; -} #menulist { list-style-type: none; @@ -1568,9 +1552,9 @@ th,td { overflow: hidden; } -/* message */ +/* mail */ -img.mail-list-sender-photo { +img.mail-conv-sender-photo { -moz-border-radius: $radiuspx; border-radius: $radiuspx; } @@ -1638,45 +1622,43 @@ img.mail-list-sender-photo { /* conversation */ -.wall-item-title { - font-size: $font_size; +.wall-item-head { + padding: 10px 10px 0px 10px; } -.hide-comments-outer, -.thread-wrapper .wall-item-comment-wrapper, -.wall-item-content-wrapper.comment { - margin-left: $comment_indent; +.wall-item-content { + padding: 1em 10px; +} + +.wall-photo-item { + padding: 10px 0px; +} + +.wall-item-tools { + padding: 0px 10px 10px 10px; +} + + +.wall-item-title { + font-size: $font_size; } .wall-item-content-wrapper { background-color: $item_colour; - padding: 10px; border-top-right-radius: $radiuspx; border-top-left-radius: $radiuspx; } -.generic-content-wrapper-styled { - background-color: $comment_item_colour; - padding: 10px; - border-radius: $radiuspx; -} - .wall-item-content-wrapper.comment { background-color: $comment_item_colour; - border-color: $comment_border_colour; - border-style: solid; - border-width: 0px 0px 0px 3px; - border-radius: 0px; - padding: 7px 10px 7px 7px; } .hide-comments-outer { background-color: $comment_item_colour; - border-color: $comment_border_colour; border-top-color: #ccc; border-style: solid; border-top-style: dashed; - border-width: 1px 0px 0px 3px; + border-width: 1px 0px 0px 0px; text-align: center; border-radius: 0px; } @@ -1731,6 +1713,7 @@ img.mail-list-sender-photo { } .wall-item-content, +.mail-conv-body, .page-body { font-size: $font_size; clear: both; @@ -1786,7 +1769,7 @@ img.mail-list-sender-photo { /* widgets */ .widget { - background-color: $comment_item_colour; + background-color: rgba(254,254,254,0.5); border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; @@ -1867,6 +1850,19 @@ nav .dropdown-menu { margin: 7px 0px; } +.generic-content-wrapper-styled { + background-color: $bgcolour; + padding: 10px; + border-radius: $radiuspx; +} + +.generic-content-wrapper { + border: 1px solid #ccc; + box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); + border-radius: $radiuspx; + background-color: #fff; +} + .section-title-wrapper { padding: 7px 10px; background-color: $item_colour; @@ -2296,3 +2292,11 @@ nav .badge.mail-update:hover { /*.channels_ckbx, .pending_ckbx, .users_ckbx { margin-top: -5px !important; }*/ + +.help-searchlist { + list-style-type: none; +} + +.help-searchlist a { + font-size: 130%; +} diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index c0b2b6da9..6bea5bddb 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -31,7 +31,7 @@ function theme_content(&$a) { $arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' ); $arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' ); $arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width"); - $arr['converse_center']=get_pconfig(local_channel(),"redbasic","converse_center"); + $arr['align_left']=get_pconfig(local_channel(),"redbasic","align_left"); $arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity"); $arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo"); $arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo"); @@ -68,7 +68,7 @@ function theme_post(&$a) { set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); - set_pconfig(local_channel(), 'redbasic', 'converse_center', $_POST['redbasic_converse_center']); + set_pconfig(local_channel(), 'redbasic', 'align_left', $_POST['redbasic_align_left']); set_pconfig(local_channel(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); @@ -79,7 +79,7 @@ function theme_post(&$a) { function redbasic_form(&$a, $arr) { $scheme_choices = array(); - $scheme_choices["---"] = t("Light (Red Matrix default)"); + $scheme_choices["---"] = t("Focus (Hubzilla default)"); $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { @@ -126,7 +126,7 @@ if(feature_enabled(local_channel(),'expert')) '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), - '$converse_center' => array('redbasic_converse_center',t('Center page content'),$arr['converse_center'], '', array(t('No'),t('Yes'))), + '$align_left' => array('redbasic_align_left',t('Left align page content'),$arr['align_left'], '', array(t('No'),t('Yes'))), '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 96dba59e5..a0da5e302 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -36,7 +36,7 @@ if(! $a->install) { $radius = get_pconfig($uid, "redbasic", "radius"); $shadow = get_pconfig($uid,"redbasic","photo_shadow"); $converse_width=get_pconfig($uid,"redbasic","converse_width"); - $converse_center=get_pconfig($uid,"redbasic","converse_center"); + $align_left=get_pconfig($uid,"redbasic","align_left"); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); @@ -107,15 +107,15 @@ if (! $link_colour) if (! $banner_colour) $banner_colour = "#fff"; if (! $bgcolour) - $bgcolour = "#fdfdfd"; + $bgcolour = "rgb(254,254,254)"; if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "rgba(238,238,238,0.8)"; + $item_colour = "rgb(238,238,238)"; if (! $comment_item_colour) - $comment_item_colour = "rgba(254,254,254,0.4)"; + $comment_item_colour = "rgb(255,255,255)"; if (! $comment_border_colour) - $comment_border_colour = "rgba(238,238,238,0.8)"; + $comment_border_colour = "rgb(255,255,255)"; if (! $toolicon_colour) $toolicon_colour = '#777'; if (! $toolicon_activecolour) @@ -133,7 +133,7 @@ if (! $radius) if (! $shadow) $shadow = "0"; if (! $converse_width) - $converse_width = "1024"; + $converse_width = "790"; if(! $top_photo) $top_photo = '48px'; if(! $comment_indent) @@ -156,12 +156,12 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $aside_width = 285; - // left aside and right aside are is 231px + converse width - if($converse_center) { - $main_width = (($aside_width * 2) + intval($converse_width)); + // left aside and right aside are 285px + converse width + if($align_left) { + $main_width = (($aside_width) + intval($converse_width)); } else { - $main_width = (($aside_width) + intval($converse_width)); + $main_width = (($aside_width * 2) + intval($converse_width)); } // prevent main_width smaller than 768px $main_width = (($main_width < 768) ? 768 : $main_width); @@ -209,9 +209,8 @@ if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); } -if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) { - $cc = file_get_contents('view/theme/redbasic/css/converse_center.css'); - echo str_replace(array_keys($options), array_values($options), $cc); +if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { + echo file_get_contents('view/theme/redbasic/css/align_left.css'); } if($schemecss) { diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index e68533bb4..f0679a532 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -2,7 +2,7 @@ /** * * Name: Redbasic - * * Description: RedMatrix standard theme + * * Description: Hubzilla standard theme * * Version: 1.0 * * Author: Fabrixxm * * Maintainer: Mike Macgirvin diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css index f3da9b262..ad3e587f0 100644 --- a/view/theme/redbasic/schema/boxy.css +++ b/view/theme/redbasic/schema/boxy.css @@ -3,9 +3,9 @@ } .wall-item-content-wrapper.comment { - border-width: 0px 1px 1px 1px; + border-width: 0px 0px 1px 0px; } .hide-comments-outer { - border-width: 1px 1px 1px 1px; + border-width: 1px 0px 1px 0px; } diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php index d609ccd25..f298a0def 100644 --- a/view/theme/redbasic/schema/boxy.php +++ b/view/theme/redbasic/schema/boxy.php @@ -2,3 +2,5 @@ if (! $radiuspx) $radiuspx = "4"; +if (! $comment_border_colour) + $comment_border_colour = "rgb(238,238,238)"; diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 02ee4707e..4e8e23de5 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -1,4 +1,10 @@ +.generic-content-wrapper { + border: 1px solid #111; + background-color: transparent; +} + .vcard, #contact-block, .widget { + background-color: transparent; border-bottom: 1px solid #fff; } diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 92e703325..af4b122f1 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -34,5 +34,8 @@ $toolicon_activecolour = '#fff'; if (! $font_colour) $font_colour = "#ccc"; + if (! $converse_width) + $converse_width = "1024"; + diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css deleted file mode 100644 index ea983ffc8..000000000 --- a/view/theme/redbasic/schema/focus.css +++ /dev/null @@ -1,22 +0,0 @@ -.generic-content-wrapper { - border: 1px solid #ccc; - box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); - border-radius: 4px; - background-color: #fff; -} - -.wall-item-content-wrapper.comment { - background-color: #fff; -} - -.section-content-tools-wrapper, -.section-content-wrapper, -.section-content-wrapper-np, -.hide-comments-outer { - background-color: #fff; -} - -.wall-item-conv { - padding-top: 10px; - padding-left: 10px; -} diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php deleted file mode 100644 index 1f1963764..000000000 --- a/view/theme/redbasic/schema/focus.php +++ /dev/null @@ -1,63 +0,0 @@ -<?php -if (! $nav_bg) - $nav_bg = "#222"; -if (! $nav_gradient_top) - $nav_gradient_top = "#3c3c3c"; -if (! $nav_gradient_bottom) - $nav_gradient_bottom = "#222"; -if (! $nav_active_gradient_top) - $nav_active_gradient_top = "#222"; -if (! $nav_active_gradient_bottom) - $nav_active_gradient_bottom = "#282828"; -if (! $nav_bd) - $nav_bd = "#222"; -if (! $nav_icon_colour) - $nav_icon_colour = "#999"; -if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#fff"; -if (! $link_colour) - $link_colour = "#337AB7"; -if (! $banner_colour) - $banner_colour = "#fff"; -if (! $bgcolour) - $bgcolour = "#fdfdfd"; -if (! $background_image) - $background_image =''; -if (! $item_colour) - $item_colour = "rgb(238,238,238)"; -if (! $comment_item_colour) - $comment_item_colour = "rgba(254,254,254,0.4)"; -if (! $comment_border_colour) - $comment_border_colour = "transparent"; -if (! $toolicon_colour) - $toolicon_colour = '#777'; -if (! $toolicon_activecolour) - $toolicon_activecolour = '#000'; -if (! $item_opacity) - $item_opacity = "1"; -if (! $font_size) - $font_size = "0.9rem"; -if (! $body_font_size) - $body_font_size = "0.75rem"; -if (! $font_colour) - $font_colour = "#4d4d4d"; -if (! $radius) - $radius = "4"; -if (! $shadow) - $shadow = "0"; -if (! $converse_width) - $converse_width = "790"; -if(! $top_photo) - $top_photo = '48px'; -if(! $comment_indent) - $comment_indent = '0px'; -if(! $reply_photo) - $reply_photo = '32px'; -if($nav_min_opacity === false || $nav_min_opacity === '') { - $nav_float_min_opacity = 1.0; - $nav_percent_min_opacity = 100; -} -else { - $nav_float_min_opacity = (float) $nav_min_opacity; - $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; -} diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index c00f3c260..f69ba3450 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -1,4 +1,10 @@ +.generic-content-wrapper { + border: 1px solid #fff; + background-color: transparent; +} + .vcard, #contact-block, .widget { + background-color: transparent; border-bottom: 1px solid #fff; } diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 6853a0ed5..554e832f0 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -34,6 +34,9 @@ $comment_border_colour = "rgba(255,255,255,0.8)"; if (! $font_colour) $font_colour = "#000"; + if (! $converse_width) + $converse_width = "1024"; + diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index ce4465930..1f0a2f1e6 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -1,4 +1,10 @@ +.generic-content-wrapper { + border: 1px solid #000; + background-color: transparent; +} + .vcard, #contact-block, .widget { + background-color: transparent; border-bottom: 1px solid #fff; } diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 2660624d6..8192180db 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -34,3 +34,5 @@ $comment_border_colour = "rgba(0,0,0,0.8)"; if (! $font_colour) $font_colour = "#46D43F"; + if (! $converse_width) + $converse_width = "1024"; diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 3504265b9..627f3ee5c 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -1,9 +1,11 @@ -.vcard, #contact-block, .widget { - border-bottom: 1px solid #fff; +.generic-content-wrapper { + border: 1px solid #000; + background-color: transparent; } -.abook-pending-contact, .abook-permschange { - background: #000; +.vcard, #contact-block, .widget { + background-color: transparent; + border-bottom: 1px solid #fff; } #cboxContent a { diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index a76709ac9..b64f60bbe 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -34,3 +34,5 @@ $comment_border_colour = "rgba(0,0,0,0.8)"; if (! $font_colour) $font_colour = "#fff"; + if (! $converse_width) + $converse_width = "1024"; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 8a4fc666e..cdc9de489 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,4 +1,7 @@ {{include file="field_select.tpl" field=$schema}} +{{include file="field_checkbox.tpl" field=$align_left}} +{{include file="field_checkbox.tpl" field=$narrow_navbar}} +{{include file="field_input.tpl" field=$converse_width}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_gradient_top}} @@ -13,8 +16,8 @@ {{include file="field_colorinput.tpl" field=$background_image}} {{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=$comment_indent}} + {{*include file="field_colorinput.tpl" field=$comment_border_colour*}} + {{*include file="field_input.tpl" field=$comment_indent*}} {{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}} @@ -26,11 +29,7 @@ {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -{{/if}} -{{include file="field_input.tpl" field=$converse_width}} -{{include file="field_checkbox.tpl" field=$converse_center}} -{{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{if $expert}} + <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({format: 'rgba'}); |