ussr/ussr-hubzilla-themes
ussr
/
ussr-hubzilla-themes
2
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

6.4

This commit is contained in:
ivan 2021-12-14 21:48:12 +03:00
parent aab71826ae
commit 026b69170d
45 changed files with 383 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ussrbasic/css/style.css
View File

@ -24,15 +24,15 @@ body {
aside#region_1 { aside#region_1 {
border-right: 1px solid transparent; border-right: 1px solid transparent;
width: $left_aside_widthpx; width: $left_aside_widthrem;
min-width: $left_aside_widthpx; min-width: $left_aside_widthrem;
max-width: $left_aside_widthpx; max-width: $left_aside_widthrem;
} }
aside#region_3 { aside#region_3 {
width: $right_aside_widthpx; width: $right_aside_widthrem;
min-width: $left_aside_widthpx; min-width: $left_aside_widthrem;
max-width: $right_aside_widthpx; max-width: $right_aside_widthrem;
} }
aside#left_aside_wrapper, aside#left_aside_wrapper,
@ -43,13 +43,13 @@ aside#right_aside_wrapper {
main { main {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
max-width: $main_widthpx; max-width: $main_widthrem;
} }
#overlay { #overlay {
position: fixed; position: fixed;
top: 0; top: 0;
left: $left_aside_widthpx; left: $left_aside_widthrem;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background: rgba(0, 0, 0, .3); background: rgba(0, 0, 0, .3);
@ -400,34 +400,20 @@ footer {
color: #444444; color: #444444;
} }
.vcard { .vcard-card {
margin-bottom: 10px;
padding: 0px 10px 10px 10px;
background-color: rgba(254,254,254,0.5); background-color: rgba(254,254,254,0.5);
border: 1px solid rgba(254,254,254,0.5); }
border-radius: $radius;
.vcard {
word-wrap: break-word; word-wrap: break-word;
} }
.vcard dl,
.vcard .title {
margin-top: 10px;
margin-bottom: 0px;
}
.connect-btn-wrapper {
margin-bottom: 10px;
}
.profile-edit-side-link { .profile-edit-side-link {
padding: 3px 0px;
opacity: 0; opacity: 0;
filter:alpha(opacity=30); filter:alpha(opacity=0);
float: right;
} }
.vcard:hover .profile-edit-side-link { .card:hover .profile-edit-side-link {
opacity: 1; opacity: 1;
filter:alpha(opacity=100); filter:alpha(opacity=100);
} }
@ -435,15 +421,6 @@ footer {
#profile-photo-wrapper img { #profile-photo-wrapper img {
width: 100%; width: 100%;
height: 100%; height: 100%;
max-width: 300px;
max-height: 300px;
}
#profile-photo-wrapper {
width: 251px;
height: 251px;
margin-bottom: 10px;
border-radius: $radius;
} }
#hide-friends-yes-label, #hide-friends-yes-label,
@ -571,8 +548,8 @@ footer {
} }
.contact-block-img { .contact-block-img {
width:47px; width: 2.95rem;
height:47px; height: 2.95rem;
margin-bottom: 3px; margin-bottom: 3px;
} }
@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo {
.widget { .widget {
background-color: rgba(254,254,254,.5); background-color: rgba(254,254,254,.5);
border: 1px solid rgba(254,254,254,.5);
border-radius: $radius; border-radius: $radius;
} }
@ -1530,17 +1506,16 @@ blockquote {
} }
main { main {
left: -$left_aside_widthpx; left: -$left_aside_widthrem;
width: calc( 100% + $left_aside_widthpx ); width: calc( 100% + $left_aside_widthrem );
} }
main.region_1-on { main.region_1-on {
left: 0px; left: 0px;
} }
#nav-app-link-wrapper.has_location { #nav-app-link-wrapper {
min-width: 0; min-width: 0;
flex-basis: 25%;
} }
#nav-app-link-wrapper { #nav-app-link-wrapper {
@ -1603,7 +1578,7 @@ dl.bb-dl > dd > li {
content:"\f069 "; content:"\f069 ";
} }
/* Modified original CSS to match input in Redbasic */ /* Modified original CSS to match input in Ussrbasic */
.jothidden .bootstrap-tagsinput { .jothidden .bootstrap-tagsinput {
border: 0px solid transparent; border: 0px solid transparent;
margin-bottom: 0px; margin-bottom: 0px;
@ -1832,7 +1807,3 @@ span.default-highlight {
.bootstrap-tagsinput { .bootstrap-tagsinput {
width: 100%; width: 100%;
} }
.profile-match-wrapper {
width: 44% !important;
}

12
ussrbasic/php/config.php
View File

@ -32,7 +32,7 @@ class UssrbasicConfig {
} }
function get() { function get() {
if(! local_channel()) { if(! local_channel()) {
return; return;
} }
@ -59,7 +59,7 @@ class UssrbasicConfig {
} }
function post() { function post() {
if(!local_channel()) { if(!local_channel()) {
return; return;
} }
@ -89,7 +89,7 @@ class UssrbasicConfig {
if(get_pconfig(local_channel(), 'ussrbasic', 'advanced_theming')) if(get_pconfig(local_channel(), 'ussrbasic', 'advanced_theming'))
$expert = 1; $expert = 1;
$o .= replace_macros(get_markup_template('theme_settings.tpl'), array( $o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$baseurl' => z_root(), '$baseurl' => z_root(),
@ -98,19 +98,19 @@ class UssrbasicConfig {
'$title' => t("Theme settings"), '$title' => t("Theme settings"),
'$narrow_navbar' => array('ussrbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), '$narrow_navbar' => array('ussrbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
'$nav_bg' => array('ussrbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), '$nav_bg' => array('ussrbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
'$nav_icon_colour' => array('ussrbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), '$nav_icon_colour' => array('ussrbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
'$nav_active_icon_colour' => array('ussrbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), '$nav_active_icon_colour' => array('ussrbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
'$link_colour' => array('ussrbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours), '$link_colour' => array('ussrbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('ussrbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']), '$banner_colour' => array('ussrbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
'$bgcolour' => array('ussrbasic_background_colour', t('Set the background color'), $arr['bgcolour']), '$bgcolour' => array('ussrbasic_background_colour', t('Set the background color'), $arr['bgcolour']),
'$background_image' => array('ussrbasic_background_image', t('Set the background image'), $arr['background_image']), '$background_image' => array('ussrbasic_background_image', t('Set the background image'), $arr['background_image']),
'$item_colour' => array('ussrbasic_item_colour', t('Set the background color of items'), $arr['item_colour']), '$item_colour' => array('ussrbasic_item_colour', t('Set the background color of items'), $arr['item_colour']),
'$comment_item_colour' => array('ussrbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']), '$comment_item_colour' => array('ussrbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
'$font_size' => array('ussrbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')), '$font_size' => array('ussrbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
'$font_colour' => array('ussrbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), '$font_colour' => array('ussrbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('ussrbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')), '$radius' => array('ussrbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
'$shadow' => array('ussrbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$shadow' => array('ussrbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('ussrbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$converse_width' => array('ussrbasic_converse_width',t('Set maximum width of content region in rem'),$arr['converse_width'], t('Leave empty for default width')),
'$top_photo' => array('ussrbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$top_photo' => array('ussrbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('ussrbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), '$reply_photo' => array('ussrbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$advanced_theming' => ['ussrbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] '$advanced_theming' => ['ussrbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]

10
ussrbasic/php/style.php
View File

@ -101,7 +101,7 @@ if (! $radius)
if (! $shadow) if (! $shadow)
$shadow = '0'; $shadow = '0';
if (! $converse_width) if (! $converse_width)
$converse_width = '790'; $converse_width = '52'; //unit: rem
if(! $top_photo) if(! $top_photo)
$top_photo = '2.3rem'; $top_photo = '2.3rem';
if(! $reply_photo) if(! $reply_photo)
@ -120,13 +120,13 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) {
$x .= $schemecss; $x .= $schemecss;
} }
$left_aside_width = 288; $left_aside_width = 21; //unit: rem
$right_aside_width = 288; $right_aside_width = 21; //unit: rem
$main_width = $left_aside_width + $right_aside_width + intval($converse_width); $main_width = $left_aside_width + $right_aside_width + intval($converse_width);
// prevent main_width smaller than 768px // prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width); $main_width = (($main_width < 30) ? 30 : $main_width);
$options = array ( $options = array (
'$nav_bg' => $nav_bg, '$nav_bg' => $nav_bg,
@ -161,4 +161,4 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) {
// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasic') if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasic')
set_pconfig(local_channel(), '`ussrbasic', 'schema', '---'); set_pconfig(local_channel(), 'ussrbasic', 'schema', '---');

2
ussrbasic/php/theme.php
View File

@ -4,7 +4,7 @@
* * Name: Ussrbasic * * Name: Ussrbasic
* * Description: ussr.win 3 column based on Hubzilla standard theme * * Description: ussr.win 3 column based on Hubzilla standard theme
* * Version: 2.2 * * Version: 2.2
* * MinVersion: 6.2 * * MinVersion: 6.4
* * MaxVersion: 7.0 * * MaxVersion: 7.0
* * Author: Fabrixxm * * Author: Fabrixxm
*/ */

17
ussrbasic/schema/GreenGrey-Nolikes.css
View File

@ -326,11 +326,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasic/schema/GreenGrey-Nominus-Nolikes.css
View File

@ -335,11 +335,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasic/schema/GreenGrey-Nominus.css
View File

@ -327,11 +327,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasic/schema/GreenGrey.css
View File

@ -321,11 +321,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

6
ussrbasic/schema/dark.php
View File

@ -1,5 +1,5 @@
<?php <?php
if (! $nav_bg) if (! $nav_bg)
$nav_bg = "#000"; $nav_bg = "#000";
if (! $nav_gradient_top) if (! $nav_gradient_top)
@ -35,7 +35,7 @@
if (! $font_colour) if (! $font_colour)
$font_colour = "#ccc"; $font_colour = "#ccc";
if (! $converse_width) if (! $converse_width)
$converse_width = "1024"; $converse_width = '52'; //unit: rem;

17
ussrbasic/schema/zlax.css
View File

@ -347,11 +347,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

10
ussrbasic/tpl/suggest_widget.tpl
View File

@ -1,10 +0,0 @@
<div class="widget suggestions-widget">
<h3>{{$title}}</h3>
{{if $entries}}
{{foreach $entries as $child}}
{{include file="suggest_friends.tpl" entry=$child}}
{{/foreach}}
{{/if}}
<div class="clear"></div>
<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
</div>

69
ussrbasicleft/css/style.css
View File

@ -24,15 +24,15 @@ body {
aside#region_1 { aside#region_1 {
border-right: 1px solid transparent; border-right: 1px solid transparent;
width: $left_aside_widthpx; width: $left_aside_widthrem;
min-width: $left_aside_widthpx; min-width: $left_aside_widthrem;
max-width: $left_aside_widthpx; max-width: $left_aside_widthrem;
} }
aside#region_3 { aside#region_3 {
width: $right_aside_widthpx; width: $right_aside_widthrem;
min-width: $left_aside_widthpx; min-width: $left_aside_widthrem;
max-width: $right_aside_widthpx; max-width: $right_aside_widthrem;
} }
aside#left_aside_wrapper, aside#left_aside_wrapper,
@ -43,13 +43,13 @@ aside#right_aside_wrapper {
main { main {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
max-width: $main_widthpx; max-width: $main_widthrem;
} }
#overlay { #overlay {
position: fixed; position: fixed;
top: 0; top: 0;
left: $left_aside_widthpx; left: $left_aside_widthrem;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background: rgba(0, 0, 0, .3); background: rgba(0, 0, 0, .3);
@ -400,34 +400,20 @@ footer {
color: #444444; color: #444444;
} }
.vcard { .vcard-card {
margin-bottom: 10px;
padding: 0px 10px 10px 10px;
background-color: rgba(254,254,254,0.5); background-color: rgba(254,254,254,0.5);
border: 1px solid rgba(254,254,254,0.5); }
border-radius: $radius;
.vcard {
word-wrap: break-word; word-wrap: break-word;
} }
.vcard dl,
.vcard .title {
margin-top: 10px;
margin-bottom: 0px;
}
.connect-btn-wrapper {
margin-bottom: 10px;
}
.profile-edit-side-link { .profile-edit-side-link {
padding: 3px 0px;
opacity: 0; opacity: 0;
filter:alpha(opacity=30); filter:alpha(opacity=0);
float: right;
} }
.vcard:hover .profile-edit-side-link { .card:hover .profile-edit-side-link {
opacity: 1; opacity: 1;
filter:alpha(opacity=100); filter:alpha(opacity=100);
} }
@ -435,15 +421,6 @@ footer {
#profile-photo-wrapper img { #profile-photo-wrapper img {
width: 100%; width: 100%;
height: 100%; height: 100%;
max-width: 300px;
max-height: 300px;
}
#profile-photo-wrapper {
width: 251px;
height: 251px;
margin-bottom: 10px;
border-radius: $radius;
} }
#hide-friends-yes-label, #hide-friends-yes-label,
@ -571,8 +548,8 @@ footer {
} }
.contact-block-img { .contact-block-img {
width:47px; width: 2.95rem;
height:47px; height: 2.95rem;
margin-bottom: 3px; margin-bottom: 3px;
} }
@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo {
.widget { .widget {
background-color: rgba(254,254,254,.5); background-color: rgba(254,254,254,.5);
border: 1px solid rgba(254,254,254,.5);
border-radius: $radius; border-radius: $radius;
} }
@ -1530,17 +1506,16 @@ blockquote {
} }
main { main {
left: -$left_aside_widthpx; left: -$left_aside_widthrem;
width: calc( 100% + $left_aside_widthpx ); width: calc( 100% + $left_aside_widthrem );
} }
main.region_1-on { main.region_1-on {
left: 0px; left: 0px;
} }
#nav-app-link-wrapper.has_location { #nav-app-link-wrapper {
min-width: 0; min-width: 0;
flex-basis: 25%;
} }
#nav-app-link-wrapper { #nav-app-link-wrapper {
@ -1603,7 +1578,7 @@ dl.bb-dl > dd > li {
content:"\f069 "; content:"\f069 ";
} }
/* Modified original CSS to match input in Redbasic */ /* Modified original CSS to match input in Ussrbasicleft */
.jothidden .bootstrap-tagsinput { .jothidden .bootstrap-tagsinput {
border: 0px solid transparent; border: 0px solid transparent;
margin-bottom: 0px; margin-bottom: 0px;
@ -1833,10 +1808,6 @@ span.default-highlight {
width: 100%; width: 100%;
} }
.profile-match-wrapper {
width: 44% !important;
}
#region_3 { #region_3 {
display: none !important; display: none !important;
} }

12
ussrbasicleft/php/config.php
View File

@ -32,7 +32,7 @@ class UssrbasicleftConfig {
} }
function get() { function get() {
if(! local_channel()) { if(! local_channel()) {
return; return;
} }
@ -59,7 +59,7 @@ class UssrbasicleftConfig {
} }
function post() { function post() {
if(!local_channel()) { if(!local_channel()) {
return; return;
} }
@ -89,7 +89,7 @@ class UssrbasicleftConfig {
if(get_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming')) if(get_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming'))
$expert = 1; $expert = 1;
$o .= replace_macros(get_markup_template('theme_settings.tpl'), array( $o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$baseurl' => z_root(), '$baseurl' => z_root(),
@ -98,19 +98,19 @@ class UssrbasicleftConfig {
'$title' => t("Theme settings"), '$title' => t("Theme settings"),
'$narrow_navbar' => array('ussrbasicleft_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), '$narrow_navbar' => array('ussrbasicleft_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
'$nav_bg' => array('ussrbasicleft_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), '$nav_bg' => array('ussrbasicleft_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
'$nav_icon_colour' => array('ussrbasicleft_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), '$nav_icon_colour' => array('ussrbasicleft_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
'$nav_active_icon_colour' => array('ussrbasicleft_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), '$nav_active_icon_colour' => array('ussrbasicleft_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
'$link_colour' => array('ussrbasicleft_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours), '$link_colour' => array('ussrbasicleft_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('ussrbasicleft_banner_colour', t('Set font-color for banner'), $arr['banner_colour']), '$banner_colour' => array('ussrbasicleft_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
'$bgcolour' => array('ussrbasicleft_background_colour', t('Set the background color'), $arr['bgcolour']), '$bgcolour' => array('ussrbasicleft_background_colour', t('Set the background color'), $arr['bgcolour']),
'$background_image' => array('ussrbasicleft_background_image', t('Set the background image'), $arr['background_image']), '$background_image' => array('ussrbasicleft_background_image', t('Set the background image'), $arr['background_image']),
'$item_colour' => array('ussrbasicleft_item_colour', t('Set the background color of items'), $arr['item_colour']), '$item_colour' => array('ussrbasicleft_item_colour', t('Set the background color of items'), $arr['item_colour']),
'$comment_item_colour' => array('ussrbasicleft_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']), '$comment_item_colour' => array('ussrbasicleft_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
'$font_size' => array('ussrbasicleft_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')), '$font_size' => array('ussrbasicleft_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
'$font_colour' => array('ussrbasicleft_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), '$font_colour' => array('ussrbasicleft_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('ussrbasicleft_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')), '$radius' => array('ussrbasicleft_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
'$shadow' => array('ussrbasicleft_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$shadow' => array('ussrbasicleft_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('ussrbasicleft_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$converse_width' => array('ussrbasicleft_converse_width',t('Set maximum width of content region in rem'),$arr['converse_width'], t('Leave empty for default width')),
'$top_photo' => array('ussrbasicleft_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$top_photo' => array('ussrbasicleft_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('ussrbasicleft_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), '$reply_photo' => array('ussrbasicleft_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$advanced_theming' => ['ussrbasicleft_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] '$advanced_theming' => ['ussrbasicleft_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]

10
ussrbasicleft/php/style.php
View File

@ -101,7 +101,7 @@ if (! $radius)
if (! $shadow) if (! $shadow)
$shadow = '0'; $shadow = '0';
if (! $converse_width) if (! $converse_width)
$converse_width = '790'; $converse_width = '52'; //unit: rem
if(! $top_photo) if(! $top_photo)
$top_photo = '2.3rem'; $top_photo = '2.3rem';
if(! $reply_photo) if(! $reply_photo)
@ -120,13 +120,13 @@ if(file_exists('view/theme/ussrbasicleft/css/style.css')) {
$x .= $schemecss; $x .= $schemecss;
} }
$left_aside_width = 288; $left_aside_width = 21; //unit: rem
$right_aside_width = 288; $right_aside_width = 21; //unit: rem
$main_width = $left_aside_width + $right_aside_width + intval($converse_width); $main_width = $left_aside_width + $right_aside_width + intval($converse_width);
// prevent main_width smaller than 768px // prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width); $main_width = (($main_width < 30) ? 30 : $main_width);
$options = array ( $options = array (
'$nav_bg' => $nav_bg, '$nav_bg' => $nav_bg,
@ -161,4 +161,4 @@ if(file_exists('view/theme/ussrbasicleft/css/style.css')) {
// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicleft') if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicleft')
set_pconfig(local_channel(), '`ussrbasicleft', 'schema', '---'); set_pconfig(local_channel(), 'ussrbasicleft', 'schema', '---');

2
ussrbasicleft/php/theme.php
View File

@ -4,7 +4,7 @@
* * Name: Ussrbasicleft * * Name: Ussrbasicleft
* * Description: ussr.win 2 column left based on Hubzilla standard theme * * Description: ussr.win 2 column left based on Hubzilla standard theme
* * Version: 2.2 * * Version: 2.2
* * MinVersion: 6.2 * * MinVersion: 6.4
* * MaxVersion: 7.0 * * MaxVersion: 7.0
* * Author: Fabrixxm * * Author: Fabrixxm
*/ */

17
ussrbasicleft/schema/GreenGrey-Nolikes.css
View File

@ -326,11 +326,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

16
ussrbasicleft/schema/GreenGrey-Nominus-Nolikes.css
View File

@ -335,11 +335,19 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasicleft/schema/GreenGrey-Nominus.css
View File

@ -327,11 +327,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

18
ussrbasicleft/schema/GreenGrey.css
View File

@ -321,11 +321,19 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

6
ussrbasicleft/schema/dark.php
View File

@ -1,5 +1,5 @@
<?php <?php
if (! $nav_bg) if (! $nav_bg)
$nav_bg = "#000"; $nav_bg = "#000";
if (! $nav_gradient_top) if (! $nav_gradient_top)
@ -35,7 +35,7 @@
if (! $font_colour) if (! $font_colour)
$font_colour = "#ccc"; $font_colour = "#ccc";
if (! $converse_width) if (! $converse_width)
$converse_width = "1024"; $converse_width = '52'; //unit: rem;

16
ussrbasicleft/schema/zlax.css
View File

@ -346,12 +346,24 @@ blockquote {
.table { .table {
color: #dddccc; color: #dddccc;
} }
/*
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub { #notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important; border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important; border-bottom-color: #383c4a !important;
} }
*/
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

10
ussrbasicleft/tpl/suggest_widget.tpl
View File

@ -1,10 +0,0 @@
<div class="widget suggestions-widget">
<h3>{{$title}}</h3>
{{if $entries}}
{{foreach $entries as $child}}
{{include file="suggest_friends.tpl" entry=$child}}
{{/foreach}}
{{/if}}
<div class="clear"></div>
<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
</div>

69
ussrbasicpub/css/style.css
View File

@ -24,15 +24,15 @@ body {
aside#region_1 { aside#region_1 {
border-right: 1px solid transparent; border-right: 1px solid transparent;
width: $left_aside_widthpx; width: $left_aside_widthrem;
min-width: $left_aside_widthpx; min-width: $left_aside_widthrem;
max-width: $left_aside_widthpx; max-width: $left_aside_widthrem;
} }
aside#region_3 { aside#region_3 {
width: $right_aside_widthpx; width: $right_aside_widthrem;
min-width: $left_aside_widthpx; min-width: $left_aside_widthrem;
max-width: $right_aside_widthpx; max-width: $right_aside_widthrem;
} }
aside#left_aside_wrapper, aside#left_aside_wrapper,
@ -43,13 +43,13 @@ aside#right_aside_wrapper {
main { main {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
max-width: $main_widthpx; max-width: $main_widthrem;
} }
#overlay { #overlay {
position: fixed; position: fixed;
top: 0; top: 0;
left: $left_aside_widthpx; left: $left_aside_widthrem;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background: rgba(0, 0, 0, .3); background: rgba(0, 0, 0, .3);
@ -400,34 +400,20 @@ footer {
color: #444444; color: #444444;
} }
.vcard { .vcard-card {
margin-bottom: 10px;
padding: 0px 10px 10px 10px;
background-color: rgba(254,254,254,0.5); background-color: rgba(254,254,254,0.5);
border: 1px solid rgba(254,254,254,0.5); }
border-radius: $radius;
.vcard {
word-wrap: break-word; word-wrap: break-word;
} }
.vcard dl,
.vcard .title {
margin-top: 10px;
margin-bottom: 0px;
}
.connect-btn-wrapper {
margin-bottom: 10px;
}
.profile-edit-side-link { .profile-edit-side-link {
padding: 3px 0px;
opacity: 0; opacity: 0;
filter:alpha(opacity=30); filter:alpha(opacity=0);
float: right;
} }
.vcard:hover .profile-edit-side-link { .card:hover .profile-edit-side-link {
opacity: 1; opacity: 1;
filter:alpha(opacity=100); filter:alpha(opacity=100);
} }
@ -435,15 +421,6 @@ footer {
#profile-photo-wrapper img { #profile-photo-wrapper img {
width: 100%; width: 100%;
height: 100%; height: 100%;
max-width: 300px;
max-height: 300px;
}
#profile-photo-wrapper {
width: 251px;
height: 251px;
margin-bottom: 10px;
border-radius: $radius;
} }
#hide-friends-yes-label, #hide-friends-yes-label,
@ -571,8 +548,8 @@ footer {
} }
.contact-block-img { .contact-block-img {
width:47px; width: 2.95rem;
height:47px; height: 2.95rem;
margin-bottom: 3px; margin-bottom: 3px;
} }
@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo {
.widget { .widget {
background-color: rgba(254,254,254,.5); background-color: rgba(254,254,254,.5);
border: 1px solid rgba(254,254,254,.5);
border-radius: $radius; border-radius: $radius;
} }
@ -1530,17 +1506,16 @@ blockquote {
} }
main { main {
left: -$left_aside_widthpx; left: -$left_aside_widthrem;
width: calc( 100% + $left_aside_widthpx ); width: calc( 100% + $left_aside_widthrem );
} }
main.region_1-on { main.region_1-on {
left: 0px; left: 0px;
} }
#nav-app-link-wrapper.has_location { #nav-app-link-wrapper {
min-width: 0; min-width: 0;
flex-basis: 25%;
} }
#nav-app-link-wrapper { #nav-app-link-wrapper {
@ -1603,7 +1578,7 @@ dl.bb-dl > dd > li {
content:"\f069 "; content:"\f069 ";
} }
/* Modified original CSS to match input in Redbasic */ /* Modified original CSS to match input in Ussrbasicpub */
.jothidden .bootstrap-tagsinput { .jothidden .bootstrap-tagsinput {
border: 0px solid transparent; border: 0px solid transparent;
margin-bottom: 0px; margin-bottom: 0px;
@ -1833,10 +1808,6 @@ span.default-highlight {
width: 100%; width: 100%;
} }
.profile-match-wrapper {
width: 44% !important;
}
#region_3 { #region_3 {
display: none !important; display: none !important;
} }

12
ussrbasicpub/php/config.php
View File

@ -32,7 +32,7 @@ class UssrbasicpubConfig {
} }
function get() { function get() {
if(! local_channel()) { if(! local_channel()) {
return; return;
} }
@ -59,7 +59,7 @@ class UssrbasicpubConfig {
} }
function post() { function post() {
if(!local_channel()) { if(!local_channel()) {
return; return;
} }
@ -89,7 +89,7 @@ class UssrbasicpubConfig {
if(get_pconfig(local_channel(), 'ussrbasicpub', 'advanced_theming')) if(get_pconfig(local_channel(), 'ussrbasicpub', 'advanced_theming'))
$expert = 1; $expert = 1;
$o .= replace_macros(get_markup_template('theme_settings.tpl'), array( $o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$baseurl' => z_root(), '$baseurl' => z_root(),
@ -98,19 +98,19 @@ class UssrbasicpubConfig {
'$title' => t("Theme settings"), '$title' => t("Theme settings"),
'$narrow_navbar' => array('ussrbasicpub_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), '$narrow_navbar' => array('ussrbasicpub_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
'$nav_bg' => array('ussrbasicpub_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), '$nav_bg' => array('ussrbasicpub_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
'$nav_icon_colour' => array('ussrbasicpub_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), '$nav_icon_colour' => array('ussrbasicpub_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
'$nav_active_icon_colour' => array('ussrbasicpub_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), '$nav_active_icon_colour' => array('ussrbasicpub_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
'$link_colour' => array('ussrbasicpub_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours), '$link_colour' => array('ussrbasicpub_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('ussrbasicpub_banner_colour', t('Set font-color for banner'), $arr['banner_colour']), '$banner_colour' => array('ussrbasicpub_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
'$bgcolour' => array('ussrbasicpub_background_colour', t('Set the background color'), $arr['bgcolour']), '$bgcolour' => array('ussrbasicpub_background_colour', t('Set the background color'), $arr['bgcolour']),
'$background_image' => array('ussrbasicpub_background_image', t('Set the background image'), $arr['background_image']), '$background_image' => array('ussrbasicpub_background_image', t('Set the background image'), $arr['background_image']),
'$item_colour' => array('ussrbasicpub_item_colour', t('Set the background color of items'), $arr['item_colour']), '$item_colour' => array('ussrbasicpub_item_colour', t('Set the background color of items'), $arr['item_colour']),
'$comment_item_colour' => array('ussrbasicpub_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']), '$comment_item_colour' => array('ussrbasicpub_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
'$font_size' => array('ussrbasicpub_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')), '$font_size' => array('ussrbasicpub_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
'$font_colour' => array('ussrbasicpub_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), '$font_colour' => array('ussrbasicpub_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('ussrbasicpub_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')), '$radius' => array('ussrbasicpub_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
'$shadow' => array('ussrbasicpub_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$shadow' => array('ussrbasicpub_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('ussrbasicpub_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$converse_width' => array('ussrbasicpub_converse_width',t('Set maximum width of content region in rem'),$arr['converse_width'], t('Leave empty for default width')),
'$top_photo' => array('ussrbasicpub_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$top_photo' => array('ussrbasicpub_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('ussrbasicpub_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), '$reply_photo' => array('ussrbasicpub_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$advanced_theming' => ['ussrbasicpub_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] '$advanced_theming' => ['ussrbasicpub_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]

10
ussrbasicpub/php/style.php
View File

@ -101,7 +101,7 @@ if (! $radius)
if (! $shadow) if (! $shadow)
$shadow = '0'; $shadow = '0';
if (! $converse_width) if (! $converse_width)
$converse_width = '790'; $converse_width = '52'; //unit: rem
if(! $top_photo) if(! $top_photo)
$top_photo = '2.3rem'; $top_photo = '2.3rem';
if(! $reply_photo) if(! $reply_photo)
@ -120,13 +120,13 @@ if(file_exists('view/theme/ussrbasicpub/css/style.css')) {
$x .= $schemecss; $x .= $schemecss;
} }
$left_aside_width = 288; $left_aside_width = 21; //unit: rem
$right_aside_width = 288; $right_aside_width = 21; //unit: rem
$main_width = $left_aside_width + $right_aside_width + intval($converse_width); $main_width = $left_aside_width + $right_aside_width + intval($converse_width);
// prevent main_width smaller than 768px // prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width); $main_width = (($main_width < 30) ? 30 : $main_width);
$options = array ( $options = array (
'$nav_bg' => $nav_bg, '$nav_bg' => $nav_bg,
@ -161,4 +161,4 @@ if(file_exists('view/theme/ussrbasicpub/css/style.css')) {
// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicpub') if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicpub')
set_pconfig(local_channel(), '`ussrbasicpub', 'schema', '---'); set_pconfig(local_channel(), 'ussrbasicpub', 'schema', '---');

2
ussrbasicpub/php/theme.php
View File

@ -4,7 +4,7 @@
* * Name: Ussrbasicpub * * Name: Ussrbasicpub
* * Description: ussr.win 2 column pub based on Hubzilla standard theme * * Description: ussr.win 2 column pub based on Hubzilla standard theme
* * Version: 2.2 * * Version: 2.2
* * MinVersion: 6.2 * * MinVersion: 6.4
* * MaxVersion: 7.0 * * MaxVersion: 7.0
* * Author: Fabrixxm * * Author: Fabrixxm
*/ */

17
ussrbasicpub/schema/GreenGrey-Nolikes.css
View File

@ -326,11 +326,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasicpub/schema/GreenGrey-Nominus-Nolikes.css
View File

@ -335,11 +335,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasicpub/schema/GreenGrey-Nominus.css
View File

@ -327,11 +327,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasicpub/schema/GreenGrey.css
View File

@ -321,11 +321,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

6
ussrbasicpub/schema/dark.php
View File

@ -1,5 +1,5 @@
<?php <?php
if (! $nav_bg) if (! $nav_bg)
$nav_bg = "#000"; $nav_bg = "#000";
if (! $nav_gradient_top) if (! $nav_gradient_top)
@ -35,7 +35,7 @@
if (! $font_colour) if (! $font_colour)
$font_colour = "#ccc"; $font_colour = "#ccc";
if (! $converse_width) if (! $converse_width)
$converse_width = "1024"; $converse_width = '52'; //unit: rem;

17
ussrbasicpub/schema/zlax.css
View File

@ -347,11 +347,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

10
ussrbasicpub/tpl/suggest_widget.tpl
View File

@ -1,10 +0,0 @@
<div class="widget suggestions-widget">
<h3>{{$title}}</h3>
{{if $entries}}
{{foreach $entries as $child}}
{{include file="suggest_friends.tpl" entry=$child}}
{{/foreach}}
{{/if}}
<div class="clear"></div>
<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
</div>

69
ussrbasicright/css/style.css
View File

@ -24,15 +24,15 @@ body {
aside#region_1 { aside#region_1 {
border-right: 1px solid transparent; border-right: 1px solid transparent;
width: $left_aside_widthpx; width: $left_aside_widthrem;
min-width: $left_aside_widthpx; min-width: $left_aside_widthrem;
max-width: $left_aside_widthpx; max-width: $left_aside_widthrem;
} }
aside#region_3 { aside#region_3 {
width: $right_aside_widthpx; width: $right_aside_widthrem;
min-width: $left_aside_widthpx; min-width: $left_aside_widthrem;
max-width: $right_aside_widthpx; max-width: $right_aside_widthrem;
} }
aside#left_aside_wrapper, aside#left_aside_wrapper,
@ -43,13 +43,13 @@ aside#right_aside_wrapper {
main { main {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
max-width: $main_widthpx; max-width: $main_widthrem;
} }
#overlay { #overlay {
position: fixed; position: fixed;
top: 0; top: 0;
left: $left_aside_widthpx; left: $left_aside_widthrem;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background: rgba(0, 0, 0, .3); background: rgba(0, 0, 0, .3);
@ -400,34 +400,20 @@ footer {
color: #444444; color: #444444;
} }
.vcard { .vcard-card {
margin-bottom: 10px;
padding: 0px 10px 10px 10px;
background-color: rgba(254,254,254,0.5); background-color: rgba(254,254,254,0.5);
border: 1px solid rgba(254,254,254,0.5); }
border-radius: $radius;
.vcard {
word-wrap: break-word; word-wrap: break-word;
} }
.vcard dl,
.vcard .title {
margin-top: 10px;
margin-bottom: 0px;
}
.connect-btn-wrapper {
margin-bottom: 10px;
}
.profile-edit-side-link { .profile-edit-side-link {
padding: 3px 0px;
opacity: 0; opacity: 0;
filter:alpha(opacity=30); filter:alpha(opacity=0);
float: right;
} }
.vcard:hover .profile-edit-side-link { .card:hover .profile-edit-side-link {
opacity: 1; opacity: 1;
filter:alpha(opacity=100); filter:alpha(opacity=100);
} }
@ -435,15 +421,6 @@ footer {
#profile-photo-wrapper img { #profile-photo-wrapper img {
width: 100%; width: 100%;
height: 100%; height: 100%;
max-width: 300px;
max-height: 300px;
}
#profile-photo-wrapper {
width: 251px;
height: 251px;
margin-bottom: 10px;
border-radius: $radius;
} }
#hide-friends-yes-label, #hide-friends-yes-label,
@ -571,8 +548,8 @@ footer {
} }
.contact-block-img { .contact-block-img {
width:47px; width: 2.95rem;
height:47px; height: 2.95rem;
margin-bottom: 3px; margin-bottom: 3px;
} }
@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo {
.widget { .widget {
background-color: rgba(254,254,254,.5); background-color: rgba(254,254,254,.5);
border: 1px solid rgba(254,254,254,.5);
border-radius: $radius; border-radius: $radius;
} }
@ -1530,17 +1506,16 @@ blockquote {
} }
main { main {
left: -$left_aside_widthpx; left: -$left_aside_widthrem;
width: calc( 100% + $left_aside_widthpx ); width: calc( 100% + $left_aside_widthrem );
} }
main.region_1-on { main.region_1-on {
left: 0px; left: 0px;
} }
#nav-app-link-wrapper.has_location { #nav-app-link-wrapper {
min-width: 0; min-width: 0;
flex-basis: 25%;
} }
#nav-app-link-wrapper { #nav-app-link-wrapper {
@ -1603,7 +1578,7 @@ dl.bb-dl > dd > li {
content:"\f069 "; content:"\f069 ";
} }
/* Modified original CSS to match input in Redbasic */ /* Modified original CSS to match input in Ussrbasicright */
.jothidden .bootstrap-tagsinput { .jothidden .bootstrap-tagsinput {
border: 0px solid transparent; border: 0px solid transparent;
margin-bottom: 0px; margin-bottom: 0px;
@ -1833,10 +1808,6 @@ span.default-highlight {
width: 100%; width: 100%;
} }
.profile-match-wrapper {
width: 44% !important;
}
#region_1 { #region_1 {
display: none !important; display: none !important;
} }

BIN
ussrbasicright/img/screenshot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 296 KiB

After

Width:  |  Height:  |  Size: 128 KiB

12
ussrbasicright/php/config.php
View File

@ -32,7 +32,7 @@ class UssrbasicrightConfig {
} }
function get() { function get() {
if(! local_channel()) { if(! local_channel()) {
return; return;
} }
@ -59,7 +59,7 @@ class UssrbasicrightConfig {
} }
function post() { function post() {
if(!local_channel()) { if(!local_channel()) {
return; return;
} }
@ -89,7 +89,7 @@ class UssrbasicrightConfig {
if(get_pconfig(local_channel(), 'ussrbasicright', 'advanced_theming')) if(get_pconfig(local_channel(), 'ussrbasicright', 'advanced_theming'))
$expert = 1; $expert = 1;
$o .= replace_macros(get_markup_template('theme_settings.tpl'), array( $o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$baseurl' => z_root(), '$baseurl' => z_root(),
@ -98,19 +98,19 @@ class UssrbasicrightConfig {
'$title' => t("Theme settings"), '$title' => t("Theme settings"),
'$narrow_navbar' => array('ussrbasicright_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), '$narrow_navbar' => array('ussrbasicright_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
'$nav_bg' => array('ussrbasicright_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), '$nav_bg' => array('ussrbasicright_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
'$nav_icon_colour' => array('ussrbasicright_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), '$nav_icon_colour' => array('ussrbasicright_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
'$nav_active_icon_colour' => array('ussrbasicright_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), '$nav_active_icon_colour' => array('ussrbasicright_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
'$link_colour' => array('ussrbasicright_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours), '$link_colour' => array('ussrbasicright_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('ussrbasicright_banner_colour', t('Set font-color for banner'), $arr['banner_colour']), '$banner_colour' => array('ussrbasicright_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
'$bgcolour' => array('ussrbasicright_background_colour', t('Set the background color'), $arr['bgcolour']), '$bgcolour' => array('ussrbasicright_background_colour', t('Set the background color'), $arr['bgcolour']),
'$background_image' => array('ussrbasicright_background_image', t('Set the background image'), $arr['background_image']), '$background_image' => array('ussrbasicright_background_image', t('Set the background image'), $arr['background_image']),
'$item_colour' => array('ussrbasicright_item_colour', t('Set the background color of items'), $arr['item_colour']), '$item_colour' => array('ussrbasicright_item_colour', t('Set the background color of items'), $arr['item_colour']),
'$comment_item_colour' => array('ussrbasicright_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']), '$comment_item_colour' => array('ussrbasicright_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
'$font_size' => array('ussrbasicright_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')), '$font_size' => array('ussrbasicright_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
'$font_colour' => array('ussrbasicright_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), '$font_colour' => array('ussrbasicright_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('ussrbasicright_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')), '$radius' => array('ussrbasicright_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
'$shadow' => array('ussrbasicright_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$shadow' => array('ussrbasicright_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('ussrbasicright_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$converse_width' => array('ussrbasicright_converse_width',t('Set maximum width of content region in rem'),$arr['converse_width'], t('Leave empty for default width')),
'$top_photo' => array('ussrbasicright_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$top_photo' => array('ussrbasicright_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('ussrbasicright_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), '$reply_photo' => array('ussrbasicright_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$advanced_theming' => ['ussrbasicright_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] '$advanced_theming' => ['ussrbasicright_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]

10
ussrbasicright/php/style.php
View File

@ -101,7 +101,7 @@ if (! $radius)
if (! $shadow) if (! $shadow)
$shadow = '0'; $shadow = '0';
if (! $converse_width) if (! $converse_width)
$converse_width = '790'; $converse_width = '52'; //unit: rem
if(! $top_photo) if(! $top_photo)
$top_photo = '2.3rem'; $top_photo = '2.3rem';
if(! $reply_photo) if(! $reply_photo)
@ -120,13 +120,13 @@ if(file_exists('view/theme/ussrbasicright/css/style.css')) {
$x .= $schemecss; $x .= $schemecss;
} }
$left_aside_width = 288; $left_aside_width = 21; //unit: rem
$right_aside_width = 288; $right_aside_width = 21; //unit: rem
$main_width = $left_aside_width + $right_aside_width + intval($converse_width); $main_width = $left_aside_width + $right_aside_width + intval($converse_width);
// prevent main_width smaller than 768px // prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width); $main_width = (($main_width < 30) ? 30 : $main_width);
$options = array ( $options = array (
'$nav_bg' => $nav_bg, '$nav_bg' => $nav_bg,
@ -161,4 +161,4 @@ if(file_exists('view/theme/ussrbasicright/css/style.css')) {
// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicright') if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicright')
set_pconfig(local_channel(), '`ussrbasicright', 'schema', '---'); set_pconfig(local_channel(), 'ussrbasicright', 'schema', '---');

2
ussrbasicright/php/theme.php
View File

@ -4,7 +4,7 @@
* * Name: Ussrbasicright * * Name: Ussrbasicright
* * Description: ussr.win 2 column left based on Hubzilla standard theme * * Description: ussr.win 2 column left based on Hubzilla standard theme
* * Version: 2.2 * * Version: 2.2
* * MinVersion: 6.2 * * MinVersion: 6.4
* * MaxVersion: 7.0 * * MaxVersion: 7.0
* * Author: Fabrixxm * * Author: Fabrixxm
*/ */

17
ussrbasicright/schema/GreenGrey-Nolikes.css
View File

@ -326,11 +326,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasicright/schema/GreenGrey-Nominus-Nolikes.css
View File

@ -335,11 +335,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasicright/schema/GreenGrey-Nominus.css
View File

@ -327,11 +327,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

17
ussrbasicright/schema/GreenGrey.css
View File

@ -321,11 +321,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

6
ussrbasicright/schema/dark.php
View File

@ -1,5 +1,5 @@
<?php <?php
if (! $nav_bg) if (! $nav_bg)
$nav_bg = "#000"; $nav_bg = "#000";
if (! $nav_gradient_top) if (! $nav_gradient_top)
@ -35,7 +35,7 @@
if (! $font_colour) if (! $font_colour)
$font_colour = "#ccc"; $font_colour = "#ccc";
if (! $converse_width) if (! $converse_width)
$converse_width = "1024"; $converse_width = '52'; //unit: rem;

17
ussrbasicright/schema/zlax.css
View File

@ -347,11 +347,18 @@ blockquote {
color: #dddccc; color: #dddccc;
} }
#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
border: 1px solid #383c4a !important;
border-bottom-color: #383c4a !important;
}
#upgrade_info_aside { #upgrade_info_aside {
border-color: #383c4a !important; border-color: #383c4a !important;
} }
.text-muted {
color: #a6a6b9 !important;
}
.card {
background-color: #434753 !important;
}
.border {
border: 1px solid #415240 !important;
}

10
ussrbasicright/tpl/suggest_widget.tpl
View File

@ -1,10 +0,0 @@
<div class="widget suggestions-widget">
<h3>{{$title}}</h3>
{{if $entries}}
{{foreach $entries as $child}}
{{include file="suggest_friends.tpl" entry=$child}}
{{/foreach}}
{{/if}}
<div class="clear"></div>
<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
</div>