From ba0812c4477fcae0b910f63de8134529797d51dc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 27 Mar 2016 22:37:07 +0200 Subject: highlight table row on hover --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6ef9ea284..424055fbf 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1510,6 +1510,7 @@ nav .dropdown-menu { word-wrap: break-word; } +.locs-index-row:hover td, [id^="cloud-index-"]:hover td, .cloud-index-active { background-color: $item_colour; -- cgit v1.2.3 From 5462453bf2bde50166c68f90b08d24826dd07ba8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 Mar 2016 14:31:55 +0200 Subject: some work on mod chat --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 424055fbf..b92fe5afe 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1510,6 +1510,7 @@ nav .dropdown-menu { word-wrap: break-word; } +.chatroom-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, .cloud-index-active { -- cgit v1.2.3 From df891f4ad2eee3b07bad73d703a46364dad03508 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 00:37:40 +0200 Subject: more work on mod chat --- view/theme/redbasic/css/style.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b92fe5afe..7f9f621a3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1263,7 +1263,8 @@ img.mail-conv-sender-photo { .wall-item-content, .mail-conv-body, -.page-body { +.page-body, +.chat-item-text { font-size: $font_size; clear: both; } @@ -1366,9 +1367,9 @@ img.mail-conv-sender-photo { border-radius: $radiuspx; } -.chat-item-text { +.chat-item-title { border-radius: $radiuspx; - background-color: #eee; + background-color: $item_colour; } /* nav bootstrap */ -- cgit v1.2.3 From 1cd3b4182595b838a535dd6b6990251db05d49e6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 30 Mar 2016 22:13:24 -0700 Subject: deprecate $a->get_baseurl() --- view/theme/redbasic/php/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 66597332c..789efc612 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -97,7 +97,7 @@ if(feature_enabled(local_channel(),'expert')) $t = get_markup_template('theme_settings.tpl'); $o .= replace_macros($t, array( '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$theme' => $a->channel['channel_theme'], '$expert' => $expert, '$title' => t("Theme settings"), -- cgit v1.2.3 From 3fdd110e0775113d2246a9db16c6c920ecddf19d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 13:21:48 +0200 Subject: mod chat rework continued --- view/theme/redbasic/css/style.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7f9f621a3..43607a95c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1264,7 +1264,8 @@ img.mail-conv-sender-photo { .wall-item-content, .mail-conv-body, .page-body, -.chat-item-text { +.chat-item-text, +.chat-item-text-self { font-size: $font_size; clear: both; } @@ -1363,11 +1364,13 @@ img.mail-conv-sender-photo { cursor: pointer; } -.chat-item-photo { +.chat-item-photo, +.chat-item-photo-self { border-radius: $radiuspx; } -.chat-item-title { +.chat-item-title, +.chat-item-title-self { border-radius: $radiuspx; background-color: $item_colour; } -- cgit v1.2.3 From 6c2673ae2aa311ee92b5b12b969b4483b52eef53 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 22:42:28 +0200 Subject: various fixes regarding mod chat --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 43607a95c..443f96da9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1375,6 +1375,10 @@ img.mail-conv-sender-photo { background-color: $item_colour; } +#chatMembers img { + border-radius: $radiuspx; +} + /* nav bootstrap */ -- cgit v1.2.3 From 90a5ba01a35aeb3629ebe76069e68c64b913a4d5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 23:13:40 +0200 Subject: make fullscreen mode available for other modules and some cleanup --- view/theme/redbasic/css/style.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 443f96da9..3172a6520 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1518,6 +1518,20 @@ nav .dropdown-menu { word-wrap: break-word; } +.generic-content-wrapper.fullscreen { + position: fixed; + width: 100%; + height: 100%; + top: 0px; + left: 0px; + border-radius: 0px; + z-index: 10000; +} + +.generic-content-wrapper.fullscreen .section-title-wrapper { + border-radius: 0px; +} + .chatroom-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, -- cgit v1.2.3 From 50d9b2934742ad9fb0dc8354d405789e3c14cd00 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 00:16:39 +0200 Subject: slightly change the way fullscreen works and bring it to mod mail --- view/theme/redbasic/css/style.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3172a6520..6feb1154b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1519,19 +1519,27 @@ nav .dropdown-menu { } .generic-content-wrapper.fullscreen { - position: fixed; + position: absolute; width: 100%; height: 100%; top: 0px; left: 0px; + border: 0px; border-radius: 0px; - z-index: 10000; } .generic-content-wrapper.fullscreen .section-title-wrapper { border-radius: 0px; } +.generic-content-wrapper.fullscreen .section-content-wrapper { + border-radius: 0px; +} + +#inline-btn { + display: none; +} + .chatroom-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, -- cgit v1.2.3 From 9abd95fad3784a10fc48bc40f9b8a75d7d74edda Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 16:06:03 -0700 Subject: static App --- view/theme/redbasic/php/config.php | 2 +- view/theme/redbasic/php/style.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 789efc612..04cf4f904 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -98,7 +98,7 @@ if(feature_enabled(local_channel(),'expert')) $o .= replace_macros($t, array( '$submit' => t('Submit'), '$baseurl' => z_root(), - '$theme' => $a->channel['channel_theme'], + '$theme' => App::$channel['channel_theme'], '$expert' => $expert, '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6058a3c14..83c35935a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,6 +1,6 @@ install) { +if(! App::$install) { // Get the UID of the channel owner $uid = get_theme_uid(); @@ -218,5 +218,5 @@ if($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() && $a->channel && $a->channel['channel_theme'] != 'redbasic') +if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') set_pconfig(local_channel(), 'redbasic', 'schema', '---'); -- cgit v1.2.3 From 60bb8f25f7bd1e857f8e70769b83f9c75521db29 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 08:56:51 +0200 Subject: move fullscreen js code to redbasic.js where it belongs to --- view/theme/redbasic/js/redbasic.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index a4e13b8eb..21b51af36 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -52,3 +52,18 @@ $(document).ready(function() { } setInterval(function () {checkNotify();}, 10 * 1000); }); + +function makeFullScreen(full) { + if(typeof full=='undefined' || full == true) { + $('#fullscreen-btn, header, nav, aside').hide(); + $('main').css({'width': '100%', 'max-width': 'none', 'left': '0px'}); + $('#inline-btn').show(); + $('.generic-content-wrapper').addClass('fullscreen'); + } + else { + $('#fullscreen-btn, header, nav, aside').show(); + $('main').removeAttr('style'); + $('#inline-btn').hide(); + $('.generic-content-wrapper').removeClass('fullscreen'); + } +} -- cgit v1.2.3 From 3edd4ce78fcf6a5384ec503249c4e1f0fb6143ff Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 00:04:05 +0200 Subject: ease transition between fullscreen and inline view for small screens --- view/theme/redbasic/css/style.css | 4 +--- view/theme/redbasic/js/redbasic.js | 14 ++++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6feb1154b..9dcfcdf3e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1723,9 +1723,7 @@ nav .badge.mail-update:hover { } main { - -webkit-transition: all 0.25s ease-out; - -moz-transition: all 0.25s ease-out; - transition: all 0.25s ease-out; + transition: all 0.25s ease-in-out; } main { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 21b51af36..73628ebd9 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -55,15 +55,17 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('#fullscreen-btn, header, nav, aside').hide(); - $('main').css({'width': '100%', 'max-width': 'none', 'left': '0px'}); - $('#inline-btn').show(); + $('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'}); $('.generic-content-wrapper').addClass('fullscreen'); + $('#fullscreen-btn, header, nav, aside').css({'display': 'none'}); + $('#inline-btn').show(); + } else { - $('#fullscreen-btn, header, nav, aside').show(); - $('main').removeAttr('style'); - $('#inline-btn').hide(); + $('main').css({'left': '', 'width': '', 'max-width': ''}); $('.generic-content-wrapper').removeClass('fullscreen'); + $('#fullscreen-btn, header, nav, aside').css({'display': ''}); + $('#inline-btn').hide(); + $('main').css({'transition': ''}); } } -- cgit v1.2.3 From db4e9aeaadc15700aca737a620fb0a56c4ed3531 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 12:19:49 +0200 Subject: fullscreen mode for events --- view/theme/redbasic/css/style.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9dcfcdf3e..9a365d8a7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1521,10 +1521,8 @@ nav .dropdown-menu { .generic-content-wrapper.fullscreen { position: absolute; width: 100%; - height: 100%; top: 0px; left: 0px; - border: 0px; border-radius: 0px; } -- cgit v1.2.3 From f13096a6f3b26d9e88dc0d6c07c63a1d5f75346e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 18:00:03 +0200 Subject: various fixes --- view/theme/redbasic/css/style.css | 14 +++++++++++--- view/theme/redbasic/js/redbasic.js | 6 ++---- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9a365d8a7..903900e7f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1518,7 +1518,14 @@ nav .dropdown-menu { word-wrap: break-word; } -.generic-content-wrapper.fullscreen { +main.fullscreen { + left: 0px; + width: 100%; + height: 100%; + max-width: none; +} + +main.fullscreen .generic-content-wrapper { position: absolute; width: 100%; top: 0px; @@ -1526,11 +1533,12 @@ nav .dropdown-menu { border-radius: 0px; } -.generic-content-wrapper.fullscreen .section-title-wrapper { +main.fullscreen .section-title-wrapper { border-radius: 0px; } -.generic-content-wrapper.fullscreen .section-content-wrapper { +main.fullscreen .section-content-wrapper, +main.fullscreen .section-content-wrapper-np { border-radius: 0px; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 73628ebd9..877bcd840 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -55,15 +55,13 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'}); - $('.generic-content-wrapper').addClass('fullscreen'); + $('main').css({'transition': 'none'}).addClass('fullscreen'); $('#fullscreen-btn, header, nav, aside').css({'display': 'none'}); $('#inline-btn').show(); } else { - $('main').css({'left': '', 'width': '', 'max-width': ''}); - $('.generic-content-wrapper').removeClass('fullscreen'); + $('main').removeClass('fullscreen'); $('#fullscreen-btn, header, nav, aside').css({'display': ''}); $('#inline-btn').hide(); $('main').css({'transition': ''}); -- cgit v1.2.3