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

Merge remote-tracking branch 'upstream/dev' into wiki

Browse Source
This commit is contained in:
Andrew Manning
2016-07-20 05:39:08 -04:00
parent 50e581d88a 9421e42dad
commit e0d9d30bcf
70 changed files with 2832 additions and 2816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1416,9 +1416,6 @@ img.mail-conv-sender-photo {
display: block;
border-top: 1px dashed #ccc;
text-align: center;
font-size: $body_font_size;
color: $link_colour;
cursor: pointer;
}
.divgrow-showmore:hover {
@@ -1658,6 +1655,7 @@ main.fullscreen .section-content-wrapper-np {
display: none;
}
.atoken-index-row:hover td,
.chatroom-index-row:hover td,
.locs-index-row:hover td,
[id^="cloud-index-"]:hover td,

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

@@ -56,13 +56,14 @@ $(document).ready(function() {
function makeFullScreen(full) {
if(typeof full=='undefined' || full == true) {
$('main').css({'transition': 'none'}).addClass('fullscreen');
$('#fullscreen-btn, header, nav, aside, #tabs-collapse-1').css({'visibility': 'hidden'});
$('header, nav, aside, #fullscreen-btn').hide();
$('#tabs-collapse-1').css({'visibility': 'hidden'});
$('#inline-btn').show();
}
else {
$('main').removeClass('fullscreen');
$('#fullscreen-btn, header, nav, aside, #tabs-collapse-1').css({'visibility': ''});
$('header, nav, aside, #fullscreen-btn').show();
$('#tabs-collapse-1').css({'visibility': ''});
$('#inline-btn').hide();
$('main').css({'transition': ''});
}

24
view/theme/redbasic/php/style.php
View File

@@ -153,6 +153,18 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
$x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
}
if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
$x .= file_get_contents('view/theme/redbasic/css/align_left.css');
}
if($schemecss) {
$x .= $schemecss;
}
$aside_width = 287;
// left aside and right aside are 285px + converse width
@@ -204,18 +216,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
}
if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
}
if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
echo file_get_contents('view/theme/redbasic/css/align_left.css');
}
if($schemecss) {
echo $schemecss;
}
// 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'] != 'redbasic')