diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:39:08 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:39:08 -0400 |
| commit | e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272 (patch) | |
| tree | 27bd2e18dddc900edc39f34b47bfea749b3dcf61 /view/theme/redbasic | |
| parent | 50e581d88ad4901b13bbf99b2e58a5787b6bccec (diff) | |
| parent | 9421e42dad0bee6e0aa292d390cf249e1d7f7df4 (diff) | |
| download | volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.tar.gz volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.tar.bz2 volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'view/theme/redbasic')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 7 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 24 |
3 files changed, 17 insertions, 18 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a63042b87..6cc3e2f10 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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, diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 5209ad945..999b46268 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -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': ''}); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 83c35935a..2db0d4c44 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -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') |