From 975fdcdb34bb779e592ef0c227ac1a9557085063 Mon Sep 17 00:00:00 2001 From: zlaxy Date: Thu, 9 Sep 2021 13:22:28 +0300 Subject: [PATCH] hubzilla 6.2 --- ussrbasic/css/style.css | 29 ++++++++++++---------- ussrbasic/js/ussrbasic.js | 2 +- ussrbasic/php/style.php | 8 +++---- ussrbasic/php/theme.php | 4 ++-- ussrbasicleft/css/style.css | 37 ++++++++++++++++------------- ussrbasicleft/js/ussrbasicleft.js | 2 +- ussrbasicleft/php/style.php | 8 +++---- ussrbasicleft/php/theme.php | 4 ++-- ussrbasicpub/css/style.css | 37 ++++++++++++++++------------- ussrbasicpub/js/ussrbasicpub.js | 2 +- ussrbasicpub/php/style.php | 8 +++---- ussrbasicpub/php/theme.php | 4 ++-- ussrbasicright/css/style.css | 37 ++++++++++++++++------------- ussrbasicright/js/ussrbasicright.js | 2 +- ussrbasicright/php/style.php | 8 +++---- ussrbasicright/php/theme.php | 4 ++-- 16 files changed, 108 insertions(+), 88 deletions(-) diff --git a/ussrbasic/css/style.css b/ussrbasic/css/style.css index 647c392..5dad568 100644 --- a/ussrbasic/css/style.css +++ b/ussrbasic/css/style.css @@ -1195,6 +1195,12 @@ img.mail-conv-sender-photo { border-radius: $radius; } +.widget h3 { + font-size: 0.9rem; + text-transform: uppercase; +} + + #note-text { border-radius: $radius; } @@ -1272,7 +1278,7 @@ img.mail-conv-sender-photo { border-radius: $radius; } -#nav-app-link { +#nav-app-link-wrapper.has_location .nav-link { padding: 0 !important; line-height: 1.175; white-space: nowrap; @@ -1468,7 +1474,6 @@ blockquote { .dropdown-menu { color: $font_colour; - font-size: 0.9rem; border-radius: $radius; } @@ -1626,17 +1631,17 @@ dl.bb-dl > dd > li { /* Turn checkboxes into switches */ -.form-group.checkbox > div { +.onoffswitch.checkbox > div { position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } -.form-group.checkbox input { +.onoffswitch.checkbox input { display: none; } -.form-group.checkbox > div label { +.onoffswitch.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; border-radius: 12px; @@ -1647,11 +1652,11 @@ dl.bb-dl > dd > li { font-weight: normal; } -.form-group.checkbox:hover label { +.onoffswitch.checkbox:hover label { color: $link_colour; } -.form-group.checkbox:hover > div label { +.onoffswitch.checkbox:hover > div label { border-color: $link_colour; } @@ -1690,17 +1695,17 @@ dl.bb-dl > dd > li { -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } -.form-group.checkbox > div > input:checked + label .onoffswitch-inner { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-inner { margin-left: 0px; } -.form-group.checkbox > div > input:checked + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; background-color: #0275d8; } -.form-group.checkbox > div > input:disabled + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:disabled + label .onoffswitch-switch { background-color: red; opacity: 0.3; filter:alpha(opacity=30); @@ -1744,7 +1749,7 @@ dl.bb-dl > dd > li { border-left: 0.2rem solid #eee; } -.app-icon { +.app-icon i { color: #777; font-size: 80px; text-shadow: 3px 3px 3px lightgrey; @@ -1830,4 +1835,4 @@ span.default-highlight { .profile-match-wrapper { width: 44% !important; -} \ No newline at end of file +} diff --git a/ussrbasic/js/ussrbasic.js b/ussrbasic/js/ussrbasic.js index 08fdd41..f0c0587 100644 --- a/ussrbasic/js/ussrbasic.js +++ b/ussrbasic/js/ussrbasic.js @@ -50,7 +50,7 @@ $(document).ready(function() { }); $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'badge badge-pill badge-warning text-dark' + tagClass: 'badge rounded-pill bg-warning text-dark' }); $('a.disabled').click(function(e) { diff --git a/ussrbasic/php/style.php b/ussrbasic/php/style.php index 0cf2c5d..b8d5eb7 100644 --- a/ussrbasic/php/style.php +++ b/ussrbasic/php/style.php @@ -69,7 +69,7 @@ if ((!$schema) || ($schema == '---')) { } } - + //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) @@ -79,7 +79,7 @@ if (! $nav_icon_colour) if (! $nav_active_icon_colour) $nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)'; if (! $link_colour) - $link_colour = '#007bff'; + $link_colour = '#0d6efd'; if (! $banner_colour) $banner_colour = '#fff'; if (! $bgcolour) @@ -158,7 +158,7 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) { } -// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. +// 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'] != 'ussrbasic') - set_pconfig(local_channel(), 'ussrbasic', 'schema', '---'); + set_pconfig(local_channel(), '`ussrbasic', 'schema', '---'); diff --git a/ussrbasic/php/theme.php b/ussrbasic/php/theme.php index 7a4294f..2dbaf16 100644 --- a/ussrbasic/php/theme.php +++ b/ussrbasic/php/theme.php @@ -3,8 +3,8 @@ /** * * Name: Ussrbasic * * Description: ussr.win 3 column based on Hubzilla standard theme - * * Version: 2.1 - * * MinVersion: 5.9 + * * Version: 2.2 + * * MinVersion: 6.2 * * MaxVersion: 7.0 * * Author: Fabrixxm */ diff --git a/ussrbasicleft/css/style.css b/ussrbasicleft/css/style.css index 363d32a..7011b86 100644 --- a/ussrbasicleft/css/style.css +++ b/ussrbasicleft/css/style.css @@ -1195,6 +1195,12 @@ img.mail-conv-sender-photo { border-radius: $radius; } +.widget h3 { + font-size: 0.9rem; + text-transform: uppercase; +} + + #note-text { border-radius: $radius; } @@ -1272,7 +1278,7 @@ img.mail-conv-sender-photo { border-radius: $radius; } -#nav-app-link { +#nav-app-link-wrapper.has_location .nav-link { padding: 0 !important; line-height: 1.175; white-space: nowrap; @@ -1468,7 +1474,6 @@ blockquote { .dropdown-menu { color: $font_colour; - font-size: 0.9rem; border-radius: $radius; } @@ -1626,17 +1631,17 @@ dl.bb-dl > dd > li { /* Turn checkboxes into switches */ -.form-group.checkbox > div { +.onoffswitch.checkbox > div { position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } -.form-group.checkbox input { +.onoffswitch.checkbox input { display: none; } -.form-group.checkbox > div label { +.onoffswitch.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; border-radius: 12px; @@ -1647,11 +1652,11 @@ dl.bb-dl > dd > li { font-weight: normal; } -.form-group.checkbox:hover label { +.onoffswitch.checkbox:hover label { color: $link_colour; } -.form-group.checkbox:hover > div label { +.onoffswitch.checkbox:hover > div label { border-color: $link_colour; } @@ -1690,17 +1695,17 @@ dl.bb-dl > dd > li { -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } -.form-group.checkbox > div > input:checked + label .onoffswitch-inner { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-inner { margin-left: 0px; } -.form-group.checkbox > div > input:checked + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; background-color: #0275d8; } -.form-group.checkbox > div > input:disabled + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:disabled + label .onoffswitch-switch { background-color: red; opacity: 0.3; filter:alpha(opacity=30); @@ -1744,7 +1749,7 @@ dl.bb-dl > dd > li { border-left: 0.2rem solid #eee; } -.app-icon { +.app-icon i { color: #777; font-size: 80px; text-shadow: 3px 3px 3px lightgrey; @@ -1828,10 +1833,10 @@ span.default-highlight { width: 100%; } -#region_3 { - display: none !important; -} - .profile-match-wrapper { width: 44% !important; -} \ No newline at end of file +} + +#region_3 { + display: none !important; +} diff --git a/ussrbasicleft/js/ussrbasicleft.js b/ussrbasicleft/js/ussrbasicleft.js index e108951..d941f76 100644 --- a/ussrbasicleft/js/ussrbasicleft.js +++ b/ussrbasicleft/js/ussrbasicleft.js @@ -50,7 +50,7 @@ $(document).ready(function() { }); $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'badge badge-pill badge-warning text-dark' + tagClass: 'badge rounded-pill bg-warning text-dark' }); $('a.disabled').click(function(e) { diff --git a/ussrbasicleft/php/style.php b/ussrbasicleft/php/style.php index 85e1db0..229ff42 100644 --- a/ussrbasicleft/php/style.php +++ b/ussrbasicleft/php/style.php @@ -69,7 +69,7 @@ if ((!$schema) || ($schema == '---')) { } } - + //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) @@ -79,7 +79,7 @@ if (! $nav_icon_colour) if (! $nav_active_icon_colour) $nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)'; if (! $link_colour) - $link_colour = '#007bff'; + $link_colour = '#0d6efd'; if (! $banner_colour) $banner_colour = '#fff'; if (! $bgcolour) @@ -158,7 +158,7 @@ if(file_exists('view/theme/ussrbasicleft/css/style.css')) { } -// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. +// 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'] != 'ussrbasicleft') - set_pconfig(local_channel(), 'ussrbasicleft', 'schema', '---'); + set_pconfig(local_channel(), '`ussrbasicleft', 'schema', '---'); diff --git a/ussrbasicleft/php/theme.php b/ussrbasicleft/php/theme.php index 1f32d8c..3848e4d 100644 --- a/ussrbasicleft/php/theme.php +++ b/ussrbasicleft/php/theme.php @@ -3,8 +3,8 @@ /** * * Name: Ussrbasicleft * * Description: ussr.win 2 column left based on Hubzilla standard theme - * * Version: 2.1 - * * MinVersion: 5.9 + * * Version: 2.2 + * * MinVersion: 6.2 * * MaxVersion: 7.0 * * Author: Fabrixxm */ diff --git a/ussrbasicpub/css/style.css b/ussrbasicpub/css/style.css index 358f613..43620d3 100644 --- a/ussrbasicpub/css/style.css +++ b/ussrbasicpub/css/style.css @@ -1195,6 +1195,12 @@ img.mail-conv-sender-photo { border-radius: $radius; } +.widget h3 { + font-size: 0.9rem; + text-transform: uppercase; +} + + #note-text { border-radius: $radius; } @@ -1272,7 +1278,7 @@ img.mail-conv-sender-photo { border-radius: $radius; } -#nav-app-link { +#nav-app-link-wrapper.has_location .nav-link { padding: 0 !important; line-height: 1.175; white-space: nowrap; @@ -1468,7 +1474,6 @@ blockquote { .dropdown-menu { color: $font_colour; - font-size: 0.9rem; border-radius: $radius; } @@ -1626,17 +1631,17 @@ dl.bb-dl > dd > li { /* Turn checkboxes into switches */ -.form-group.checkbox > div { +.onoffswitch.checkbox > div { position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } -.form-group.checkbox input { +.onoffswitch.checkbox input { display: none; } -.form-group.checkbox > div label { +.onoffswitch.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; border-radius: 12px; @@ -1647,11 +1652,11 @@ dl.bb-dl > dd > li { font-weight: normal; } -.form-group.checkbox:hover label { +.onoffswitch.checkbox:hover label { color: $link_colour; } -.form-group.checkbox:hover > div label { +.onoffswitch.checkbox:hover > div label { border-color: $link_colour; } @@ -1690,17 +1695,17 @@ dl.bb-dl > dd > li { -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } -.form-group.checkbox > div > input:checked + label .onoffswitch-inner { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-inner { margin-left: 0px; } -.form-group.checkbox > div > input:checked + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; background-color: #0275d8; } -.form-group.checkbox > div > input:disabled + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:disabled + label .onoffswitch-switch { background-color: red; opacity: 0.3; filter:alpha(opacity=30); @@ -1744,7 +1749,7 @@ dl.bb-dl > dd > li { border-left: 0.2rem solid #eee; } -.app-icon { +.app-icon i { color: #777; font-size: 80px; text-shadow: 3px 3px 3px lightgrey; @@ -1828,10 +1833,10 @@ span.default-highlight { width: 100%; } -#region_3 { - display: none !important; -} - .profile-match-wrapper { width: 44% !important; -} \ No newline at end of file +} + +#region_3 { + display: none !important; +} diff --git a/ussrbasicpub/js/ussrbasicpub.js b/ussrbasicpub/js/ussrbasicpub.js index 87b7a5e..ed3914e 100644 --- a/ussrbasicpub/js/ussrbasicpub.js +++ b/ussrbasicpub/js/ussrbasicpub.js @@ -50,7 +50,7 @@ $(document).ready(function() { }); $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'badge badge-pill badge-warning text-dark' + tagClass: 'badge rounded-pill bg-warning text-dark' }); $('a.disabled').click(function(e) { diff --git a/ussrbasicpub/php/style.php b/ussrbasicpub/php/style.php index 2bb9df6..9374ccb 100644 --- a/ussrbasicpub/php/style.php +++ b/ussrbasicpub/php/style.php @@ -69,7 +69,7 @@ if ((!$schema) || ($schema == '---')) { } } - + //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) @@ -79,7 +79,7 @@ if (! $nav_icon_colour) if (! $nav_active_icon_colour) $nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)'; if (! $link_colour) - $link_colour = '#007bff'; + $link_colour = '#0d6efd'; if (! $banner_colour) $banner_colour = '#fff'; if (! $bgcolour) @@ -158,7 +158,7 @@ if(file_exists('view/theme/ussrbasicpub/css/style.css')) { } -// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. +// 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'] != 'ussrbasicpub') - set_pconfig(local_channel(), 'ussrbasicpub', 'schema', '---'); + set_pconfig(local_channel(), '`ussrbasicpub', 'schema', '---'); diff --git a/ussrbasicpub/php/theme.php b/ussrbasicpub/php/theme.php index 49155df..f1a366c 100644 --- a/ussrbasicpub/php/theme.php +++ b/ussrbasicpub/php/theme.php @@ -3,8 +3,8 @@ /** * * Name: Ussrbasicpub * * Description: ussr.win 2 column pub based on Hubzilla standard theme - * * Version: 2.1 - * * MinVersion: 5.9 + * * Version: 2.2 + * * MinVersion: 6.2 * * MaxVersion: 7.0 * * Author: Fabrixxm */ diff --git a/ussrbasicright/css/style.css b/ussrbasicright/css/style.css index 8ec0e5c..db56ddc 100644 --- a/ussrbasicright/css/style.css +++ b/ussrbasicright/css/style.css @@ -1195,6 +1195,12 @@ img.mail-conv-sender-photo { border-radius: $radius; } +.widget h3 { + font-size: 0.9rem; + text-transform: uppercase; +} + + #note-text { border-radius: $radius; } @@ -1272,7 +1278,7 @@ img.mail-conv-sender-photo { border-radius: $radius; } -#nav-app-link { +#nav-app-link-wrapper.has_location .nav-link { padding: 0 !important; line-height: 1.175; white-space: nowrap; @@ -1468,7 +1474,6 @@ blockquote { .dropdown-menu { color: $font_colour; - font-size: 0.9rem; border-radius: $radius; } @@ -1626,17 +1631,17 @@ dl.bb-dl > dd > li { /* Turn checkboxes into switches */ -.form-group.checkbox > div { +.onoffswitch.checkbox > div { position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } -.form-group.checkbox input { +.onoffswitch.checkbox input { display: none; } -.form-group.checkbox > div label { +.onoffswitch.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; border-radius: 12px; @@ -1647,11 +1652,11 @@ dl.bb-dl > dd > li { font-weight: normal; } -.form-group.checkbox:hover label { +.onoffswitch.checkbox:hover label { color: $link_colour; } -.form-group.checkbox:hover > div label { +.onoffswitch.checkbox:hover > div label { border-color: $link_colour; } @@ -1690,17 +1695,17 @@ dl.bb-dl > dd > li { -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } -.form-group.checkbox > div > input:checked + label .onoffswitch-inner { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-inner { margin-left: 0px; } -.form-group.checkbox > div > input:checked + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; background-color: #0275d8; } -.form-group.checkbox > div > input:disabled + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:disabled + label .onoffswitch-switch { background-color: red; opacity: 0.3; filter:alpha(opacity=30); @@ -1744,7 +1749,7 @@ dl.bb-dl > dd > li { border-left: 0.2rem solid #eee; } -.app-icon { +.app-icon i { color: #777; font-size: 80px; text-shadow: 3px 3px 3px lightgrey; @@ -1828,10 +1833,10 @@ span.default-highlight { width: 100%; } -#region_1 { - display: none !important;; -} - .profile-match-wrapper { width: 44% !important; -} \ No newline at end of file +} + +#region_1 { + display: none !important; +} diff --git a/ussrbasicright/js/ussrbasicright.js b/ussrbasicright/js/ussrbasicright.js index 608a758..0b01076 100644 --- a/ussrbasicright/js/ussrbasicright.js +++ b/ussrbasicright/js/ussrbasicright.js @@ -50,7 +50,7 @@ $(document).ready(function() { }); $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'badge badge-pill badge-warning text-dark' + tagClass: 'badge rounded-pill bg-warning text-dark' }); $('a.disabled').click(function(e) { diff --git a/ussrbasicright/php/style.php b/ussrbasicright/php/style.php index 937751f..927f641 100644 --- a/ussrbasicright/php/style.php +++ b/ussrbasicright/php/style.php @@ -69,7 +69,7 @@ if ((!$schema) || ($schema == '---')) { } } - + //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) @@ -79,7 +79,7 @@ if (! $nav_icon_colour) if (! $nav_active_icon_colour) $nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)'; if (! $link_colour) - $link_colour = '#007bff'; + $link_colour = '#0d6efd'; if (! $banner_colour) $banner_colour = '#fff'; if (! $bgcolour) @@ -158,7 +158,7 @@ if(file_exists('view/theme/ussrbasicright/css/style.css')) { } -// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. +// 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'] != 'ussrbasicright') - set_pconfig(local_channel(), 'ussrbasicright', 'schema', '---'); + set_pconfig(local_channel(), '`ussrbasicright', 'schema', '---'); diff --git a/ussrbasicright/php/theme.php b/ussrbasicright/php/theme.php index 6a0e05a..7446650 100644 --- a/ussrbasicright/php/theme.php +++ b/ussrbasicright/php/theme.php @@ -3,8 +3,8 @@ /** * * Name: Ussrbasicright * * Description: ussr.win 2 column left based on Hubzilla standard theme - * * Version: 2.1 - * * MinVersion: 5.9 + * * Version: 2.2 + * * MinVersion: 6.2 * * MaxVersion: 7.0 * * Author: Fabrixxm */