6.4
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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')]]
|
||||
|
||||
@@ -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', '---');
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
|
||||
|
||||
if (! $nav_bg)
|
||||
$nav_bg = "#000";
|
||||
if (! $nav_gradient_top)
|
||||
@@ -35,7 +35,7 @@
|
||||
if (! $font_colour)
|
||||
$font_colour = "#ccc";
|
||||
if (! $converse_width)
|
||||
$converse_width = "1024";
|
||||
|
||||
$converse_width = '52'; //unit: rem;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -347,11 +347,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;
|
||||
}
|
||||
@@ -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>
|
||||
Reference in New Issue
Block a user