diff options
-rw-r--r-- | view/theme/redbasic/css/style.css | 96 | ||||
-rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
-rw-r--r-- | view/tpl/notifications_widget.tpl | 4 |
3 files changed, 53 insertions, 49 deletions
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) diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index fcadf71e5..21a1067ef 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -542,13 +542,13 @@ </div> <div id="notifications" class="border border-top-0 rounded navbar-nav collapse"> {{foreach $notifications as $notification}} - <div class="border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse {{$notification.type}}-button"> + <div class="{{if $notification@first}}rounded-top {{/if}}{{if $notification@last}}rounded-bottom {{/if}}border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse {{$notification.type}}-button"> <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item fakelink notification-link" href="#" title="{{$notification.title}}" data-bs-target="#nav-{{$notification.type}}-sub" data-bs-toggle="collapse" data-sse_type="{{$notification.type}}"> <i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}} <span class="float-end badge bg-{{$notification.severity}} {{$notification.type}}-update"></span> </a> </div> - <div id="nav-{{$notification.type}}-sub" class="border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse notification-content" data-bs-parent="#notifications" data-sse_type="{{$notification.type}}"> + <div id="nav-{{$notification.type}}-sub" class="{{if $notification@last}}rounded-bottom {{/if}}border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse notification-content" data-bs-parent="#notifications" data-sse_type="{{$notification.type}}"> {{if $notification.viewall}} <a class="list-group-item text-decoration-none text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}"> <i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}} |