diff --git a/ussrbasic/css/style.css b/ussrbasic/css/style.css index 5dad568..7f06115 100644 --- a/ussrbasic/css/style.css +++ b/ussrbasic/css/style.css @@ -24,15 +24,15 @@ body { aside#region_1 { border-right: 1px solid transparent; - width: $left_aside_widthpx; - min-width: $left_aside_widthpx; - max-width: $left_aside_widthpx; + width: $left_aside_widthrem; + min-width: $left_aside_widthrem; + max-width: $left_aside_widthrem; } aside#region_3 { - width: $right_aside_widthpx; - min-width: $left_aside_widthpx; - max-width: $right_aside_widthpx; + width: $right_aside_widthrem; + min-width: $left_aside_widthrem; + max-width: $right_aside_widthrem; } aside#left_aside_wrapper, @@ -43,13 +43,13 @@ aside#right_aside_wrapper { main { margin-left: auto; margin-right: auto; - max-width: $main_widthpx; + max-width: $main_widthrem; } #overlay { position: fixed; top: 0; - left: $left_aside_widthpx; + left: $left_aside_widthrem; width: 100vw; height: 100vh; background: rgba(0, 0, 0, .3); @@ -400,34 +400,20 @@ footer { color: #444444; } -.vcard { - margin-bottom: 10px; - padding: 0px 10px 10px 10px; +.vcard-card { 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; } -.vcard dl, -.vcard .title { - margin-top: 10px; - margin-bottom: 0px; -} - -.connect-btn-wrapper { - margin-bottom: 10px; - -} - .profile-edit-side-link { - padding: 3px 0px; opacity: 0; - filter:alpha(opacity=30); - float: right; + filter:alpha(opacity=0); } -.vcard:hover .profile-edit-side-link { +.card:hover .profile-edit-side-link { opacity: 1; filter:alpha(opacity=100); } @@ -435,15 +421,6 @@ footer { #profile-photo-wrapper img { width: 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, @@ -571,8 +548,8 @@ footer { } .contact-block-img { - width:47px; - height:47px; + width: 2.95rem; + height: 2.95rem; margin-bottom: 3px; } @@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo { .widget { background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); border-radius: $radius; } @@ -1530,17 +1506,16 @@ blockquote { } main { - left: -$left_aside_widthpx; - width: calc( 100% + $left_aside_widthpx ); + left: -$left_aside_widthrem; + width: calc( 100% + $left_aside_widthrem ); } main.region_1-on { left: 0px; } - #nav-app-link-wrapper.has_location { + #nav-app-link-wrapper { min-width: 0; - flex-basis: 25%; } #nav-app-link-wrapper { @@ -1603,7 +1578,7 @@ dl.bb-dl > dd > li { content:"\f069 "; } -/* Modified original CSS to match input in Redbasic */ +/* Modified original CSS to match input in Ussrbasic */ .jothidden .bootstrap-tagsinput { border: 0px solid transparent; margin-bottom: 0px; @@ -1832,7 +1807,3 @@ span.default-highlight { .bootstrap-tagsinput { width: 100%; } - -.profile-match-wrapper { - width: 44% !important; -} diff --git a/ussrbasic/php/config.php b/ussrbasic/php/config.php index bcce3db..c960074 100644 --- a/ussrbasic/php/config.php +++ b/ussrbasic/php/config.php @@ -32,7 +32,7 @@ class UssrbasicConfig { } function get() { - if(! local_channel()) { + if(! local_channel()) { return; } @@ -59,7 +59,7 @@ class UssrbasicConfig { } function post() { - if(!local_channel()) { + if(!local_channel()) { return; } @@ -89,7 +89,7 @@ class UssrbasicConfig { if(get_pconfig(local_channel(), 'ussrbasic', 'advanced_theming')) $expert = 1; - + $o .= replace_macros(get_markup_template('theme_settings.tpl'), array( '$submit' => t('Submit'), '$baseurl' => z_root(), @@ -98,19 +98,19 @@ class UssrbasicConfig { '$title' => t("Theme settings"), '$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_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']), '$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']), '$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']), '$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_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')), '$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']), '$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')]] diff --git a/ussrbasic/php/style.php b/ussrbasic/php/style.php index b8d5eb7..6780ebc 100644 --- a/ussrbasic/php/style.php +++ b/ussrbasic/php/style.php @@ -101,7 +101,7 @@ if (! $radius) if (! $shadow) $shadow = '0'; if (! $converse_width) - $converse_width = '790'; + $converse_width = '52'; //unit: rem if(! $top_photo) $top_photo = '2.3rem'; if(! $reply_photo) @@ -120,13 +120,13 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) { $x .= $schemecss; } - $left_aside_width = 288; - $right_aside_width = 288; + $left_aside_width = 21; //unit: rem + $right_aside_width = 21; //unit: rem $main_width = $left_aside_width + $right_aside_width + intval($converse_width); // prevent main_width smaller than 768px - $main_width = (($main_width < 768) ? 768 : $main_width); + $main_width = (($main_width < 30) ? 30 : $main_width); $options = array ( '$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. if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasic') - set_pconfig(local_channel(), '`ussrbasic', 'schema', '---'); + set_pconfig(local_channel(), 'ussrbasic', 'schema', '---'); diff --git a/ussrbasic/php/theme.php b/ussrbasic/php/theme.php index 2dbaf16..a517168 100644 --- a/ussrbasic/php/theme.php +++ b/ussrbasic/php/theme.php @@ -4,7 +4,7 @@ * * Name: Ussrbasic * * Description: ussr.win 3 column based on Hubzilla standard theme * * Version: 2.2 - * * MinVersion: 6.2 + * * MinVersion: 6.4 * * MaxVersion: 7.0 * * Author: Fabrixxm */ diff --git a/ussrbasic/schema/GreenGrey-Nolikes.css b/ussrbasic/schema/GreenGrey-Nolikes.css index ddef622..6c0e434 100644 --- a/ussrbasic/schema/GreenGrey-Nolikes.css +++ b/ussrbasic/schema/GreenGrey-Nolikes.css @@ -326,11 +326,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasic/schema/GreenGrey-Nominus-Nolikes.css b/ussrbasic/schema/GreenGrey-Nominus-Nolikes.css index 8ef3771..c7c688b 100644 --- a/ussrbasic/schema/GreenGrey-Nominus-Nolikes.css +++ b/ussrbasic/schema/GreenGrey-Nominus-Nolikes.css @@ -335,11 +335,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasic/schema/GreenGrey-Nominus.css b/ussrbasic/schema/GreenGrey-Nominus.css index bc00674..d1ec3af 100644 --- a/ussrbasic/schema/GreenGrey-Nominus.css +++ b/ussrbasic/schema/GreenGrey-Nominus.css @@ -327,11 +327,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasic/schema/GreenGrey.css b/ussrbasic/schema/GreenGrey.css index cec0d9b..fe5f200 100644 --- a/ussrbasic/schema/GreenGrey.css +++ b/ussrbasic/schema/GreenGrey.css @@ -321,11 +321,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasic/schema/dark.php b/ussrbasic/schema/dark.php index af4b122..18e92ac 100644 --- a/ussrbasic/schema/dark.php +++ b/ussrbasic/schema/dark.php @@ -1,5 +1,5 @@ -

{{$title}}

-{{if $entries}} -{{foreach $entries as $child}} -{{include file="suggest_friends.tpl" entry=$child}} -{{/foreach}} -{{/if}} -
-
{{$more}}
- diff --git a/ussrbasicleft/css/style.css b/ussrbasicleft/css/style.css index 7011b86..4e12d51 100644 --- a/ussrbasicleft/css/style.css +++ b/ussrbasicleft/css/style.css @@ -24,15 +24,15 @@ body { aside#region_1 { border-right: 1px solid transparent; - width: $left_aside_widthpx; - min-width: $left_aside_widthpx; - max-width: $left_aside_widthpx; + width: $left_aside_widthrem; + min-width: $left_aside_widthrem; + max-width: $left_aside_widthrem; } aside#region_3 { - width: $right_aside_widthpx; - min-width: $left_aside_widthpx; - max-width: $right_aside_widthpx; + width: $right_aside_widthrem; + min-width: $left_aside_widthrem; + max-width: $right_aside_widthrem; } aside#left_aside_wrapper, @@ -43,13 +43,13 @@ aside#right_aside_wrapper { main { margin-left: auto; margin-right: auto; - max-width: $main_widthpx; + max-width: $main_widthrem; } #overlay { position: fixed; top: 0; - left: $left_aside_widthpx; + left: $left_aside_widthrem; width: 100vw; height: 100vh; background: rgba(0, 0, 0, .3); @@ -400,34 +400,20 @@ footer { color: #444444; } -.vcard { - margin-bottom: 10px; - padding: 0px 10px 10px 10px; +.vcard-card { 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; } -.vcard dl, -.vcard .title { - margin-top: 10px; - margin-bottom: 0px; -} - -.connect-btn-wrapper { - margin-bottom: 10px; - -} - .profile-edit-side-link { - padding: 3px 0px; opacity: 0; - filter:alpha(opacity=30); - float: right; + filter:alpha(opacity=0); } -.vcard:hover .profile-edit-side-link { +.card:hover .profile-edit-side-link { opacity: 1; filter:alpha(opacity=100); } @@ -435,15 +421,6 @@ footer { #profile-photo-wrapper img { width: 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, @@ -571,8 +548,8 @@ footer { } .contact-block-img { - width:47px; - height:47px; + width: 2.95rem; + height: 2.95rem; margin-bottom: 3px; } @@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo { .widget { background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); border-radius: $radius; } @@ -1530,17 +1506,16 @@ blockquote { } main { - left: -$left_aside_widthpx; - width: calc( 100% + $left_aside_widthpx ); + left: -$left_aside_widthrem; + width: calc( 100% + $left_aside_widthrem ); } main.region_1-on { left: 0px; } - #nav-app-link-wrapper.has_location { + #nav-app-link-wrapper { min-width: 0; - flex-basis: 25%; } #nav-app-link-wrapper { @@ -1603,7 +1578,7 @@ dl.bb-dl > dd > li { content:"\f069 "; } -/* Modified original CSS to match input in Redbasic */ +/* Modified original CSS to match input in Ussrbasicleft */ .jothidden .bootstrap-tagsinput { border: 0px solid transparent; margin-bottom: 0px; @@ -1833,10 +1808,6 @@ span.default-highlight { width: 100%; } -.profile-match-wrapper { - width: 44% !important; -} - #region_3 { display: none !important; } diff --git a/ussrbasicleft/php/config.php b/ussrbasicleft/php/config.php index 0ca81b4..a7ea43e 100644 --- a/ussrbasicleft/php/config.php +++ b/ussrbasicleft/php/config.php @@ -32,7 +32,7 @@ class UssrbasicleftConfig { } function get() { - if(! local_channel()) { + if(! local_channel()) { return; } @@ -59,7 +59,7 @@ class UssrbasicleftConfig { } function post() { - if(!local_channel()) { + if(!local_channel()) { return; } @@ -89,7 +89,7 @@ class UssrbasicleftConfig { if(get_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming')) $expert = 1; - + $o .= replace_macros(get_markup_template('theme_settings.tpl'), array( '$submit' => t('Submit'), '$baseurl' => z_root(), @@ -98,19 +98,19 @@ class UssrbasicleftConfig { '$title' => t("Theme settings"), '$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_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']), '$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']), '$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']), '$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_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')), '$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']), '$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')]] diff --git a/ussrbasicleft/php/style.php b/ussrbasicleft/php/style.php index 229ff42..cbe9759 100644 --- a/ussrbasicleft/php/style.php +++ b/ussrbasicleft/php/style.php @@ -101,7 +101,7 @@ if (! $radius) if (! $shadow) $shadow = '0'; if (! $converse_width) - $converse_width = '790'; + $converse_width = '52'; //unit: rem if(! $top_photo) $top_photo = '2.3rem'; if(! $reply_photo) @@ -120,13 +120,13 @@ if(file_exists('view/theme/ussrbasicleft/css/style.css')) { $x .= $schemecss; } - $left_aside_width = 288; - $right_aside_width = 288; + $left_aside_width = 21; //unit: rem + $right_aside_width = 21; //unit: rem $main_width = $left_aside_width + $right_aside_width + intval($converse_width); // prevent main_width smaller than 768px - $main_width = (($main_width < 768) ? 768 : $main_width); + $main_width = (($main_width < 30) ? 30 : $main_width); $options = array ( '$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. if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicleft') - set_pconfig(local_channel(), '`ussrbasicleft', 'schema', '---'); + set_pconfig(local_channel(), 'ussrbasicleft', 'schema', '---'); diff --git a/ussrbasicleft/php/theme.php b/ussrbasicleft/php/theme.php index 3848e4d..c0a5bea 100644 --- a/ussrbasicleft/php/theme.php +++ b/ussrbasicleft/php/theme.php @@ -4,7 +4,7 @@ * * Name: Ussrbasicleft * * Description: ussr.win 2 column left based on Hubzilla standard theme * * Version: 2.2 - * * MinVersion: 6.2 + * * MinVersion: 6.4 * * MaxVersion: 7.0 * * Author: Fabrixxm */ diff --git a/ussrbasicleft/schema/GreenGrey-Nolikes.css b/ussrbasicleft/schema/GreenGrey-Nolikes.css index ddef622..6c0e434 100644 --- a/ussrbasicleft/schema/GreenGrey-Nolikes.css +++ b/ussrbasicleft/schema/GreenGrey-Nolikes.css @@ -326,11 +326,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicleft/schema/GreenGrey-Nominus-Nolikes.css b/ussrbasicleft/schema/GreenGrey-Nominus-Nolikes.css index 8ef3771..0fc9b9a 100644 --- a/ussrbasicleft/schema/GreenGrey-Nominus-Nolikes.css +++ b/ussrbasicleft/schema/GreenGrey-Nominus-Nolikes.css @@ -335,11 +335,19 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicleft/schema/GreenGrey-Nominus.css b/ussrbasicleft/schema/GreenGrey-Nominus.css index bc00674..d1ec3af 100644 --- a/ussrbasicleft/schema/GreenGrey-Nominus.css +++ b/ussrbasicleft/schema/GreenGrey-Nominus.css @@ -327,11 +327,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicleft/schema/GreenGrey.css b/ussrbasicleft/schema/GreenGrey.css index cec0d9b..5d2197c 100644 --- a/ussrbasicleft/schema/GreenGrey.css +++ b/ussrbasicleft/schema/GreenGrey.css @@ -321,11 +321,19 @@ blockquote { 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 { border-color: #383c4a !important; } + + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicleft/schema/dark.php b/ussrbasicleft/schema/dark.php index af4b122..18e92ac 100644 --- a/ussrbasicleft/schema/dark.php +++ b/ussrbasicleft/schema/dark.php @@ -1,5 +1,5 @@ -

{{$title}}

-{{if $entries}} -{{foreach $entries as $child}} -{{include file="suggest_friends.tpl" entry=$child}} -{{/foreach}} -{{/if}} -
-
{{$more}}
- diff --git a/ussrbasicpub/css/style.css b/ussrbasicpub/css/style.css index 43620d3..8ab5718 100644 --- a/ussrbasicpub/css/style.css +++ b/ussrbasicpub/css/style.css @@ -24,15 +24,15 @@ body { aside#region_1 { border-right: 1px solid transparent; - width: $left_aside_widthpx; - min-width: $left_aside_widthpx; - max-width: $left_aside_widthpx; + width: $left_aside_widthrem; + min-width: $left_aside_widthrem; + max-width: $left_aside_widthrem; } aside#region_3 { - width: $right_aside_widthpx; - min-width: $left_aside_widthpx; - max-width: $right_aside_widthpx; + width: $right_aside_widthrem; + min-width: $left_aside_widthrem; + max-width: $right_aside_widthrem; } aside#left_aside_wrapper, @@ -43,13 +43,13 @@ aside#right_aside_wrapper { main { margin-left: auto; margin-right: auto; - max-width: $main_widthpx; + max-width: $main_widthrem; } #overlay { position: fixed; top: 0; - left: $left_aside_widthpx; + left: $left_aside_widthrem; width: 100vw; height: 100vh; background: rgba(0, 0, 0, .3); @@ -400,34 +400,20 @@ footer { color: #444444; } -.vcard { - margin-bottom: 10px; - padding: 0px 10px 10px 10px; +.vcard-card { 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; } -.vcard dl, -.vcard .title { - margin-top: 10px; - margin-bottom: 0px; -} - -.connect-btn-wrapper { - margin-bottom: 10px; - -} - .profile-edit-side-link { - padding: 3px 0px; opacity: 0; - filter:alpha(opacity=30); - float: right; + filter:alpha(opacity=0); } -.vcard:hover .profile-edit-side-link { +.card:hover .profile-edit-side-link { opacity: 1; filter:alpha(opacity=100); } @@ -435,15 +421,6 @@ footer { #profile-photo-wrapper img { width: 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, @@ -571,8 +548,8 @@ footer { } .contact-block-img { - width:47px; - height:47px; + width: 2.95rem; + height: 2.95rem; margin-bottom: 3px; } @@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo { .widget { background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); border-radius: $radius; } @@ -1530,17 +1506,16 @@ blockquote { } main { - left: -$left_aside_widthpx; - width: calc( 100% + $left_aside_widthpx ); + left: -$left_aside_widthrem; + width: calc( 100% + $left_aside_widthrem ); } main.region_1-on { left: 0px; } - #nav-app-link-wrapper.has_location { + #nav-app-link-wrapper { min-width: 0; - flex-basis: 25%; } #nav-app-link-wrapper { @@ -1603,7 +1578,7 @@ dl.bb-dl > dd > li { content:"\f069 "; } -/* Modified original CSS to match input in Redbasic */ +/* Modified original CSS to match input in Ussrbasicpub */ .jothidden .bootstrap-tagsinput { border: 0px solid transparent; margin-bottom: 0px; @@ -1833,10 +1808,6 @@ span.default-highlight { width: 100%; } -.profile-match-wrapper { - width: 44% !important; -} - #region_3 { display: none !important; } diff --git a/ussrbasicpub/php/config.php b/ussrbasicpub/php/config.php index c2ed9e0..974a795 100644 --- a/ussrbasicpub/php/config.php +++ b/ussrbasicpub/php/config.php @@ -32,7 +32,7 @@ class UssrbasicpubConfig { } function get() { - if(! local_channel()) { + if(! local_channel()) { return; } @@ -59,7 +59,7 @@ class UssrbasicpubConfig { } function post() { - if(!local_channel()) { + if(!local_channel()) { return; } @@ -89,7 +89,7 @@ class UssrbasicpubConfig { if(get_pconfig(local_channel(), 'ussrbasicpub', 'advanced_theming')) $expert = 1; - + $o .= replace_macros(get_markup_template('theme_settings.tpl'), array( '$submit' => t('Submit'), '$baseurl' => z_root(), @@ -98,19 +98,19 @@ class UssrbasicpubConfig { '$title' => t("Theme settings"), '$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_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']), '$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']), '$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']), '$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_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')), '$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']), '$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')]] diff --git a/ussrbasicpub/php/style.php b/ussrbasicpub/php/style.php index 9374ccb..f9286d8 100644 --- a/ussrbasicpub/php/style.php +++ b/ussrbasicpub/php/style.php @@ -101,7 +101,7 @@ if (! $radius) if (! $shadow) $shadow = '0'; if (! $converse_width) - $converse_width = '790'; + $converse_width = '52'; //unit: rem if(! $top_photo) $top_photo = '2.3rem'; if(! $reply_photo) @@ -120,13 +120,13 @@ if(file_exists('view/theme/ussrbasicpub/css/style.css')) { $x .= $schemecss; } - $left_aside_width = 288; - $right_aside_width = 288; + $left_aside_width = 21; //unit: rem + $right_aside_width = 21; //unit: rem $main_width = $left_aside_width + $right_aside_width + intval($converse_width); // prevent main_width smaller than 768px - $main_width = (($main_width < 768) ? 768 : $main_width); + $main_width = (($main_width < 30) ? 30 : $main_width); $options = array ( '$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. if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicpub') - set_pconfig(local_channel(), '`ussrbasicpub', 'schema', '---'); + set_pconfig(local_channel(), 'ussrbasicpub', 'schema', '---'); diff --git a/ussrbasicpub/php/theme.php b/ussrbasicpub/php/theme.php index f1a366c..4b4c3bf 100644 --- a/ussrbasicpub/php/theme.php +++ b/ussrbasicpub/php/theme.php @@ -4,7 +4,7 @@ * * Name: Ussrbasicpub * * Description: ussr.win 2 column pub based on Hubzilla standard theme * * Version: 2.2 - * * MinVersion: 6.2 + * * MinVersion: 6.4 * * MaxVersion: 7.0 * * Author: Fabrixxm */ diff --git a/ussrbasicpub/schema/GreenGrey-Nolikes.css b/ussrbasicpub/schema/GreenGrey-Nolikes.css index ddef622..6c0e434 100644 --- a/ussrbasicpub/schema/GreenGrey-Nolikes.css +++ b/ussrbasicpub/schema/GreenGrey-Nolikes.css @@ -326,11 +326,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicpub/schema/GreenGrey-Nominus-Nolikes.css b/ussrbasicpub/schema/GreenGrey-Nominus-Nolikes.css index 8ef3771..c7c688b 100644 --- a/ussrbasicpub/schema/GreenGrey-Nominus-Nolikes.css +++ b/ussrbasicpub/schema/GreenGrey-Nominus-Nolikes.css @@ -335,11 +335,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicpub/schema/GreenGrey-Nominus.css b/ussrbasicpub/schema/GreenGrey-Nominus.css index bc00674..d1ec3af 100644 --- a/ussrbasicpub/schema/GreenGrey-Nominus.css +++ b/ussrbasicpub/schema/GreenGrey-Nominus.css @@ -327,11 +327,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicpub/schema/GreenGrey.css b/ussrbasicpub/schema/GreenGrey.css index cec0d9b..fe5f200 100644 --- a/ussrbasicpub/schema/GreenGrey.css +++ b/ussrbasicpub/schema/GreenGrey.css @@ -321,11 +321,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicpub/schema/dark.php b/ussrbasicpub/schema/dark.php index af4b122..18e92ac 100644 --- a/ussrbasicpub/schema/dark.php +++ b/ussrbasicpub/schema/dark.php @@ -1,5 +1,5 @@ -

{{$title}}

-{{if $entries}} -{{foreach $entries as $child}} -{{include file="suggest_friends.tpl" entry=$child}} -{{/foreach}} -{{/if}} -
-
{{$more}}
- diff --git a/ussrbasicright/css/style.css b/ussrbasicright/css/style.css index db56ddc..cd4c2a3 100644 --- a/ussrbasicright/css/style.css +++ b/ussrbasicright/css/style.css @@ -24,15 +24,15 @@ body { aside#region_1 { border-right: 1px solid transparent; - width: $left_aside_widthpx; - min-width: $left_aside_widthpx; - max-width: $left_aside_widthpx; + width: $left_aside_widthrem; + min-width: $left_aside_widthrem; + max-width: $left_aside_widthrem; } aside#region_3 { - width: $right_aside_widthpx; - min-width: $left_aside_widthpx; - max-width: $right_aside_widthpx; + width: $right_aside_widthrem; + min-width: $left_aside_widthrem; + max-width: $right_aside_widthrem; } aside#left_aside_wrapper, @@ -43,13 +43,13 @@ aside#right_aside_wrapper { main { margin-left: auto; margin-right: auto; - max-width: $main_widthpx; + max-width: $main_widthrem; } #overlay { position: fixed; top: 0; - left: $left_aside_widthpx; + left: $left_aside_widthrem; width: 100vw; height: 100vh; background: rgba(0, 0, 0, .3); @@ -400,34 +400,20 @@ footer { color: #444444; } -.vcard { - margin-bottom: 10px; - padding: 0px 10px 10px 10px; +.vcard-card { 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; } -.vcard dl, -.vcard .title { - margin-top: 10px; - margin-bottom: 0px; -} - -.connect-btn-wrapper { - margin-bottom: 10px; - -} - .profile-edit-side-link { - padding: 3px 0px; opacity: 0; - filter:alpha(opacity=30); - float: right; + filter:alpha(opacity=0); } -.vcard:hover .profile-edit-side-link { +.card:hover .profile-edit-side-link { opacity: 1; filter:alpha(opacity=100); } @@ -435,15 +421,6 @@ footer { #profile-photo-wrapper img { width: 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, @@ -571,8 +548,8 @@ footer { } .contact-block-img { - width:47px; - height:47px; + width: 2.95rem; + height: 2.95rem; margin-bottom: 3px; } @@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo { .widget { background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); border-radius: $radius; } @@ -1530,17 +1506,16 @@ blockquote { } main { - left: -$left_aside_widthpx; - width: calc( 100% + $left_aside_widthpx ); + left: -$left_aside_widthrem; + width: calc( 100% + $left_aside_widthrem ); } main.region_1-on { left: 0px; } - #nav-app-link-wrapper.has_location { + #nav-app-link-wrapper { min-width: 0; - flex-basis: 25%; } #nav-app-link-wrapper { @@ -1603,7 +1578,7 @@ dl.bb-dl > dd > li { content:"\f069 "; } -/* Modified original CSS to match input in Redbasic */ +/* Modified original CSS to match input in Ussrbasicright */ .jothidden .bootstrap-tagsinput { border: 0px solid transparent; margin-bottom: 0px; @@ -1833,10 +1808,6 @@ span.default-highlight { width: 100%; } -.profile-match-wrapper { - width: 44% !important; -} - #region_1 { display: none !important; } diff --git a/ussrbasicright/img/screenshot.png b/ussrbasicright/img/screenshot.png index 0a2357d..60d7e23 100644 Binary files a/ussrbasicright/img/screenshot.png and b/ussrbasicright/img/screenshot.png differ diff --git a/ussrbasicright/php/config.php b/ussrbasicright/php/config.php index fa0a2f9..bdfa966 100644 --- a/ussrbasicright/php/config.php +++ b/ussrbasicright/php/config.php @@ -32,7 +32,7 @@ class UssrbasicrightConfig { } function get() { - if(! local_channel()) { + if(! local_channel()) { return; } @@ -59,7 +59,7 @@ class UssrbasicrightConfig { } function post() { - if(!local_channel()) { + if(!local_channel()) { return; } @@ -89,7 +89,7 @@ class UssrbasicrightConfig { if(get_pconfig(local_channel(), 'ussrbasicright', 'advanced_theming')) $expert = 1; - + $o .= replace_macros(get_markup_template('theme_settings.tpl'), array( '$submit' => t('Submit'), '$baseurl' => z_root(), @@ -98,19 +98,19 @@ class UssrbasicrightConfig { '$title' => t("Theme settings"), '$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_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']), '$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']), '$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']), '$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_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')), '$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']), '$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')]] diff --git a/ussrbasicright/php/style.php b/ussrbasicright/php/style.php index 927f641..b054985 100644 --- a/ussrbasicright/php/style.php +++ b/ussrbasicright/php/style.php @@ -101,7 +101,7 @@ if (! $radius) if (! $shadow) $shadow = '0'; if (! $converse_width) - $converse_width = '790'; + $converse_width = '52'; //unit: rem if(! $top_photo) $top_photo = '2.3rem'; if(! $reply_photo) @@ -120,13 +120,13 @@ if(file_exists('view/theme/ussrbasicright/css/style.css')) { $x .= $schemecss; } - $left_aside_width = 288; - $right_aside_width = 288; + $left_aside_width = 21; //unit: rem + $right_aside_width = 21; //unit: rem $main_width = $left_aside_width + $right_aside_width + intval($converse_width); // prevent main_width smaller than 768px - $main_width = (($main_width < 768) ? 768 : $main_width); + $main_width = (($main_width < 30) ? 30 : $main_width); $options = array ( '$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. if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicright') - set_pconfig(local_channel(), '`ussrbasicright', 'schema', '---'); + set_pconfig(local_channel(), 'ussrbasicright', 'schema', '---'); diff --git a/ussrbasicright/php/theme.php b/ussrbasicright/php/theme.php index 7446650..b2c72ae 100644 --- a/ussrbasicright/php/theme.php +++ b/ussrbasicright/php/theme.php @@ -4,7 +4,7 @@ * * Name: Ussrbasicright * * Description: ussr.win 2 column left based on Hubzilla standard theme * * Version: 2.2 - * * MinVersion: 6.2 + * * MinVersion: 6.4 * * MaxVersion: 7.0 * * Author: Fabrixxm */ diff --git a/ussrbasicright/schema/GreenGrey-Nolikes.css b/ussrbasicright/schema/GreenGrey-Nolikes.css index ddef622..6c0e434 100644 --- a/ussrbasicright/schema/GreenGrey-Nolikes.css +++ b/ussrbasicright/schema/GreenGrey-Nolikes.css @@ -326,11 +326,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicright/schema/GreenGrey-Nominus-Nolikes.css b/ussrbasicright/schema/GreenGrey-Nominus-Nolikes.css index 8ef3771..c7c688b 100644 --- a/ussrbasicright/schema/GreenGrey-Nominus-Nolikes.css +++ b/ussrbasicright/schema/GreenGrey-Nominus-Nolikes.css @@ -335,11 +335,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicright/schema/GreenGrey-Nominus.css b/ussrbasicright/schema/GreenGrey-Nominus.css index bc00674..d1ec3af 100644 --- a/ussrbasicright/schema/GreenGrey-Nominus.css +++ b/ussrbasicright/schema/GreenGrey-Nominus.css @@ -327,11 +327,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicright/schema/GreenGrey.css b/ussrbasicright/schema/GreenGrey.css index cec0d9b..fe5f200 100644 --- a/ussrbasicright/schema/GreenGrey.css +++ b/ussrbasicright/schema/GreenGrey.css @@ -321,11 +321,18 @@ blockquote { 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 { border-color: #383c4a !important; } + +.text-muted { + color: #a6a6b9 !important; +} + +.card { + background-color: #434753 !important; +} + +.border { + border: 1px solid #415240 !important; +} \ No newline at end of file diff --git a/ussrbasicright/schema/dark.php b/ussrbasicright/schema/dark.php index af4b122..18e92ac 100644 --- a/ussrbasicright/schema/dark.php +++ b/ussrbasicright/schema/dark.php @@ -1,5 +1,5 @@ -

{{$title}}

-{{if $entries}} -{{foreach $entries as $child}} -{{include file="suggest_friends.tpl" entry=$child}} -{{/foreach}} -{{/if}} -
-
{{$more}}
-