From e5f3406cb5ef79d51c826fca2c845480324dc5ee Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 19 Aug 2022 13:30:38 +0000 Subject: time for a new screenshot --- view/theme/redbasic/img/screenshot.png | Bin 131184 -> 173915 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/img/screenshot.png b/view/theme/redbasic/img/screenshot.png index 60d7e23f6..80b217a21 100644 Binary files a/view/theme/redbasic/img/screenshot.png and b/view/theme/redbasic/img/screenshot.png differ -- cgit v1.2.3 From b1550f79228c230d86dad5e168a8498b3483d14e Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 19 Aug 2022 14:34:09 +0000 Subject: more css fixes --- view/theme/redbasic/css/style.css | 96 ++++++++++++++++++++------------------- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 51 insertions(+), 47 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d282e1a3b..c640eb4ba 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -8,6 +8,11 @@ /* generals */ +:root { + --bs-border-radius: $radius; +} + + html { font-size: $font_size; } @@ -605,7 +610,7 @@ nav .acpopup { #cboxContent { padding: 3px; border: 0px solid #fff; - border-radius: $radius; + border-radius: var(--bs-border-radius); background-color: #fff; z-index: 1052; } @@ -827,7 +832,7 @@ div.jGrowl div.jGrowl-notification { } .shared_header img { - border-radius: $radius; + border-radius: var(--bs-border-radius); margin-right: .75rem; } @@ -973,7 +978,7 @@ th,td { /* mail */ img.mail-conv-sender-photo { - border-radius: $radius; + border-radius: var(--bs-border-radius); } /* jot */ @@ -993,14 +998,14 @@ img.mail-conv-sender-photo { #profile-jot-wrapper { background-color: rgba(254, 254, 254, 1); border: 1px solid rgba(0, 0, 0, .2); - border-radius: $radius; + border-radius: var(--bs-border-radius); } #jot-title, #jot-pagetitle, #profile-jot-text { - border-radius: $radius; + border-radius: var(--bs-border-radius); } #profile-jot-text::-webkit-input-placeholder { @@ -1032,22 +1037,22 @@ img.mail-conv-sender-photo { /* conversation */ .top-radius { - border-top-right-radius: $radius; - border-top-left-radius: $radius; + border-top-right-radius: var(--bs-border-radius); + border-top-left-radius: var(--bs-border-radius); } .wall-event-item { padding: 10px; color: #fff; background-color: #3A87AD; /* should reflect calendar color */ - border-top-left-radius: $radius; - border-top-right-radius: $radius; + border-top-left-radius: var(--bs-border-radius); + border-top-right-radius: var(--bs-border-radius); } .wall-photo-item img { max-width: 100% !important; - border-top-right-radius: $radius; - border-top-left-radius: $radius; + border-top-right-radius: var(--bs-border-radius); + border-top-left-radius: var(--bs-border-radius); } .wall-item-footer { @@ -1057,8 +1062,8 @@ img.mail-conv-sender-photo { .wall-item-content-wrapper { background-color: $item_colour; - border-top-right-radius: $radius; - border-top-left-radius: $radius; + border-top-right-radius: var(--bs-border-radius); + border-top-left-radius: var(--bs-border-radius); } .wall-item-content-wrapper.comment { @@ -1085,8 +1090,8 @@ img.mail-conv-sender-photo { padding: 7px 10px; background-color: $item_colour; border-radius: 0px; - border-bottom-right-radius: $radius; - border-bottom-left-radius: $radius; + border-bottom-right-radius: var(--bs-border-radius); + border-bottom-left-radius: var(--bs-border-radius); border-top: 3px solid $comment_item_colour; } @@ -1099,7 +1104,7 @@ img.mail-conv-sender-photo { width: $top_photo; height: $top_photo; border: none; - border-radius: $radius; + border-radius: var(--bs-border-radius); box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -1124,7 +1129,7 @@ img.mail-conv-sender-photo { .comment-edit-text { border: 1px solid #e0e0e0; - border-radius: $radius; + border-radius: var(--bs-border-radius); } .divgrow-showmore { @@ -1145,7 +1150,7 @@ img.mail-conv-sender-photo { .widget { background-color: rgba(254,254,254,.5); - border-radius: $radius; + border-radius: var(--bs-border-radius); } .widget h3 { @@ -1155,7 +1160,7 @@ img.mail-conv-sender-photo { #note-text { - border-radius: $radius; + border-radius: var(--bs-border-radius); } .fileas-ul { @@ -1164,7 +1169,7 @@ img.mail-conv-sender-photo { #datebrowse-sidebar select { border: 1px solid #e0e0e0; - border-radius: $radius; + border-radius: var(--bs-border-radius); } .thing-show img { @@ -1186,24 +1191,24 @@ img.mail-conv-sender-photo { .chat-item-photo, .chat-item-photo-self { - border-radius: $radius; + border-radius: var(--bs-border-radius); } .chat-item-title, .chat-item-title-self { - border-radius: $radius; + border-radius: var(--bs-border-radius); background-color: $item_colour; } #chatMembers img { - border-radius: $radius; + border-radius: var(--bs-border-radius); } .menu-img-3 { width: 2.7rem; height: 2.7rem; margin-right: 5px; - border-radius: $radius; + border-radius: var(--bs-border-radius); float: left; } @@ -1211,14 +1216,14 @@ img.mail-conv-sender-photo { height: 1.8rem; width: 1.8rem; margin-right: 5px; - border-radius: $radius; + border-radius: var(--bs-border-radius); float: left; } .menu-img-1 { height: 1.1rem; width: 1.1rem; - border-radius: $radius; + border-radius: var(--bs-border-radius); } .usermenu { @@ -1228,7 +1233,7 @@ img.mail-conv-sender-photo { #avatar { width: 2.35rem; height: 2.35rem; - border-radius: $radius; + border-radius: var(--bs-border-radius); } #nav-app-link-wrapper.has_location .nav-link { @@ -1244,20 +1249,20 @@ img.mail-conv-sender-photo { .generic-content-wrapper-styled { background-color: $bgcolour; padding: 10px; - border-radius: $radius; + border-radius: var(--bs-border-radius); } .generic-content-wrapper { border: 1px solid #e0e0e0; - border-radius: $radius; + border-radius: var(--bs-border-radius); margin-bottom: 1.5rem; } .section-title-wrapper { padding: 7px 10px; background-color: $item_colour; - border-top-left-radius: $radius; - border-top-right-radius: $radius; + border-top-left-radius: var(--bs-border-radius); + border-top-right-radius: var(--bs-border-radius); border-bottom: 3px solid $comment_item_colour; } @@ -1327,22 +1332,22 @@ img.mail-conv-sender-photo { .section-content-wrapper .section-content-danger-wrapper { margin-bottom: 10px; border-bottom: none; - border-radius: $radius; + border-radius: var(--bs-border-radius); } .section-content-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - border-bottom-left-radius: $radius; - border-bottom-right-radius: $radius; + border-bottom-left-radius: var(--bs-border-radius); + border-bottom-right-radius: var(--bs-border-radius); word-wrap: break-word; } .section-content-wrapper-np { background-color: $comment_item_colour; - border-bottom-left-radius: $radius; - border-bottom-right-radius: $radius; + border-bottom-left-radius: var(--bs-border-radius); + border-bottom-right-radius: var(--bs-border-radius); word-wrap: break-word; } @@ -1409,12 +1414,12 @@ main.fullscreen .section-content-wrapper-np { .form-control, .nav-pills .nav-link, .nav-tabs .nav-link { - border-radius: $radius; + border-radius: var(--bs-border-radius); } .rounded-top { - border-top-left-radius: $radius !important; - border-top-right-radius: $radius !important; + border-top-left-radius: var(--bs-border-radius); + border-top-right-radius: var(--bs-border-radius); } blockquote { @@ -1427,7 +1432,6 @@ blockquote { .dropdown-menu { color: $font_colour; - border-radius: $radius; } .dropdown-item { @@ -1561,7 +1565,7 @@ dl.bb-dl > dd > li { margin-bottom: 0px; box-shadow: none; display: inline-block; - border-radius: $radius; + border-radius: var(--bs-border-radius); cursor: text; padding: 0px 10px; width: 100%; @@ -1685,8 +1689,8 @@ dl.bb-dl > dd > li { #ace-editor, #editor { - border-bottom-left-radius: $radius; - border-bottom-right-radius: $radius; + border-bottom-left-radius: var(--bs-border-radius); + border-bottom-right-radius: var(--bs-border-radius); } .sub-menu-wrapper { @@ -1733,7 +1737,7 @@ dl.bb-dl > dd > li { width: 64px; height: 64px; border: 1px solid #eee; - border-radius: $radius; + border-radius: var(--bs-border-radius); } .cloud-icon i { @@ -1746,7 +1750,7 @@ dl.bb-dl > dd > li { .cloud-icon img { max-width: 64px; max-height: 64px; - border-radius: $radius; + border-radius: var(--bs-border-radius); } .cloud-title { @@ -1786,5 +1790,5 @@ span.default-highlight { } .jg-entry img { - border-radius: $radius; + border-radius: var(--bs-border-radius); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index fd79b02a9..38e71be34 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -96,7 +96,7 @@ if (! $font_size) if (! $font_colour) $font_colour = '#4d4d4d'; if (! $radius) - $radius = '0.25rem'; + $radius = '0.375rem'; if (! $shadow) $shadow = '0'; if (! $converse_width) -- cgit v1.2.3 From 254dea7558191af140edb2597ea41f5a49756a53 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 19 Aug 2022 15:02:06 +0000 Subject: more css fixes --- view/theme/redbasic/css/style.css | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c640eb4ba..d395ae78b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -12,7 +12,6 @@ --bs-border-radius: $radius; } - html { font-size: $font_size; } @@ -1408,18 +1407,27 @@ main.fullscreen .section-content-wrapper-np { .notify-seen { background-color: $item_colour; } + /* bootstrap overrides */ -.btn, -.form-control, -.nav-pills .nav-link, -.nav-tabs .nav-link { - border-radius: var(--bs-border-radius); +.nav-tabs { + --bs-nav-tabs-border-radius: $radius; } -.rounded-top { - border-top-left-radius: var(--bs-border-radius); - border-top-right-radius: var(--bs-border-radius); +.nav-pills { + --bs-nav-pills-border-radius: $radius; +} + +.btn { + --bs-btn-border-radius: $radius; +} + +.card { + --bs-card-border-radius: $radius; +} + +.form-control { + border-radius: $radius; } blockquote { -- cgit v1.2.3 From aefe7ddd8fd09656f8c7311a7771e8be9e320388 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 20 Aug 2022 09:31:30 +0000 Subject: redbasic: make use of css variables and implement link_hover_colour --- view/theme/redbasic/css/style.css | 49 ++++++++++++++++-------------- view/theme/redbasic/php/config.php | 5 ++- view/theme/redbasic/php/style.php | 10 ++++-- view/theme/redbasic/schema/dark.php | 4 ++- view/theme/redbasic/tpl/theme_settings.tpl | 3 +- 5 files changed, 43 insertions(+), 28 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d395ae78b..0a45f18f3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -6,12 +6,33 @@ */ -/* generals */ +/* bootstrap variable */ :root { --bs-border-radius: $radius; + --bs-link-color: $link_colour; + --bs-link-hover-color: $link_hover_colour; +} + +.nav-tabs { + --bs-nav-tabs-border-radius: $radius; +} + +.nav-pills { + --bs-nav-pills-border-radius: $radius; } +.btn { + --bs-btn-border-radius: $radius; +} + +.card { + --bs-card-border-radius: $radius; +} + + +/* generals */ + html { font-size: $font_size; } @@ -109,7 +130,7 @@ abbr { a, .fakelink { - color: $link_colour; + color: var(--bs-link-color); } @@ -117,7 +138,7 @@ a:hover, a:focus, .fakelink:hover, .fakelink:focus { - color: $link_colour; + color: var(--bs-link-hover-color); } .fakelink, @@ -1410,22 +1431,6 @@ main.fullscreen .section-content-wrapper-np { /* bootstrap overrides */ -.nav-tabs { - --bs-nav-tabs-border-radius: $radius; -} - -.nav-pills { - --bs-nav-pills-border-radius: $radius; -} - -.btn { - --bs-btn-border-radius: $radius; -} - -.card { - --bs-card-border-radius: $radius; -} - .form-control { border-radius: $radius; } @@ -1617,11 +1622,11 @@ dl.bb-dl > dd > li { } .onoffswitch.checkbox:hover label { - color: $link_colour; + color: var(--bs-link-color); } .onoffswitch.checkbox:hover > div label { - border-color: $link_colour; + border-color: var(--bs-link-color); } .onoffswitch-inner { @@ -1665,7 +1670,7 @@ dl.bb-dl > dd > li { .onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; - background-color: $link_colour; + background-color: var(--bs-link-color); } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 0de475fe5..9d242fab0 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -42,6 +42,7 @@ class RedbasicConfig { $arr['nav_icon_colour'] = get_pconfig(local_channel(),'redbasic', 'nav_icon_colour' ); $arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'redbasic', 'nav_active_icon_colour' ); $arr['link_colour'] = get_pconfig(local_channel(),'redbasic', 'link_colour' ); + $arr['link_hover_colour'] = get_pconfig(local_channel(),'redbasic', 'link_hover_colour' ); $arr['banner_colour'] = get_pconfig(local_channel(),'redbasic', 'banner_colour' ); $arr['bgcolour'] = get_pconfig(local_channel(),'redbasic', 'background_colour' ); $arr['background_image'] = get_pconfig(local_channel(),'redbasic', 'background_image' ); @@ -69,6 +70,7 @@ class RedbasicConfig { set_pconfig(local_channel(), 'redbasic', 'nav_icon_colour', $_POST['redbasic_nav_icon_colour']); set_pconfig(local_channel(), 'redbasic', 'nav_active_icon_colour', $_POST['redbasic_nav_active_icon_colour']); set_pconfig(local_channel(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']); + set_pconfig(local_channel(), 'redbasic', 'link_hover_colour', $_POST['redbasic_link_hover_colour']); set_pconfig(local_channel(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']); set_pconfig(local_channel(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']); set_pconfig(local_channel(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); @@ -100,7 +102,8 @@ class RedbasicConfig { '$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), '$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), '$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), - '$link_colour' => array('redbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours), + '$link_colour' => array('redbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colour), + '$link_hover_colour' => array('redbasic_link_hover_colour', t('Link hover color'), $arr['link_hover_colour'], '', $link_hover_colour), '$banner_colour' => array('redbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']), '$bgcolour' => array('redbasic_background_colour', t('Set the background color'), $arr['bgcolour']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 38e71be34..45790ae37 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -16,6 +16,7 @@ if(! App::$install) { $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); $link_colour = get_pconfig($uid, 'redbasic', 'link_colour'); + $link_hover_colour = get_pconfig($uid, 'redbasic', 'link_hover_colour'); $schema = get_pconfig($uid,'redbasic','schema'); $bgcolour = get_pconfig($uid, 'redbasic', 'background_colour'); $background_image = get_pconfig($uid, 'redbasic', 'background_image'); @@ -79,6 +80,8 @@ if (! $nav_active_icon_colour) $nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)'; if (! $link_colour) $link_colour = '#0d6efd'; +if (! $link_hover_colour) + $link_hover_colour = '#0a58ca;'; if (! $banner_colour) $banner_colour = '#efefef'; if (! $bgcolour) @@ -111,9 +114,9 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - if($schema === 'dark' && file_exists('view/theme/redbasic/schema/bootstrap-nightfall.css')) { - $x .= file_get_contents('view/theme/redbasic/schema/bootstrap-nightfall.css'); - } + if($schema === 'dark' && file_exists('view/theme/redbasic/schema/bootstrap-nightfall.css')) { + $x .= file_get_contents('view/theme/redbasic/schema/bootstrap-nightfall.css'); + } if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { $x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); @@ -136,6 +139,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$nav_icon_colour' => $nav_icon_colour, '$nav_active_icon_colour' => $nav_active_icon_colour, '$link_colour' => $link_colour, + '$link_hover_colour' => $link_hover_colour, '$banner_colour' => $banner_colour, '$bgcolour' => $bgcolour, '$background_image' => $background_image, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 18e92ac93..cd9653a23 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -17,7 +17,9 @@ if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; if (! $link_colour) - $link_colour = "#fff"; + $link_colour = "#5f7b99;"; + if (! $link_hover_colour) + $link_hover_colour = "#4b6b8c"; if (! $banner_colour) $banner_colour = "#999"; if (! $bgcolour) diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index cc403f0a7..65b3a7883 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -15,6 +15,7 @@ {{*include file="field_input.tpl" field=$comment_indent*}} {{include file="field_colorinput.tpl" field=$font_colour}} {{include file="field_colorinput.tpl" field=$link_colour}} + {{include file="field_colorinput.tpl" field=$link_hover_colour}} {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$top_photo}} @@ -23,7 +24,7 @@