From aa33cacb62ef25cbab7c6ee1b253ed58072e6e44 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Mar 2017 16:42:55 +0100 Subject: style hashtags, mentions and categories. hide expand-aside button if not needed. css and class fixes --- view/theme/redbasic/css/style.css | 5 ++--- view/theme/redbasic/js/redbasic.js | 7 +++++++ view/theme/redbasic/php/style.php | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d81c8a75d..ba12bf3bd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1292,7 +1292,7 @@ img.mail-conv-sender-photo { } .wall-item-footer { - font-size: $body_font_size; + font-size: 0.75rem; margin-top: 2em; } @@ -1367,8 +1367,7 @@ img.mail-conv-sender-photo { .mail-conv-body, .page-body, .chat-item-text, -.chat-item-text-self, -#doco-content { +.chat-item-text-self { font-size: $font_size; clear: both; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 4686e93db..45d80186d 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -16,6 +16,8 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element + + if($(window).width() > 767) { $('#left_aside_wrapper').stick_in_parent({ offset_top: $('nav').outerHeight(true) + 10, @@ -24,6 +26,11 @@ $(document).ready(function() { }); } + if($('#region_1 .widget').length > 0) + $('#expand-aside').show(); + else + $('#expand-aside').hide(); + $('#expand-aside').on('click', toggleAside); $('section').on('click', function() { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6e8a43a47..08efcda4c 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -134,11 +134,11 @@ if (! $shadow) if (! $converse_width) $converse_width = '790'; if(! $top_photo) - $top_photo = '2.2rem'; + $top_photo = '2.3rem'; if(! $comment_indent) $comment_indent = '0px'; if(! $reply_photo) - $reply_photo = '2.2rem'; + $reply_photo = '2.3rem'; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; -- cgit v1.2.3