harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
zotlabs 2017-01-04 15:29:14 -08:00
commit 982b596fa4
6 changed files with 97 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/theme/redbasic/css/style.css
View File

@ -1669,8 +1669,8 @@ nav .dropdown-menu {
main.fullscreen {
left: 0px;
width: 100%;
height: 100%;
width: 100vw;
height: 100vh;
max-width: none;
}

11
view/theme/redbasic/js/redbasic.js
View File

@ -30,6 +30,15 @@ $(document).ready(function() {
}
});
var left_aside_height = $('#left_aside_wrapper').height();
$('#left_aside_wrapper').on('click', function() {
if(left_aside_height != $('#left_aside_wrapper').height()) {
$(document.body).trigger("sticky_kit:recalc");
left_aside_height = $('#left_aside_wrapper').height();
}
});
if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) {
$('#expand-aside').hide();
}
@ -96,7 +105,7 @@ function toggleAside() {
$('main').addClass('region_1-on')
$('<div id="overlay"></div>').appendTo('section');
$('#left_aside_wrapper').stick_in_parent({
offset_top: $('nav').outerHeight(true)
offset_top: $('nav').outerHeight(true) - 10
});
}
}

23
view/theme/redbasic/schema/dark.css
View File

@ -433,3 +433,26 @@ pre {
.contextual-help-tool i {
color: $link_colour;
}
.profile-match-wrapper {
width: 150px;
height: 120px;
border: none;
}
.profile-match-name {
width: 144px;
white-space: nowrap;
text-overflow: ellipsis;
}
.widget-nav-pills-icons:hover + a {
background-color: #222;
}
.widget-nav-pills-checkbox:hover + a {
background-color: #222;
}

21
view/theme/redbasic/schema/simple_black_on_white.css
View File

@ -297,3 +297,24 @@ pre {
top: 50px;
}
.profile-match-wrapper {
width: 150px;
height: 120px;
border: none;
}
.profile-match-name {
width: 144px;
white-space: nowrap;
text-overflow: ellipsis;
}
.widget-nav-pills-icons:hover + a {
background-color: #F5F5F5;
}
.widget-nav-pills-checkbox:hover + a {
background-color: #F5F5F5;
}

20
view/theme/redbasic/schema/simple_green_on_black.css
View File

@ -383,3 +383,23 @@ pre {
.contextual-help-tool i {
color: $link_colour;
}
.profile-match-wrapper {
width: 150px;
height: 120px;
border: none;
}
.profile-match-name {
width: 144px;
white-space: nowrap;
text-overflow: ellipsis;
}
.widget-nav-pills-icons:hover + a {
background-color: #143D12;
}
.widget-nav-pills-checkbox:hover + a {
background-color: #143D12;
}

21
view/theme/redbasic/schema/simple_white_on_black.css
View File

@ -356,3 +356,24 @@ pre {
.contextual-help-tool i {
color: $link_colour;
}
.profile-match-wrapper {
width: 150px;
height: 120px;
border: none;
}
.profile-match-name {
width: 144px;
white-space: nowrap;
text-overflow: ellipsis;
}
.widget-nav-pills-icons:hover + a {
background-color: #030303;
}
.widget-nav-pills-checkbox:hover + a {
background-color: #030303;
}