This commit is contained in:
ivan 2022-06-05 16:46:26 +03:00
parent d6ffbc416c
commit ba21527e80
195 changed files with 8430 additions and 506 deletions

View File

@ -397,7 +397,6 @@ footer {
.fn {
font-weight: bold;
font-size: 1rem;
color: #444444;
}
.vcard-card {
@ -418,11 +417,6 @@ footer {
filter:alpha(opacity=100);
}
#profile-photo-wrapper img {
width: 100%;
height: 100%;
}
#hide-friends-yes-label,
#hide-friends-no-label {
margin-left: 125px;
@ -851,7 +845,7 @@ div.jGrowl div.jGrowl-notification {
.shared_header img {
border-radius: $radius;
margin-right: 10px;
margin-right: .75rem;
}
.tag1 {
@ -1223,24 +1217,24 @@ img.mail-conv-sender-photo {
}
.menu-img-3 {
width: 3.3em;
height: 3.3em;
width: 2.7rem;
height: 2.7rem;
margin-right: 5px;
border-radius: $radius;
float: left;
}
.menu-img-2 {
height: 2.2em;
width: 2.2em;
height: 1.8rem;
width: 1.8rem;
margin-right: 5px;
border-radius: $radius;
float: left;
}
.menu-img-1 {
height: 1.28571429em;
width: 1.28571429em;
height: 1.1rem;
width: 1.1rem;
border-radius: $radius;
}
@ -1676,7 +1670,7 @@ dl.bb-dl > dd > li {
.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
right: 0px;
background-color: #0275d8;
background-color: $link_colour;
}
@ -1734,7 +1728,7 @@ dl.bb-dl > dd > li {
text-align: center;
}
#login-main, .rmagic-button {
.login-wrapper {
max-width: 400px;
margin-top: 20px;
margin-left: auto;
@ -1784,7 +1778,7 @@ dl.bb-dl > dd > li {
.oneway-overlay {
position: absolute;
text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
text-shadow: -1px 0 1px #fff, 0 1px 1px#fff, 1px 0 1px #fff, 0 -1px 1px #fff;
}
.cover-photo-review {

View File

@ -17,8 +17,13 @@ $(document).ready(function() {
}
$('#css3-calc').remove(); // Remove the test element
stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
if (document.querySelector('#region_1')) {
stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
}
if (document.querySelector('#region_3')) {
stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
}
$('#expand-aside').on('click', function() {
if($('main').hasClass('region_1-on')){
@ -121,8 +126,14 @@ function setStyle(element, cssProperty) {
}
function stickyScroll(sticky, stickyTop, container, topOffset, bottomOffset) {
var lastScrollTop = 0;
var sticky = document.querySelector(sticky);
if (!sticky) {
return;
}
var stickyHeight = sticky.getBoundingClientRect().height;
var stickyTop = document.querySelector(stickyTop);
var content = document.querySelector(container);

View File

@ -4,11 +4,14 @@
[region=aside]
[widget=fullprofile][/widget]
[widget=common_friends][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=categories][/widget]
[widget=tagcloud_wall][var=limit]50[/var][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[widget=notifications][/widget]
[widget=tagcloud_wall][var=limit]50[/var][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=newmember][/widget]
[/region]

View File

@ -1,6 +1,9 @@
[region=aside]
[widget=pubtagcloud][var=trending]8[/var][var=limit]100[/var][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[widget=notifications][/widget]
[widget=newmember][/widget]

View File

@ -36,9 +36,8 @@ if(! App::$install) {
// not --- like the mobile theme does instead.
// Allow layouts to over-ride the schema
if($_REQUEST['schema']) {
$schema = $_REQUEST['schema'];
if (isset($_REQUEST['schema']) && preg_match('/^[\w_-]+$/i', $_REQUEST['schema'])) {
$schema = $_REQUEST['schema'];
}
if (($schema) && ($schema != '---')) {
@ -75,7 +74,7 @@ if ((!$schema) || ($schema == '---')) {
if (! $nav_bg)
$nav_bg = '#343a40';
if (! $nav_icon_colour)
$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
$nav_icon_colour = 'rgba(255, 255, 255, 0.55)';
if (! $nav_active_icon_colour)
$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
if (! $link_colour)
@ -112,6 +111,10 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) {
$x = file_get_contents('view/theme/ussrbasic/css/style.css');
if($schema === 'dark' && file_exists('view/theme/ussrbasic/schema/bootstrap-nightfall.css')) {
$x .= file_get_contents('view/theme/ussrbasic/schema/bootstrap-nightfall.css');
}
if($narrow_navbar && file_exists('view/theme/ussrbasic/css/narrow_navbar.css')) {
$x .= file_get_contents('view/theme/ussrbasic/css/narrow_navbar.css');
}

View File

@ -4,9 +4,11 @@
* * Name: Ussrbasic
* * Description: ussr.win 3 column based on Hubzilla standard theme
* * Version: 2.2
* * MinVersion: 6.4
* * MaxVersion: 7.0
* * MinVersion: 6.5.13
* * MaxVersion: 8.0
* * Author: Fabrixxm
* * Theme_Color: #343a40
* * Background_Color: rgb(254,254,254)
*/
function ussrbasic_init(&$a) {

View File

@ -1,15 +1,38 @@
.comment .wall-item-body {
padding-left: 42px;
padding-left: 3rem;
}
.wall-item-content-wrapper.comment {
border-bottom: 1px solid #dee2e6;
.wall-item-content-wrapper {
border-bottom: 1px solid rgba(0,0,0,.125);
}
.hide-comments-outer,
.hide-comments-outer:hover {
border: 0;
}
.widget {
border: 1px solid #dee2e6;
border: 1px solid rgba(0,0,0,.125);
}
#note-text {
border: 1px solid transparent;
}
.vcard-card {
border: 1px solid rgba(0,0,0,.125);
border-bottom: 0;
}
.vcard-card .card {
border-top: 0;
border-right: 0;
border-left: 0;
}
.vcard-card .vcard {
border: 1px solid rgba(0,0,0,.125);
border-top: 0;
border-right: 0;
border-left: 0;
}

1898
ussrbasic/schema/bootstrap-nightfall.css vendored Normal file

File diff suppressed because it is too large Load Diff

View File

@ -157,6 +157,10 @@ option {
color:#fff !important;
}
.dropdown-item {
color: $font_colour;
}
a.btn, aside a {
font-weight: 400 !important;
}
@ -164,7 +168,7 @@ a.btn, aside a {
.btn {
background-color: #1e1e1e;
border-color: #222;
color: #ccc;
color: $font_colour;
text-shadow: none;
box-shadow: none;
}
@ -181,7 +185,7 @@ a.btn, aside a {
}
.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
background-color: #337AB7;
background-color: #20537E;
color: #FFF;
}
@ -192,8 +196,8 @@ a.btn, aside a {
}
.btn-success {
color: #FFF !important;
background-color: #5CB85C !important;
color: #ccc !important;
background-color: #336A33 !important;
border-color: #4CAE4C !important;
}
@ -216,7 +220,7 @@ a.btn, aside a {
}
.btn-danger, form#chat-destroy > input {
background-color: #D9534F !important;
background-color: #B22A26 !important;
border-color: #D43F3A !important;
color: #FFF !important;
}

View File

@ -397,7 +397,6 @@ footer {
.fn {
font-weight: bold;
font-size: 1rem;
color: #444444;
}
.vcard-card {
@ -418,11 +417,6 @@ footer {
filter:alpha(opacity=100);
}
#profile-photo-wrapper img {
width: 100%;
height: 100%;
}
#hide-friends-yes-label,
#hide-friends-no-label {
margin-left: 125px;
@ -851,7 +845,7 @@ div.jGrowl div.jGrowl-notification {
.shared_header img {
border-radius: $radius;
margin-right: 10px;
margin-right: .75rem;
}
.tag1 {
@ -1223,24 +1217,24 @@ img.mail-conv-sender-photo {
}
.menu-img-3 {
width: 3.3em;
height: 3.3em;
width: 2.7rem;
height: 2.7rem;
margin-right: 5px;
border-radius: $radius;
float: left;
}
.menu-img-2 {
height: 2.2em;
width: 2.2em;
height: 1.8rem;
width: 1.8rem;
margin-right: 5px;
border-radius: $radius;
float: left;
}
.menu-img-1 {
height: 1.28571429em;
width: 1.28571429em;
height: 1.1rem;
width: 1.1rem;
border-radius: $radius;
}
@ -1676,7 +1670,7 @@ dl.bb-dl > dd > li {
.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
right: 0px;
background-color: #0275d8;
background-color: $link_colour;
}
@ -1734,7 +1728,7 @@ dl.bb-dl > dd > li {
text-align: center;
}
#login-main, .rmagic-button {
.login-wrapper {
max-width: 400px;
margin-top: 20px;
margin-left: auto;
@ -1784,7 +1778,7 @@ dl.bb-dl > dd > li {
.oneway-overlay {
position: absolute;
text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
text-shadow: -1px 0 1px #fff, 0 1px 1px#fff, 1px 0 1px #fff, 0 -1px 1px #fff;
}
.cover-photo-review {
@ -1809,5 +1803,5 @@ span.default-highlight {
}
#region_3 {
display: none !important;
display: none !important;
}

View File

@ -17,8 +17,13 @@ $(document).ready(function() {
}
$('#css3-calc').remove(); // Remove the test element
stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
if (document.querySelector('#region_1')) {
stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
}
if (document.querySelector('#region_3')) {
stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
}
$('#expand-aside').on('click', function() {
if($('main').hasClass('region_1-on')){
@ -121,8 +126,14 @@ function setStyle(element, cssProperty) {
}
function stickyScroll(sticky, stickyTop, container, topOffset, bottomOffset) {
var lastScrollTop = 0;
var sticky = document.querySelector(sticky);
if (!sticky) {
return;
}
var stickyHeight = sticky.getBoundingClientRect().height;
var stickyTop = document.querySelector(stickyTop);
var content = document.querySelector(container);

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=appcategories][/widget]
[widget=appstore][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -4,5 +4,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,10 +0,0 @@
[region=aside]
[widget=archive][var=articles]1[/var][/widget]
[widget=categories][var=articles]1[/var][/widget]
[widget=tasklist][/widget]
[widget=notes][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=fullprofile][/widget]
[widget=profile][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,9 +0,0 @@
[region=aside]
[widget=categories][var=cards]1[/var][/widget]
[widget=tasklist][/widget]
[widget=notes][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -2,13 +2,16 @@
[widget=cover_photo][/widget]
[/region]
[region=aside]
[widget=notifications][/widget]
[widget=fullprofile][/widget]
[widget=tagcloud_wall][var=limit]50[/var][/widget]
[widget=categories][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=common_friends][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=categories][/widget]
[widget=tagcloud_wall][var=limit]50[/var][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=notifications][/widget]
[widget=vcard][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,5 +1,5 @@
[region=aside]
[widget=vcard][/widget]
[widget=profile][/widget]
[widget=chatroom_list][/widget]
[widget=bookmarkedchats][/widget]
[widget=suggestedchats][/widget]
@ -7,5 +7,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,11 @@
[region=aside]
[widget=vcard][/widget]
[widget=profile][/widget]
[widget=categories][var=files]1[/var][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,10 +1,10 @@
[region=aside]
[widget=follow][/widget]
[widget=collections][var=mode][connections[/arg][/widget]
[widget=suggestions][/widget]
[widget=findpeople][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,10 +1,10 @@
[region=aside]
[widget=vcard][/widget]
[widget=collections][var=mode]abook[/var][/widget]
[widget=suggestions][/widget]
[widget=findpeople][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -2,9 +2,11 @@
[widget=findpeople][/widget]
[widget=dirsort][/widget]
[widget=dirtags][/widget]
[widget=suggestions][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=collections][var=mode]groups[/var][/widget]
[widget=privacygroups][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,22 @@
[region=aside]
[widget=hq_controls][/widget]
[widget=messages][/widget]
[widget=hq_controls]
[var=wrapper_class]d-none d-lg-block[/var]
[var=entry_class]btn-outline-primary[/var]
[/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
[widget=notes]
[var=hidden]1[/var]
[var=app]1[/var]
[/widget]
$content
[widget=hq_controls]
[var=wrapper_class]hq_controls_fixed_bottom_center d-lg-none[/var]
[var=entry_class]btn-lg btn-primary shadow[/var]
[/widget]
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,8 @@
[region=aside]
[widget=vcard][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -4,5 +4,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -2,5 +2,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,10 +1,8 @@
[region=aside]
[widget=notifications][/widget]
[widget=activity_order][/widget]
[widget=activity_filter][/widget]
[widget=savedsearch][/widget]
[widget=suggestions][/widget]
[widget=notes][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=mailmenu][/widget]
[widget=permcats][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,8 +1,11 @@
[region=aside]
[widget=vcard][/widget]
[widget=profile][/widget]
[widget=photo_albums][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=fullprofile][/widget]
[widget=profile][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,11 +0,0 @@
[region=aside]
[widget=pubsites][/widget]
[widget=vcard][/widget]
[widget=rating][/widget]
[widget=suggestions][/widget]
[widget=findpeople][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=right_aside]
[/region]

View File

@ -2,5 +2,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -2,5 +2,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -4,5 +4,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=vcard][/widget]
[widget=tokens][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -2,5 +2,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=fullprofile][/widget]
[widget=profile][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -4,5 +4,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -36,9 +36,8 @@ if(! App::$install) {
// not --- like the mobile theme does instead.
// Allow layouts to over-ride the schema
if($_REQUEST['schema']) {
$schema = $_REQUEST['schema'];
if (isset($_REQUEST['schema']) && preg_match('/^[\w_-]+$/i', $_REQUEST['schema'])) {
$schema = $_REQUEST['schema'];
}
if (($schema) && ($schema != '---')) {
@ -75,7 +74,7 @@ if ((!$schema) || ($schema == '---')) {
if (! $nav_bg)
$nav_bg = '#343a40';
if (! $nav_icon_colour)
$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
$nav_icon_colour = 'rgba(255, 255, 255, 0.55)';
if (! $nav_active_icon_colour)
$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
if (! $link_colour)
@ -112,6 +111,10 @@ if(file_exists('view/theme/ussrbasicleft/css/style.css')) {
$x = file_get_contents('view/theme/ussrbasicleft/css/style.css');
if($schema === 'dark' && file_exists('view/theme/ussrbasicleft/schema/bootstrap-nightfall.css')) {
$x .= file_get_contents('view/theme/ussrbasicleft/schema/bootstrap-nightfall.css');
}
if($narrow_navbar && file_exists('view/theme/ussrbasicleft/css/narrow_navbar.css')) {
$x .= file_get_contents('view/theme/ussrbasicleft/css/narrow_navbar.css');
}

View File

@ -4,9 +4,11 @@
* * Name: Ussrbasicleft
* * Description: ussr.win 2 column left based on Hubzilla standard theme
* * Version: 2.2
* * MinVersion: 6.4
* * MaxVersion: 7.0
* * MinVersion: 6.5.13
* * MaxVersion: 8.0
* * Author: Fabrixxm
* * Theme_Color: #343a40
* * Background_Color: rgb(254,254,254)
*/
function ussrbasicleft_init(&$a) {

View File

@ -1,15 +1,38 @@
.comment .wall-item-body {
padding-left: 42px;
padding-left: 3rem;
}
.wall-item-content-wrapper.comment {
border-bottom: 1px solid #dee2e6;
.wall-item-content-wrapper {
border-bottom: 1px solid rgba(0,0,0,.125);
}
.hide-comments-outer,
.hide-comments-outer:hover {
border: 0;
}
.widget {
border: 1px solid #dee2e6;
border: 1px solid rgba(0,0,0,.125);
}
#note-text {
border: 1px solid transparent;
}
.vcard-card {
border: 1px solid rgba(0,0,0,.125);
border-bottom: 0;
}
.vcard-card .card {
border-top: 0;
border-right: 0;
border-left: 0;
}
.vcard-card .vcard {
border: 1px solid rgba(0,0,0,.125);
border-top: 0;
border-right: 0;
border-left: 0;
}

View File

@ -335,7 +335,6 @@ blockquote {
color: #dddccc;
}
#upgrade_info_aside {
border-color: #383c4a !important;
}

View File

@ -325,7 +325,6 @@ blockquote {
border-color: #383c4a !important;
}
.text-muted {
color: #a6a6b9 !important;
}

File diff suppressed because it is too large Load Diff

View File

@ -157,6 +157,10 @@ option {
color:#fff !important;
}
.dropdown-item {
color: $font_colour;
}
a.btn, aside a {
font-weight: 400 !important;
}
@ -164,7 +168,7 @@ a.btn, aside a {
.btn {
background-color: #1e1e1e;
border-color: #222;
color: #ccc;
color: $font_colour;
text-shadow: none;
box-shadow: none;
}
@ -181,7 +185,7 @@ a.btn, aside a {
}
.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
background-color: #337AB7;
background-color: #20537E;
color: #FFF;
}
@ -192,8 +196,8 @@ a.btn, aside a {
}
.btn-success {
color: #FFF !important;
background-color: #5CB85C !important;
color: #ccc !important;
background-color: #336A33 !important;
border-color: #4CAE4C !important;
}
@ -216,7 +220,7 @@ a.btn, aside a {
}
.btn-danger, form#chat-destroy > input {
background-color: #D9534F !important;
background-color: #B22A26 !important;
border-color: #D43F3A !important;
color: #FFF !important;
}

View File

@ -346,12 +346,7 @@ blockquote {
.table {
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;
}
@ -366,4 +361,4 @@ blockquote {
.border {
border: 1px solid #415240 !important;
}
}

View File

@ -397,7 +397,6 @@ footer {
.fn {
font-weight: bold;
font-size: 1rem;
color: #444444;
}
.vcard-card {
@ -418,11 +417,6 @@ footer {
filter:alpha(opacity=100);
}
#profile-photo-wrapper img {
width: 100%;
height: 100%;
}
#hide-friends-yes-label,
#hide-friends-no-label {
margin-left: 125px;
@ -851,7 +845,7 @@ div.jGrowl div.jGrowl-notification {
.shared_header img {
border-radius: $radius;
margin-right: 10px;
margin-right: .75rem;
}
.tag1 {
@ -1223,24 +1217,24 @@ img.mail-conv-sender-photo {
}
.menu-img-3 {
width: 3.3em;
height: 3.3em;
width: 2.7rem;
height: 2.7rem;
margin-right: 5px;
border-radius: $radius;
float: left;
}
.menu-img-2 {
height: 2.2em;
width: 2.2em;
height: 1.8rem;
width: 1.8rem;
margin-right: 5px;
border-radius: $radius;
float: left;
}
.menu-img-1 {
height: 1.28571429em;
width: 1.28571429em;
height: 1.1rem;
width: 1.1rem;
border-radius: $radius;
}
@ -1676,7 +1670,7 @@ dl.bb-dl > dd > li {
.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
right: 0px;
background-color: #0275d8;
background-color: $link_colour;
}
@ -1734,7 +1728,7 @@ dl.bb-dl > dd > li {
text-align: center;
}
#login-main, .rmagic-button {
.login-wrapper {
max-width: 400px;
margin-top: 20px;
margin-left: auto;
@ -1784,7 +1778,7 @@ dl.bb-dl > dd > li {
.oneway-overlay {
position: absolute;
text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
text-shadow: -1px 0 1px #fff, 0 1px 1px#fff, 1px 0 1px #fff, 0 -1px 1px #fff;
}
.cover-photo-review {
@ -1809,5 +1803,5 @@ span.default-highlight {
}
#region_3 {
display: none !important;
display: none !important;
}

View File

@ -17,8 +17,13 @@ $(document).ready(function() {
}
$('#css3-calc').remove(); // Remove the test element
stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
if (document.querySelector('#region_1')) {
stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
}
if (document.querySelector('#region_3')) {
stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
}
$('#expand-aside').on('click', function() {
if($('main').hasClass('region_1-on')){
@ -121,8 +126,14 @@ function setStyle(element, cssProperty) {
}
function stickyScroll(sticky, stickyTop, container, topOffset, bottomOffset) {
var lastScrollTop = 0;
var sticky = document.querySelector(sticky);
if (!sticky) {
return;
}
var stickyHeight = sticky.getBoundingClientRect().height;
var stickyTop = document.querySelector(stickyTop);
var content = document.querySelector(container);

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=appcategories][/widget]
[widget=appstore][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -4,5 +4,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,10 +0,0 @@
[region=aside]
[widget=archive][var=articles]1[/var][/widget]
[widget=categories][var=articles]1[/var][/widget]
[widget=tasklist][/widget]
[widget=notes][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=fullprofile][/widget]
[widget=profile][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,9 +0,0 @@
[region=aside]
[widget=categories][var=cards]1[/var][/widget]
[widget=tasklist][/widget]
[widget=notes][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -2,13 +2,16 @@
[widget=cover_photo][/widget]
[/region]
[region=aside]
[widget=notifications][/widget]
[widget=fullprofile][/widget]
[widget=tagcloud_wall][var=limit]50[/var][/widget]
[widget=categories][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=common_friends][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=categories][/widget]
[widget=tagcloud_wall][var=limit]50[/var][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=notifications][/widget]
[widget=vcard][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,5 +1,5 @@
[region=aside]
[widget=vcard][/widget]
[widget=profile][/widget]
[widget=chatroom_list][/widget]
[widget=bookmarkedchats][/widget]
[widget=suggestedchats][/widget]
@ -7,5 +7,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,11 @@
[region=aside]
[widget=vcard][/widget]
[widget=profile][/widget]
[widget=categories][var=files]1[/var][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,10 +1,10 @@
[region=aside]
[widget=follow][/widget]
[widget=collections][var=mode][connections[/arg][/widget]
[widget=suggestions][/widget]
[widget=findpeople][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,10 +1,10 @@
[region=aside]
[widget=vcard][/widget]
[widget=collections][var=mode]abook[/var][/widget]
[widget=suggestions][/widget]
[widget=findpeople][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -2,9 +2,11 @@
[widget=findpeople][/widget]
[widget=dirsort][/widget]
[widget=dirtags][/widget]
[widget=suggestions][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,10 @@
[region=aside]
[widget=collections][var=mode]groups[/var][/widget]
[widget=privacygroups][/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

View File

@ -1,7 +1,22 @@
[region=aside]
[widget=hq_controls][/widget]
[widget=messages][/widget]
[widget=hq_controls]
[var=wrapper_class]d-none d-lg-block[/var]
[var=entry_class]btn-outline-primary[/var]
[/widget]
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
[widget=notes]
[var=hidden]1[/var]
[var=app]1[/var]
[/widget]
$content
[widget=hq_controls]
[var=wrapper_class]hq_controls_fixed_bottom_center d-lg-none[/var]
[var=entry_class]btn-lg btn-primary shadow[/var]
[/widget]
[/region]
[region=right_aside]
[/region]

View File

@ -3,5 +3,8 @@
[widget=notifications][/widget]
[widget=newmember][/widget]
[/region]
[region=content]
$content
[/region]
[region=right_aside]
[/region]

Some files were not shown because too many files have changed in this diff Show More