From 1d7d604016e6728725c4b857cec85c3d5a050268 Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Mon, 20 Aug 2018 00:15:34 -0400 Subject: Add bottom margin on aside elements and main to allow for viewport footer. --- view/theme/redbasic/css/style.css | 8 +++++++- view/theme/redbasic/php/style.php | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 970e4bc89..82d0cf761 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -33,13 +33,19 @@ aside #region_1 { } aside #left_aside_wrapper { - margin-bottom: 10px; + /*margin-bottom: 10px;*/ + margin-bottom: $bottom_margin; +} +aside #right_aside_wrapper { + /*margin-bottom: 10px;*/ + margin-bottom: $bottom_margin; } main { margin-left: auto; margin-right: auto; max-width: $main_widthpx; + margin-bottom: $bottom_margin; } #overlay { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 91cc0b85b..0631fa142 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -106,6 +106,8 @@ if(! $top_photo) $top_photo = '2.3rem'; if(! $reply_photo) $reply_photo = '2.3rem'; +if(! $bottom_margin) + $bottom_margin = '200px'; // Apply the settings if(file_exists('view/theme/redbasic/css/style.css')) { @@ -150,7 +152,9 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, '$main_width' => $main_width, - '$aside_width' => $aside_width + '$aside_width' => $aside_width, + '$bottom_margin' => $bottom_margin + ); echo str_replace(array_keys($options), array_values($options), $x); -- cgit v1.2.3 From 79eb6d39423c47c8c7809ed34cdc88effbb6e97e Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Tue, 21 Aug 2018 13:18:42 -0400 Subject: Fix jumpy sidebars --- view/theme/redbasic/css/style.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 82d0cf761..943b27637 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -45,6 +45,9 @@ main { margin-left: auto; margin-right: auto; max-width: $main_widthpx; +} + +main #region_2 { margin-bottom: $bottom_margin; } -- cgit v1.2.3 From 1753e404668b272a284bc922d3102acf04a6d6d1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 5 Sep 2018 12:32:53 +0200 Subject: Revert "Fix jumpy sidebars" This reverts commit 79eb6d39423c47c8c7809ed34cdc88effbb6e97e. --- view/theme/redbasic/css/style.css | 3 --- 1 file changed, 3 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 943b27637..82d0cf761 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -45,9 +45,6 @@ main { margin-left: auto; margin-right: auto; max-width: $main_widthpx; -} - -main #region_2 { margin-bottom: $bottom_margin; } -- cgit v1.2.3 From e494a76b33baae47aee671951cc4459a3f225c86 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 5 Sep 2018 12:34:30 +0200 Subject: revert "Add bottom margin on aside elements and main to allow for viewport footer." This reverts commit 1d7d604016e6728725c4b857cec85c3d5a050268. --- view/theme/redbasic/css/style.css | 8 +------- view/theme/redbasic/php/style.php | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 82d0cf761..970e4bc89 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -33,19 +33,13 @@ aside #region_1 { } aside #left_aside_wrapper { - /*margin-bottom: 10px;*/ - margin-bottom: $bottom_margin; -} -aside #right_aside_wrapper { - /*margin-bottom: 10px;*/ - margin-bottom: $bottom_margin; + margin-bottom: 10px; } main { margin-left: auto; margin-right: auto; max-width: $main_widthpx; - margin-bottom: $bottom_margin; } #overlay { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 0631fa142..91cc0b85b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -106,8 +106,6 @@ if(! $top_photo) $top_photo = '2.3rem'; if(! $reply_photo) $reply_photo = '2.3rem'; -if(! $bottom_margin) - $bottom_margin = '200px'; // Apply the settings if(file_exists('view/theme/redbasic/css/style.css')) { @@ -152,9 +150,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, '$main_width' => $main_width, - '$aside_width' => $aside_width, - '$bottom_margin' => $bottom_margin - + '$aside_width' => $aside_width ); echo str_replace(array_keys($options), array_values($options), $x); -- cgit v1.2.3 From 4f82428a207d426a5cace7c3749655b391e6c156 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 5 Sep 2018 14:31:34 +0200 Subject: hide cover photo by default and show it only if conditions are met --- view/theme/redbasic/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 970e4bc89..0a879cb71 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -32,7 +32,8 @@ aside #region_1 { border-right: 1px solid transparent; } -aside #left_aside_wrapper { +aside #left_aside_wrapper, +aside #right_aside_wrapper { margin-bottom: 10px; } -- cgit v1.2.3 From 673a2f67f16c00042aaf1394e42e88e2ad4dc20b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 6 Sep 2018 10:08:55 +0200 Subject: sticky-kit: improve handling --- view/theme/redbasic/js/redbasic.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index c905c92cb..70d196a02 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -18,26 +18,12 @@ $(document).ready(function() { $('#css3-calc').remove(); // Remove the test element if($(window).width() >= 992) { - $('#left_aside_wrapper').stick_in_parent({ - offset_top: parseInt($('aside').css('padding-top')), - parent: 'main', - spacer: '#left_aside_spacer' - }); - } - - if($(window).width() >= 992) { - $('#right_aside_wrapper').stick_in_parent({ + $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), - parent: 'main', - spacer: '#right_aside_spacer' + parent: 'main' }); } - - $('#notifications_wrapper.fs #notifications').stick_in_parent({ - parent: '#notifications_wrapper' - }); - $('#expand-aside').on('click', toggleAside); $('section').on('click', function() { -- cgit v1.2.3 From 54fa28441c5f0bdcd9687615f4a6b7a0fab024a3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 7 Sep 2018 11:26:02 +0200 Subject: install bootstrap via composer --- view/theme/redbasic/php/theme_init.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index d9750de42..5f73f6736 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -1,14 +1,14 @@ Date: Fri, 21 Sep 2018 11:15:18 +0200 Subject: fix can not enter text in notes widget --- view/theme/redbasic/js/redbasic.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 70d196a02..e32fd06e0 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -20,7 +20,8 @@ $(document).ready(function() { if($(window).width() >= 992) { $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), - parent: 'main' + parent: 'main', + spacer: '.aside_spacer' }); } -- cgit v1.2.3 From 32fba3991592a4188362ac3a7b8b6b2b3aac6b61 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 21 Sep 2018 11:22:11 +0200 Subject: fix typo --- view/theme/redbasic/js/redbasic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e32fd06e0..688e92148 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -43,7 +43,7 @@ $(document).ready(function() { }); - var right_aside_height = $('#rightt_aside_wrapper').height(); + var right_aside_height = $('#right_aside_wrapper').height(); $('#right_aside_wrapper').on('click', function() { if(right_aside_height != $('#right_aside_wrapper').height()) { -- cgit v1.2.3 From 4dd1521677851cb88a497cb5710fb272d9d4fc9d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 21 Sep 2018 12:16:36 +0200 Subject: fix position of nav settings icon --- view/theme/redbasic/css/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0a879cb71..a9ea29ba1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1514,11 +1514,15 @@ blockquote { left: 0px; } - #nav-app-link-wrapper { + #nav-app-link-wrapper.has_location { min-width: 0; flex-basis: 25%; } + #nav-app-link-wrapper { + margin-right: 0.5rem; + } + #navbar-collapse-2 .navbar-app i { font-size: 1rem; margin-right: 0.5rem; -- cgit v1.2.3 From 9b7c6e96f79ef1b2dc9d71d18db816ffd99f644c Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 23 Sep 2018 20:41:01 +0200 Subject: only show nav settings icon when hovering over nav --- view/theme/redbasic/css/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a9ea29ba1..c54f571a2 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1274,6 +1274,14 @@ img.mail-conv-sender-photo { white-space: nowrap; } +#nav-app-settings-link { + opacity: 0; +} + +nav:hover #nav-app-settings-link { + opacity: 1; +} + .page-title { margin: 7px 0px; } -- cgit v1.2.3 From 4a7c678213fca1ba3f98c96579368062297d425b Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 24 Sep 2018 09:46:19 +0200 Subject: fade in nav settings button --- view/theme/redbasic/css/style.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c54f571a2..97f4c67db 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1280,6 +1280,9 @@ img.mail-conv-sender-photo { nav:hover #nav-app-settings-link { opacity: 1; + transition: opacity .3s ease-in-out; + -moz-transition: opacity .3s ease-in-out; + -webkit-transition: opacity .3s ease-in-out; } .page-title { -- cgit v1.2.3 From c748230b35b16cdf1558671b26a49af41b253876 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 24 Sep 2018 11:51:20 +0200 Subject: revert nav settings opacity --- view/theme/redbasic/css/style.css | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 97f4c67db..a9ea29ba1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1274,17 +1274,6 @@ img.mail-conv-sender-photo { white-space: nowrap; } -#nav-app-settings-link { - opacity: 0; -} - -nav:hover #nav-app-settings-link { - opacity: 1; - transition: opacity .3s ease-in-out; - -moz-transition: opacity .3s ease-in-out; - -webkit-transition: opacity .3s ease-in-out; -} - .page-title { margin: 7px 0px; } -- cgit v1.2.3 From 9bb0f1d18ece05ac1d37800c61d0b071f560dac3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 25 Sep 2018 12:02:00 +0200 Subject: move advanced_theming switch to settings/display for now --- view/theme/redbasic/php/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index f98182739..ae926d07b 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -85,7 +85,7 @@ class RedbasicConfig { function form($arr) { - if(feature_enabled(local_channel(),'advanced_theming')) + if(get_pconfig(local_channel(), 'system', 'advanced_theming')) $expert = 1; -- cgit v1.2.3 From 9bc76b425948e7a6118e7749a3eb7c08c447bab3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 26 Sep 2018 15:02:20 +0200 Subject: appification of the pdl editor and move advanced_theming to theme settings where it belongs --- view/theme/redbasic/php/config.php | 6 ++++-- view/theme/redbasic/tpl/theme_settings.tpl | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index ae926d07b..d9d46c8f4 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -54,6 +54,7 @@ class RedbasicConfig { $arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width"); $arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo"); $arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo"); + $arr['advanced_theming'] = get_pconfig(local_channel(), 'redbasic', 'advanced_theming'); return $this->form($arr); } @@ -80,15 +81,15 @@ class RedbasicConfig { set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); + set_pconfig(local_channel(), 'redbasic', 'advanced_theming', $_POST['redbasic_advanced_theming']); } } function form($arr) { - if(get_pconfig(local_channel(), 'system', 'advanced_theming')) + if(get_pconfig(local_channel(), 'redbasic', 'advanced_theming')) $expert = 1; - $o .= replace_macros(get_markup_template('theme_settings.tpl'), array( '$submit' => t('Submit'), '$baseurl' => z_root(), @@ -112,6 +113,7 @@ class RedbasicConfig { '$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), + '$advanced_theming' => ['redbasic_advanced_theming', t('Show more custom theme settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] )); return $o; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 7c552b49e..cc403f0a7 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,6 +1,7 @@ {{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$converse_width}} {{include file="field_input.tpl" field=$font_size}} +{{include file="field_checkbox.tpl" field=$advanced_theming}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_icon_colour}} -- cgit v1.2.3 From 91502b4104788b4f2d57da800ffc4c38585de94d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 26 Sep 2018 15:13:19 +0200 Subject: change wording --- view/theme/redbasic/php/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index d9d46c8f4..0a779529d 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -113,7 +113,7 @@ class RedbasicConfig { '$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), - '$advanced_theming' => ['redbasic_advanced_theming', t('Show more custom theme settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] + '$advanced_theming' => ['redbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] )); return $o; -- cgit v1.2.3 From 7dadf387e58ade457698dc2ffc58bbda7be46652 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 1 Oct 2018 11:01:56 +0200 Subject: indicate locked features --- view/theme/redbasic/css/style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a9ea29ba1..4f0658477 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1677,11 +1677,9 @@ dl.bb-dl > dd > li { .form-group.checkbox > div > input:disabled + label .onoffswitch-switch { - background-color: red; - border-radius: 3px; + background-color: red; opacity: 0.3; filter:alpha(opacity=30); - } -- cgit v1.2.3 From ca5a1d0853a0cb30d10cb78911dbaf019e411824 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 10 Oct 2018 12:01:03 +0000 Subject: fix minor issue in dark and light schemas (cherry picked from commit 97fcc495f2d6638eb2fce1aad93ea3e775b2738e) --- view/theme/redbasic/schema/Focus-Light.css | 1 + view/theme/redbasic/schema/dark.css | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/schema/Focus-Light.css b/view/theme/redbasic/schema/Focus-Light.css index d23fc0fd8..7289acffe 100644 --- a/view/theme/redbasic/schema/Focus-Light.css +++ b/view/theme/redbasic/schema/Focus-Light.css @@ -1,3 +1,4 @@ +.dropdown-header.text-white-50, .navbar-dark .navbar-toggler, .navbar-dark .nav-link.active { color: rgba(0,0,0,0.7) !important; diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index dbee67c84..71f7bc393 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -152,6 +152,7 @@ option { background-color: #111; } +.dropdown-header.text-black-50, .nav-link.active { color:#fff !important; } @@ -373,7 +374,7 @@ pre { } .dropdown-menu >li > a { - color: #ccc; + color: #ccc !important; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { -- cgit v1.2.3