From ed3494dc26c40011b90427441dbef786fa7052e2 Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 9 Mar 2023 08:54:52 -0700 Subject: [PATCH] Change border for dialog & flatpicker calendar in dark mode --- pixelegg/css/mobile.css | 28 +++++- pixelegg/css/monochrome.css | 28 +++++- pixelegg/css/pixelegg.css | 5 + pixelegg/less/darkmode.less | 181 ++++++++++++++++++++++++---------- pixelegg/mobile/fw_mobile.css | 28 +++++- 5 files changed, 211 insertions(+), 59 deletions(-) diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 0a06f66021..bffd28a79a 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -117,6 +117,11 @@ -webkit-box-shadow: 0px 0px 2px 2px #666666; -khtml-box-shadow: 0px 0px 2px 2px #666666; } + html[data-darkmode='1'] et2-dialog::part(panel), + html[data-darkmode='1'] body .flatpickr-calendar.open { + border: 1px solid hsl(240, 5%, 64.9%); + box-shadow: none; + } html[data-darkmode='1'] #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, html[data-darkmode='1'] #calendar_sidebox_header { border-color: #ff9dca !important; @@ -4315,11 +4320,30 @@ span.overlayContainer img.overlay { z-index: 1000; top: 45px; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select, -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select_chzn { +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select { width: 50% !important; margin-left: 10px; } +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item::part(checked-icon) { + border-radius: 50%; + width: 12px; + height: 12px; + margin-top: 5px; + margin-right: 5px; + visibility: visible; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="online"]::part(checked-icon) { + background: #2de0a5; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="away"]::part(checked-icon) { + background: #ffd21f; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="busy"]::part(checked-icon) { + background: #f5455c; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="offline"]::part(checked-icon) { + background: #cbced1; +} #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select_chzn a.chzn-single span { padding-top: 0px; } diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css index b627915156..4a5821003b 100644 --- a/pixelegg/css/monochrome.css +++ b/pixelegg/css/monochrome.css @@ -97,6 +97,11 @@ -webkit-box-shadow: 0px 0px 2px 2px #666666; -khtml-box-shadow: 0px 0px 2px 2px #666666; } + html[data-darkmode='1'] et2-dialog::part(panel), + html[data-darkmode='1'] body .flatpickr-calendar.open { + border: 1px solid hsl(240, 5%, 64.9%); + box-shadow: none; + } html[data-darkmode='1'] #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, html[data-darkmode='1'] #calendar_sidebox_header { border-color: #ff9dca !important; @@ -4295,11 +4300,30 @@ span.overlayContainer img.overlay { z-index: 1000; top: 45px; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select, -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select_chzn { +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select { width: 50% !important; margin-left: 10px; } +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item::part(checked-icon) { + border-radius: 50%; + width: 12px; + height: 12px; + margin-top: 5px; + margin-right: 5px; + visibility: visible; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="online"]::part(checked-icon) { + background: #2de0a5; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="away"]::part(checked-icon) { + background: #ffd21f; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="busy"]::part(checked-icon) { + background: #f5455c; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="offline"]::part(checked-icon) { + background: #cbced1; +} #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select_chzn a.chzn-single span { padding-top: 0px; } diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index be2cd7c872..a270693335 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -107,6 +107,11 @@ -webkit-box-shadow: 0px 0px 2px 2px #666666; -khtml-box-shadow: 0px 0px 2px 2px #666666; } + html[data-darkmode='1'] et2-dialog::part(panel), + html[data-darkmode='1'] body .flatpickr-calendar.open { + border: 1px solid hsl(240, 5%, 64.9%); + box-shadow: none; + } html[data-darkmode='1'] #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, html[data-darkmode='1'] #calendar_sidebox_header { border-color: #ff9dca !important; diff --git a/pixelegg/less/darkmode.less b/pixelegg/less/darkmode.less index 3ffa62d2b6..33eaef81a5 100644 --- a/pixelegg/less/darkmode.less +++ b/pixelegg/less/darkmode.less @@ -27,60 +27,135 @@ html[data-darkmode='1'] { - background: #000; - filter: invert(1) hue-rotate(180deg) brightness(1); - sl-menu-item::part(prefix), et2-select-country::part(prefix), - et2-email-tag::part(prefix), et2-button::part(prefix), *::part(image), img, #blueimp-gallery:not(:fullscreen), #blueimp-gallery ol, - iframe, #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active, - #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_content, - video, #loginMainDiv, .et2_taglist_tags_icon, .fw_avatar_stat, et2-lavatar[image=""]::part(base),et2-avatar-group, - .blueimp-gallery .slide { - filter: invert(1) hue-rotate(180deg) !important; - } - .dtree img {filter: invert(0) hue-rotate(180deg) !important;} - #blueimp-gallery { - video, .video-content{filter: invert(0) hue-rotate(180deg) !important;} + background: #000; + filter: invert(1) hue-rotate(180deg) brightness(1); + + sl-menu-item::part(prefix), et2-select-country::part(prefix), + et2-email-tag::part(prefix), et2-button::part(prefix), *::part(image), img, #blueimp-gallery:not(:fullscreen), #blueimp-gallery ol, + iframe, #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active, + #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_content, + video, #loginMainDiv, .et2_taglist_tags_icon, .fw_avatar_stat, et2-lavatar[image=""]::part(base), et2-avatar-group, + .blueimp-gallery .slide { + filter: invert(1) hue-rotate(180deg) !important; + } + + .dtree img { + filter: invert(0) hue-rotate(180deg) !important; + } + + #blueimp-gallery { + video, .video-content { + filter: invert(0) hue-rotate(180deg) !important; + } + } + + #loginMainDiv div#centerBox { + filter: invert(1) hue-rotate(180deg) !important; + } + + div.dhtmlxMenu_egw_SubLevelArea_Polygon, .egw_tooltip, + body .egw_message_wrapper, #egw_fw_header #egw_fw_topmenu, .ui-dialog, .box_shadow, + #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded { + box-shadow: 0px 0px 2px 2px #666666; + -moz-box-shadow: 0px 0px 2px 2px #666666; + -webkit-box-shadow: 0px 0px 2px 2px #666666; + -khtml-box-shadow: 0px 0px 2px 2px #666666; + } + + et2-dialog::part(panel), body .flatpickr-calendar.open { + border: 1px solid hsl(240 5% 64.9%); + box-shadow: none; + } + + //Calendar + #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #calendar_sidebox_header { + border-color: #ff9dca !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #calendar-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #ff9dca !important; + } + + //Addressbook + #addressbook_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #addressbook_sidebox_header { + border-color: #aadaff !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #addressbook-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #aadaff !important; + } + + //Infolog + #infolog_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #infolog_sidebox_header { + border-color: #ffccff !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #infolog-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #ffccff !important; + } + + //Timesheet + #timesheet_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #timesheet_sidebox_header { + border-color: #ffdbff !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #timesheet-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #ffdbff !important; + } + + //Mail + #mail_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #mail_sidebox_header { + border-color: #5db9ec !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #mail-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #5db9ec !important; + } + + //ProjectManager + #projectmanager_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #projectmanager_sidebox_header { + border-color: #487b7b !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #projectmanager-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #487b7b !important; + } + + //Resources + #resources_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #resources_sidebox_header { + border-color: #aee0e0 !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #resources-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #aee0e0 !important; + } + + //Admin + #admin_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #admin_sidebox_header { + border-color: #cccccc !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #admin-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #cccccc !important; + } + + //Filemamanger + #filemanager_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #filemanager_sidebox_header { + border-color: #ac4500 !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #filemanager-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #ac4500 !important; + } + + //Bookmarks + #bookmarks_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, #bookmarks_sidebox_header { + border-color: #cc6633 !important; + } + + #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #bookmarks-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active { + border-top-color: #cc6633 !important; } - #loginMainDiv div#centerBox{filter: invert(1) hue-rotate(180deg) !important;} - div.dhtmlxMenu_egw_SubLevelArea_Polygon,.egw_tooltip, - body .egw_message_wrapper,#egw_fw_header #egw_fw_topmenu,.ui-dialog, .box_shadow, - #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded - { - box-shadow: 0px 0px 2px 2px #666666; - -moz-box-shadow: 0px 0px 2px 2px #666666; - -webkit-box-shadow: 0px 0px 2px 2px #666666; - -khtml-box-shadow: 0px 0px 2px 2px #666666; - } - //Calendar - #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#calendar_sidebox_header {border-color:#ff9dca !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #calendar-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#ff9dca !important;} - //Addressbook - #addressbook_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#addressbook_sidebox_header {border-color:#aadaff !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #addressbook-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#aadaff !important;} - //Infolog - #infolog_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#infolog_sidebox_header {border-color:#ffccff !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #infolog-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#ffccff !important;} - //Timesheet - #timesheet_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#timesheet_sidebox_header {border-color:#ffdbff !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #timesheet-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#ffdbff !important;} - //Mail - #mail_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#mail_sidebox_header {border-color:#5db9ec!important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #mail-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#5db9ec !important;} - //ProjectManager - #projectmanager_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#projectmanager_sidebox_header {border-color:#487b7b !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #projectmanager-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#487b7b !important;} - //Resources - #resources_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#resources_sidebox_header {border-color:#aee0e0 !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #resources-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#aee0e0 !important;} - //Admin - #admin_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#admin_sidebox_header {border-color:#cccccc !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #admin-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#cccccc !important;} - //Filemamanger - #filemanager_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#filemanager_sidebox_header {border-color:#ac4500 !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #filemanager-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#ac4500 !important;} - //Bookmarks - #bookmarks_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,#bookmarks_sidebox_header {border-color:#cc6633 !important;} - #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #bookmarks-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {border-top-color:#cc6633 !important;} } } \ No newline at end of file diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 00d5e582be..54e51a1150 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -82,6 +82,11 @@ -webkit-box-shadow: 0px 0px 2px 2px #666666; -khtml-box-shadow: 0px 0px 2px 2px #666666; } + html[data-darkmode='1'] et2-dialog::part(panel), + html[data-darkmode='1'] body .flatpickr-calendar.open { + border: 1px solid hsl(240, 5%, 64.9%); + box-shadow: none; + } html[data-darkmode='1'] #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active, html[data-darkmode='1'] #calendar_sidebox_header { border-color: #ff9dca !important; @@ -4326,11 +4331,30 @@ span.overlayContainer img.overlay { z-index: 1000; top: 45px; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select, -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select_chzn { +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select { width: 50% !important; margin-left: 10px; } +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item::part(checked-icon) { + border-radius: 50%; + width: 12px; + height: 12px; + margin-top: 5px; + margin-right: 5px; + visibility: visible; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="online"]::part(checked-icon) { + background: #2de0a5; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="away"]::part(checked-icon) { + background: #ffd21f; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="busy"]::part(checked-icon) { + background: #f5455c; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select sl-menu-item[value="offline"]::part(checked-icon) { + background: #cbced1; +} #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items #rc_status_select_chzn a.chzn-single span { padding-top: 0px; }