From 677841ad540c034d14cc278806215083dd68b66a Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 6 Apr 2023 00:59:55 +0530 Subject: [PATCH 01/47] Convert jquery to vanilla js --- core/css/guest.css | 18 +++++++++--------- core/js/custom-login.js | 40 ++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index de2d778e..42a83c56 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -984,7 +984,7 @@ p.info { background-image: url('../img/actions/checkmark-white.svg?v=1'); } -#body-login .warning-messsage .icon-checkmark-white { +#body-login .warning-message .icon-checkmark-white { background-image: url('../img/actions/checkmark-success.svg?v=1'); } @@ -1134,7 +1134,7 @@ a.legal { max-height: 100%; transition: all 0.3s linear; } -#body-login .warning-messsage { +#body-login .warning-message { width: 50%; margin: 0 auto; margin-top: 0; @@ -1400,7 +1400,7 @@ a.legal { .v-align header{ width: 100%; } -.warning-messsage header{ +.warning-message header{ margin-top: 0; } .sign-in-label { @@ -1415,11 +1415,11 @@ a.legal { width: 100%; margin: 0 auto; } -.warning-messsage main{ +.warning-message main{ margin-bottom: 0; max-width: 90%; } -.warning-messsage main{ +.warning-message main{ margin-bottom: 0; max-width: 60%; } @@ -1533,7 +1533,7 @@ a.legal { .banner-content-why-murena{ margin: 5% 0 5% 0; } - .warning-messsage main{ + .warning-message main{ max-width: 90%; overflow-x: auto; } @@ -1561,10 +1561,10 @@ a.legal { .lines{ display: none; } - #body-login .warning-messsage { + #body-login .warning-message { width: 80%; } - .warning-messsage main{ + .warning-message main{ max-width: 90%; } #body-login .update, #body-login .success { @@ -1588,7 +1588,7 @@ a.legal { margin: 0 auto; height: 100%; } - #body-login .warning-messsage { + #body-login .warning-message { width: 90%; } } diff --git a/core/js/custom-login.js b/core/js/custom-login.js index 03929d77..4a375fa4 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -1,20 +1,20 @@ -$(document).on('click','#lost-password', function(){ - if(window.innerWidth > 1050){ - $('.banner-content').hide('slow'); - $('.have-an-account').hide('slow'); - $('.banner-right-align').addClass('width0'); - $('.lines').hide(); - $('.v-align').addClass('warning-messsage'); - $('footer').addClass('forgotpass-footer'); - } -}); -$(document).on('click','.lost-password-container a', function(){ - if(window.innerWidth > 1050){ - $('.banner-right-align').removeClass('width0'); - $('.v-align').removeClass('warning-messsage'); - $('footer').removeClass('forgotpass-footer'); - $('.lines').show('slow'); - $('.banner-content').show('slow'); - $('.have-an-account').show('slow'); - } -}); +document.addEventListener('DOMContentLoaded', function () { + document.addEventListener("click", function (event) { + if (event.target.id === "lost-password" && window.innerWidth > 1050) { + document.querySelector(".banner-content").style.display = "none"; + document.querySelector(".have-an-account").style.display = "none"; + document.querySelector(".banner-right-align").addClass("width0"); + document.querySelector(".lines").style.display = "none"; + document.querySelector(".v-align").classList.add("warning-message"); + document.querySelector("footer").classList.add("forgotpass-footer"); + } + else if (event.target.parentNode.classList.contains("lost-password-container") && window.innerWidth > 1050) { + document.querySelector(".banner-right-align").classList.remove("width0"); + document.querySelector(".v-align").classList.remove("warning-message"); + document.querySelector("footer").classList.remove("forgotpass-footer"); + document.querySelector(".lines").style.display = "block"; + document.querySelector(".banner-content").style.display = "block"; + document.querySelector(".have-an-account").style.display = "block"; + } + }) +}) -- GitLab From ccbafd54260a8d9ccd96bec02ebb5097ec2cddad Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 7 Apr 2023 00:45:45 +0530 Subject: [PATCH 02/47] override data-theme-light --- core/css/server.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index fd37cc16..2adfa4bc 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -26,7 +26,7 @@ * { font-family: 'Roboto'; } -:root { +[data-theme-light] { --color-primary: #007fff; --color-primary-element: #007fff; --color-secondary-element: white; -- GitLab From c092e62f92e03f926155f14040e5310460dcaa7d Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 7 Apr 2023 00:48:44 +0530 Subject: [PATCH 03/47] Add :root --- core/css/server.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index 2adfa4bc..f5f1d3d8 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -26,7 +26,7 @@ * { font-family: 'Roboto'; } -[data-theme-light] { +:root, [data-theme-light] { --color-primary: #007fff; --color-primary-element: #007fff; --color-secondary-element: white; -- GitLab From 1ccc111cfc3eb8798a2f12fa8e7d9c8a0b5ea963 Mon Sep 17 00:00:00 2001 From: Akhil Date: Sat, 8 Apr 2023 00:49:33 +0530 Subject: [PATCH 04/47] Fix search icon --- core/css/server.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index f5f1d3d8..9e1f489d 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -916,6 +916,8 @@ body.theme--highcontrast #header .header-right .magnify-icon { #header .header-right .magnify-icon { background: var(--icon-search-000) no-repeat center; background-size: 15px; + width: inherit; + height: inherit; } #content.app-files #filestable span, -- GitLab From 2723978a8303158cbfa2dad55f83b1edee3d3f99 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 14 Apr 2023 00:03:47 +0530 Subject: [PATCH 05/47] Remove quota increase button styles --- core/css/server.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 9e1f489d..8eec9c17 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -92,7 +92,6 @@ input[type="reset"]:hover, #new-contact-button:hover, #new-user-button:hover, #deleteaccount:hover, -#quotaincreasebutton:hover, #content-vue.app-tasks .action.icon-checkmark:hover, .button.today:hover, button.import-contact__button-main:hover, @@ -119,7 +118,6 @@ button.primary:active, #new-contact-button, #new-user-button, #deleteaccount, -#quotaincreasebutton, .mx-datepicker .mx-datepicker-footer .mx-btn, #content-vue.app-tasks .action.icon-checkmark, button.import-contact__button-main, @@ -1691,9 +1689,7 @@ progress { display: none !important; } -button#quotaincreasebutton { - margin-top: 15px !important; -} + @media only screen and(max-width: 640px) { .new-icons .color-icons { height: 50px; -- GitLab From 30b3c1a83425b3bd9508de5754666c924dfe3b99 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 14 Apr 2023 17:57:08 +0530 Subject: [PATCH 06/47] Fix app menu --- core/css/server.css | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 8eec9c17..31d75b46 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -298,10 +298,10 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, .nc-theming-contrast { color: #fff; } -#appmenu:not(.inverted) svg { +#header .app-menu:not(.inverted) svg { filter: none; } -#appmenu.inverted svg { +#header .app-menu.inverted svg { filter: invert(1); } .icon-folder, @@ -335,7 +335,7 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, opacity: 1; } -#appmenu li span { +#header .app-menu li span { color: var(--color-main-text); } @@ -1150,28 +1150,28 @@ button.menuitem:hover .icon-delete, background-image: var(--icon-delete-e9322d); } -#appmenu li a span { +#header .app-menu li a span { color: transparent; } -#appmenu li:hover a span { +#header .app-menu li:hover a span { color: var(--icon-inactive-color); } -body.theme--highcontrast #appmenu li:hover a span { +body.theme--highcontrast #header .app-menu li:hover a span { color: var(--color-main-text); } -#appmenu li:hover a svg { +#header .app-menu li:hover a svg { color: var(--color-main-text); transform: translateY(-7px); } -#appmenu:hover li svg, -#appmenu:hover li .icon-more, -#appmenu:hover li .icon-more-white, -#appmenu:hover li .icon-loading-small, -#appmenu:hover li .icon-loading-small-dark { +#header .app-menu:hover li svg, +#header .app-menu:hover li .icon-more, +#header .app-menu:hover li .icon-more-white, +#header .app-menu:hover li .icon-loading-small, +#header .app-menu:hover li .icon-loading-small-dark { transform: none; } @@ -1657,8 +1657,8 @@ button.edit-output-dir span.icon-rename, background-image: url("../img/app-icons/Cookbook.svg"); } -#appmenu li:hover a, -#appmenu li a:focus { +#header .app-menu li:hover a, +#header .app-menu li a:focus { font-size: 12px; font-family: 'Roboto'; letter-spacing: 1px; @@ -1679,8 +1679,8 @@ progress { border-radius: 10px 10px !important; height: 12px !important; } -#appmenu li a:focus .icon-more, -#appmenu li a:focus .icon-more-white { +#header .app-menu li a:focus .icon-more, +#header .app-menu li a:focus .icon-more-white { transform: none !important; } #more-apps:hover span, @@ -1722,22 +1722,22 @@ body.theme--highcontrast svg.material-design-icon__svg { font-size: 12px; color: var(--color-text-lighter); } -body.theme--dark #header #appmenu li a { +body.theme--dark #header .app-menu li a { opacity: 1; } -body.theme--light.theme--highcontrast #header #appmenu li a { +body.theme--light.theme--highcontrast #header .app-menu li a { opacity: 1; filter: invert(0); } -body.theme--highcontrast #header #appmenu li a { +body.theme--highcontrast #header .app-menu li a { opacity: 1; filter: invert(1); } -body.theme--highcontrast #header #appmenu li a.active { +body.theme--highcontrast #header .app-menu li a.active { filter: invert(0); } -body.theme--highcontrast #header #appmenu li .icon-more-white { +body.theme--highcontrast #header .app-menu li .icon-more-white { background-image: var(--icon-more-000); } body.theme--dark.theme--highcontrast #header .header-menu.unified-search a.header-menu__trigger, @@ -1745,8 +1745,8 @@ body.theme--highcontrast #header .notifications-button.hasNotifications, body.theme--highcontrast #unified-search .header-menu__trigger { opacity: 1 !important; } -body.theme--dark.theme--highcontrast #header #appmenu li:hover a, -body.theme--dark.theme--highcontrast #header #appmenu li:focus a { +body.theme--dark.theme--highcontrast #header .app-menu li:hover a, +body.theme--dark.theme--highcontrast #header .app-menu li:focus a { color: #000; } /* Files App */ -- GitLab From b919eaf37047fb900c9298e7fbf95d308f979d94 Mon Sep 17 00:00:00 2001 From: Akhil Date: Sat, 15 Apr 2023 01:58:54 +0530 Subject: [PATCH 07/47] Navbar fixes --- core/css/server.css | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 31d75b46..f7eacb22 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -335,7 +335,7 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, opacity: 1; } -#header .app-menu li span { +#header .app-menu li .app-menu-entry--label { color: var(--color-main-text); } @@ -1123,7 +1123,7 @@ li.active .icon-share { } #app-navigation-vue #app-settings #app-settings-header .settings-button, -#app-navigation #app-settings #app-settings-header .settings-button, +#app-navigation #app-settings #app-settings-header .settings-button::before, .icon-category-tools { background-image: var(--icon-settings-808080); } @@ -1150,24 +1150,24 @@ button.menuitem:hover .icon-delete, background-image: var(--icon-delete-e9322d); } -#header .app-menu li a span { +#header .app-menu li a .app-menu-entry--label { color: transparent; } -#header .app-menu li:hover a span { +#header .app-menu li:hover a .app-menu-entry--label { color: var(--icon-inactive-color); } -body.theme--highcontrast #header .app-menu li:hover a span { +body.theme--highcontrast #header .app-menu li:hover a .app-menu-entry--label { color: var(--color-main-text); } -#header .app-menu li:hover a svg { +#header .app-menu li:hover a img { color: var(--color-main-text); transform: translateY(-7px); } -#header .app-menu:hover li svg, +#header .app-menu:hover li img, #header .app-menu:hover li .icon-more, #header .app-menu:hover li .icon-more-white, #header .app-menu:hover li .icon-loading-small, @@ -1175,6 +1175,13 @@ body.theme--highcontrast #header .app-menu li:hover a span { transform: none; } +#header .app-menu-main:hover img, +#header .app-menu-main:focus-within img, +#header .app-menu-main .app-menu-entry:hover img, +#header .app-menu-main .app-menu-entry:focus img { + margin-top: 0px; +} + /* Settings app */ #pass2 + input[name="newpassword-clone"] { @@ -1734,7 +1741,16 @@ body.theme--highcontrast #header .app-menu li a { opacity: 1; filter: invert(1); } -body.theme--highcontrast #header .app-menu li a.active { + +#header .app-menu li a { + opacity: 0.6; +} + +#header .app-menu li:hover a { + opacity: 1; +} + +body.theme--highcontrast #header .app-menu li.app-menu-entry__active a { filter: invert(0); } body.theme--highcontrast #header .app-menu li .icon-more-white { -- GitLab From e967dbdfa906264379efa6191e317c3e0b3788eb Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 17 Apr 2023 17:59:23 +0530 Subject: [PATCH 08/47] Opacity one for the li --- core/css/server.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index f7eacb22..af0d8080 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1729,9 +1729,11 @@ body.theme--highcontrast svg.material-design-icon__svg { font-size: 12px; color: var(--color-text-lighter); } -body.theme--dark #header .app-menu li a { +body.theme--dark #header .app-menu li a, +#header .app-menu-main .app-menu-entry { opacity: 1; } + body.theme--light.theme--highcontrast #header .app-menu li a { opacity: 1; filter: invert(0); -- GitLab From 0ec78de29d18f4e2d412c43277cc2a9bb2b92527 Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 17 Apr 2023 18:21:14 +0530 Subject: [PATCH 09/47] icon defaults to 000 color --- apps/accessibility/img/app-color.svg | 2 +- apps/accessibility/img/app-dark.svg | 2 +- apps/accessibility/img/app.svg | 2 +- apps/accessibility/img/favicon-mask.svg | 2 +- apps/activity/img/activity-dark.svg | 2 +- apps/activity/img/activity.svg | 2 +- apps/activity/img/app.svg | 2 +- apps/bookmarks/img/app.svg | 2 +- apps/bookmarks/img/bookmarks.svg | 2 +- apps/calendar/img/app.svg | 2 +- apps/calendar/img/calendar.svg | 2 +- apps/contacts/img/address-book.svg | 2 +- apps/contacts/img/app.svg | 2 +- apps/e-user-support-center/img/app.svg | 2 +- apps/files/img/app.svg | 2 +- apps/files/img/delete.svg | 2 +- apps/files/img/folder.svg | 2 +- apps/files/img/recent.svg | 2 +- apps/files/img/share.svg | 2 +- apps/files/img/star.svg | 2 +- apps/files/img/unshare.svg | 2 +- apps/logreader/img/app-dark.svg | 2 +- apps/logreader/img/app.svg | 2 +- apps/notes/img/app.svg | 2 +- apps/notes/img/notes.svg | 2 +- apps/notifications/img/app.svg | 2 +- apps/onlyoffice/img/app-dark.svg | 2 +- apps/onlyoffice/img/app.svg | 2 +- apps/photos/img/app.svg | 2 +- apps/privacy/img/app-dark.svg | 2 +- apps/privacy/img/app.svg | 2 +- apps/rainloop/img/app.svg | 2 +- apps/rainloop/img/rainloop.svg | 2 +- apps/settings/img/admin.svg | 2 +- apps/settings/img/app-color.svg | 2 +- apps/settings/img/app.svg | 2 +- apps/settings/img/apps.svg | 2 +- apps/settings/img/password.svg | 2 +- apps/settings/img/personal.svg | 2 +- apps/settings/img/users.svg | 2 +- apps/snappymail/img/app.svg | 2 +- apps/snappymail/img/snappymail.svg | 2 +- apps/tasks/img/app.svg | 2 +- apps/tasks/img/tasks.svg | 2 +- core/css/server.css | 13 ++++++++++++- 45 files changed, 56 insertions(+), 45 deletions(-) diff --git a/apps/accessibility/img/app-color.svg b/apps/accessibility/img/app-color.svg index a09770ba..3f06eb07 100755 --- a/apps/accessibility/img/app-color.svg +++ b/apps/accessibility/img/app-color.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/accessibility/img/app-dark.svg b/apps/accessibility/img/app-dark.svg index a09770ba..3f06eb07 100755 --- a/apps/accessibility/img/app-dark.svg +++ b/apps/accessibility/img/app-dark.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/accessibility/img/app.svg b/apps/accessibility/img/app.svg index a09770ba..3f06eb07 100755 --- a/apps/accessibility/img/app.svg +++ b/apps/accessibility/img/app.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/accessibility/img/favicon-mask.svg b/apps/accessibility/img/favicon-mask.svg index a09770ba..3f06eb07 100755 --- a/apps/accessibility/img/favicon-mask.svg +++ b/apps/accessibility/img/favicon-mask.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/activity/img/activity-dark.svg b/apps/activity/img/activity-dark.svg index 83a8aeb4..b031248f 100755 --- a/apps/activity/img/activity-dark.svg +++ b/apps/activity/img/activity-dark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/activity/img/activity.svg b/apps/activity/img/activity.svg index bd7923b2..e05930b6 100755 --- a/apps/activity/img/activity.svg +++ b/apps/activity/img/activity.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/activity/img/app.svg b/apps/activity/img/app.svg index bd7923b2..e05930b6 100755 --- a/apps/activity/img/app.svg +++ b/apps/activity/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/bookmarks/img/app.svg b/apps/bookmarks/img/app.svg index 859718c0..62b39050 100644 --- a/apps/bookmarks/img/app.svg +++ b/apps/bookmarks/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/bookmarks/img/bookmarks.svg b/apps/bookmarks/img/bookmarks.svg index 859718c0..62b39050 100644 --- a/apps/bookmarks/img/bookmarks.svg +++ b/apps/bookmarks/img/bookmarks.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/calendar/img/app.svg b/apps/calendar/img/app.svg index e7ff7e4a..5678d1cb 100755 --- a/apps/calendar/img/app.svg +++ b/apps/calendar/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/calendar/img/calendar.svg b/apps/calendar/img/calendar.svg index e7ff7e4a..5678d1cb 100755 --- a/apps/calendar/img/calendar.svg +++ b/apps/calendar/img/calendar.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/contacts/img/address-book.svg b/apps/contacts/img/address-book.svg index 07c81de4..abfe6f46 100644 --- a/apps/contacts/img/address-book.svg +++ b/apps/contacts/img/address-book.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/contacts/img/app.svg b/apps/contacts/img/app.svg index b9879555..f62661b5 100755 --- a/apps/contacts/img/app.svg +++ b/apps/contacts/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/e-user-support-center/img/app.svg b/apps/e-user-support-center/img/app.svg index 8f0ff23d..63fb2c63 100755 --- a/apps/e-user-support-center/img/app.svg +++ b/apps/e-user-support-center/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/app.svg b/apps/files/img/app.svg index e594a802..ae6f4dd2 100755 --- a/apps/files/img/app.svg +++ b/apps/files/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg index 1872e155..d7499dde 100755 --- a/apps/files/img/delete.svg +++ b/apps/files/img/delete.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg index 74e97df2..e925bca3 100755 --- a/apps/files/img/folder.svg +++ b/apps/files/img/folder.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/recent.svg b/apps/files/img/recent.svg index 282b5e6d..52a890ca 100755 --- a/apps/files/img/recent.svg +++ b/apps/files/img/recent.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg index c600798d..650cd663 100755 --- a/apps/files/img/share.svg +++ b/apps/files/img/share.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg index 42f72d9e..da4d89f8 100755 --- a/apps/files/img/star.svg +++ b/apps/files/img/star.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/files/img/unshare.svg b/apps/files/img/unshare.svg index 73555297..7c5f16cf 100644 --- a/apps/files/img/unshare.svg +++ b/apps/files/img/unshare.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/logreader/img/app-dark.svg b/apps/logreader/img/app-dark.svg index 8df15434..52983dfe 100755 --- a/apps/logreader/img/app-dark.svg +++ b/apps/logreader/img/app-dark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/logreader/img/app.svg b/apps/logreader/img/app.svg index 8df15434..52983dfe 100755 --- a/apps/logreader/img/app.svg +++ b/apps/logreader/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/notes/img/app.svg b/apps/notes/img/app.svg index 56e3640b..9da05051 100755 --- a/apps/notes/img/app.svg +++ b/apps/notes/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/notes/img/notes.svg b/apps/notes/img/notes.svg index 56e3640b..9da05051 100755 --- a/apps/notes/img/notes.svg +++ b/apps/notes/img/notes.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/notifications/img/app.svg b/apps/notifications/img/app.svg index 52f3a1f3..59d2fd86 100755 --- a/apps/notifications/img/app.svg +++ b/apps/notifications/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/onlyoffice/img/app-dark.svg b/apps/onlyoffice/img/app-dark.svg index 8df15434..52983dfe 100755 --- a/apps/onlyoffice/img/app-dark.svg +++ b/apps/onlyoffice/img/app-dark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/onlyoffice/img/app.svg b/apps/onlyoffice/img/app.svg index 8df15434..52983dfe 100644 --- a/apps/onlyoffice/img/app.svg +++ b/apps/onlyoffice/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/photos/img/app.svg b/apps/photos/img/app.svg index f6e91033..873181c0 100755 --- a/apps/photos/img/app.svg +++ b/apps/photos/img/app.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/privacy/img/app-dark.svg b/apps/privacy/img/app-dark.svg index 867fe517..f6a80ad7 100755 --- a/apps/privacy/img/app-dark.svg +++ b/apps/privacy/img/app-dark.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/privacy/img/app.svg b/apps/privacy/img/app.svg index 867fe517..f6a80ad7 100755 --- a/apps/privacy/img/app.svg +++ b/apps/privacy/img/app.svg @@ -1,3 +1,3 @@ - + diff --git a/apps/rainloop/img/app.svg b/apps/rainloop/img/app.svg index cf19b828..6370d179 100755 --- a/apps/rainloop/img/app.svg +++ b/apps/rainloop/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/rainloop/img/rainloop.svg b/apps/rainloop/img/rainloop.svg index cf19b828..6370d179 100755 --- a/apps/rainloop/img/rainloop.svg +++ b/apps/rainloop/img/rainloop.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/admin.svg b/apps/settings/img/admin.svg index e9ba6c4b..4f5b3076 100755 --- a/apps/settings/img/admin.svg +++ b/apps/settings/img/admin.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/app-color.svg b/apps/settings/img/app-color.svg index 8e61b2b4..58807e89 100755 --- a/apps/settings/img/app-color.svg +++ b/apps/settings/img/app-color.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/app.svg b/apps/settings/img/app.svg index 8e61b2b4..58807e89 100755 --- a/apps/settings/img/app.svg +++ b/apps/settings/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/apps.svg b/apps/settings/img/apps.svg index 8e61b2b4..58807e89 100755 --- a/apps/settings/img/apps.svg +++ b/apps/settings/img/apps.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/password.svg b/apps/settings/img/password.svg index abe21e8e..a85bcd7e 100755 --- a/apps/settings/img/password.svg +++ b/apps/settings/img/password.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/personal.svg b/apps/settings/img/personal.svg index e7f40dec..f75590d1 100755 --- a/apps/settings/img/personal.svg +++ b/apps/settings/img/personal.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/settings/img/users.svg b/apps/settings/img/users.svg index 5da48f66..7c5e228e 100755 --- a/apps/settings/img/users.svg +++ b/apps/settings/img/users.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/snappymail/img/app.svg b/apps/snappymail/img/app.svg index cf19b828..6370d179 100755 --- a/apps/snappymail/img/app.svg +++ b/apps/snappymail/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/snappymail/img/snappymail.svg b/apps/snappymail/img/snappymail.svg index cf19b828..6370d179 100755 --- a/apps/snappymail/img/snappymail.svg +++ b/apps/snappymail/img/snappymail.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/tasks/img/app.svg b/apps/tasks/img/app.svg index ca522306..69f39507 100644 --- a/apps/tasks/img/app.svg +++ b/apps/tasks/img/app.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/apps/tasks/img/tasks.svg b/apps/tasks/img/tasks.svg index ca522306..69f39507 100644 --- a/apps/tasks/img/tasks.svg +++ b/apps/tasks/img/tasks.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/css/server.css b/core/css/server.css index af0d8080..39042e42 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -53,6 +53,8 @@ --color-sharing-icon-background: #767676; --logo: url("../img/logo@2x.svg"); --notification-icon-invert: invert(0%); + --active-icon-filter: brightness(0) saturate(100%) invert(38%) sepia(88%) saturate(4068%) hue-rotate(197deg) brightness(102%) contrast(106%); + --inactive-icon-filter: brightness(0) saturate(100%) invert(50%) sepia(12%) saturate(0%) hue-rotate(187deg) brightness(98%) contrast(94%); } /* Force a few variables to right values for dark theme */ @@ -135,7 +137,7 @@ input.primary:not(:disabled):hover, input.primary:not(:disabled):focus, button.primary:not(:disabled):hover, button.primary:not(:disabled):focus, -a.primary:not(:disabled):hover, +a.pri#808080mary:not(:disabled):hover, a.primary:not(:disabled):focus { background-image: none; } @@ -304,6 +306,15 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, #header .app-menu.inverted svg { filter: invert(1); } + +#header .app-menu .app-menu-entry img { + filter: var(--inactive-icon-filter); +} + +#header .app-menu .app-menu-entry.app-menu-entry__active img { + filter: var(--active-icon-filter); +} + .icon-folder, .icon-filetype-folder { background-image: var(--icon-folder-007FFF); -- GitLab From 5d2326aef7219b1576a2fe393086dbaa85e61792 Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 17 Apr 2023 18:59:13 +0530 Subject: [PATCH 10/47] core icon defaults to 000 fill --- core/css/server.css | 3 ++- core/img/actions/add.svg | 2 +- core/img/actions/checkmark.svg | 2 +- core/img/actions/close.svg | 2 +- core/img/actions/comment.svg | 2 +- core/img/actions/delete.svg | 2 +- core/img/actions/group.svg | 2 +- core/img/actions/logout.svg | 2 +- core/img/actions/mail.svg | 2 +- core/img/actions/password.svg | 2 +- core/img/actions/quota.svg | 2 +- core/img/actions/rename.svg | 2 +- core/img/actions/search.svg | 2 +- core/img/actions/settings-dark.svg | 2 +- core/img/actions/settings.svg | 2 +- core/img/actions/share.svg | 2 +- core/img/actions/star-outline.svg | 2 +- core/img/actions/tag.svg | 2 +- core/img/actions/toggle-filelist.svg | 2 +- core/img/actions/user.svg | 2 +- core/img/categories/files.svg | 2 +- core/img/clients/phone.svg | 2 +- core/img/icon-add.svg | 2 +- core/img/icon-close.svg | 2 +- core/img/icon-home.svg | 2 +- core/img/icon-search.svg | 2 +- core/img/places/calendar.svg | 2 +- core/img/places/contacts.svg | 2 +- core/img/places/files.svg | 2 +- core/img/places/home.svg | 2 +- core/img/text.svg | 2 +- 31 files changed, 32 insertions(+), 31 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 39042e42..1aab96f4 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1759,7 +1759,8 @@ body.theme--highcontrast #header .app-menu li a { opacity: 0.6; } -#header .app-menu li:hover a { +#header .app-menu li:hover a, +#header .app-menu li.app-menu-entry__active a { opacity: 1; } diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg index 33c5ada6..4f0bd813 100755 --- a/core/img/actions/add.svg +++ b/core/img/actions/add.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/actions/checkmark.svg b/core/img/actions/checkmark.svg index ca522306..69f39507 100755 --- a/core/img/actions/checkmark.svg +++ b/core/img/actions/checkmark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg index c3a842db..8214955a 100755 --- a/core/img/actions/close.svg +++ b/core/img/actions/close.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/comment.svg b/core/img/actions/comment.svg index e30fa6e3..5997c55b 100644 --- a/core/img/actions/comment.svg +++ b/core/img/actions/comment.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index 864c7e59..6caf4d3e 100755 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/group.svg b/core/img/actions/group.svg index 09d82a4e..aa951410 100755 --- a/core/img/actions/group.svg +++ b/core/img/actions/group.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg index 785b9b3b..79baca0e 100644 --- a/core/img/actions/logout.svg +++ b/core/img/actions/logout.svg @@ -1,5 +1,5 @@ - + diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg index cf19b828..6370d179 100755 --- a/core/img/actions/mail.svg +++ b/core/img/actions/mail.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg index abe21e8e..a85bcd7e 100755 --- a/core/img/actions/password.svg +++ b/core/img/actions/password.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/quota.svg b/core/img/actions/quota.svg index d4ddf5f6..9c309b60 100644 --- a/core/img/actions/quota.svg +++ b/core/img/actions/quota.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/rename.svg b/core/img/actions/rename.svg index 56e3640b..9da05051 100755 --- a/core/img/actions/rename.svg +++ b/core/img/actions/rename.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/search.svg b/core/img/actions/search.svg index d78e4f4e..d62e7241 100755 --- a/core/img/actions/search.svg +++ b/core/img/actions/search.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/settings-dark.svg b/core/img/actions/settings-dark.svg index 5535f81e..ee0474a9 100755 --- a/core/img/actions/settings-dark.svg +++ b/core/img/actions/settings-dark.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg index 8ebc715e..3dc871ce 100755 --- a/core/img/actions/settings.svg +++ b/core/img/actions/settings.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/share.svg b/core/img/actions/share.svg index 7de7f23b..fbdd0e81 100755 --- a/core/img/actions/share.svg +++ b/core/img/actions/share.svg @@ -1,4 +1,4 @@ - + diff --git a/core/img/actions/star-outline.svg b/core/img/actions/star-outline.svg index 859718c0..62b39050 100755 --- a/core/img/actions/star-outline.svg +++ b/core/img/actions/star-outline.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/tag.svg b/core/img/actions/tag.svg index 816375a4..57077c70 100755 --- a/core/img/actions/tag.svg +++ b/core/img/actions/tag.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/actions/toggle-filelist.svg b/core/img/actions/toggle-filelist.svg index 5ec7e4e6..ead00601 100755 --- a/core/img/actions/toggle-filelist.svg +++ b/core/img/actions/toggle-filelist.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg index e7f40dec..f75590d1 100755 --- a/core/img/actions/user.svg +++ b/core/img/actions/user.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/categories/files.svg b/core/img/categories/files.svg index 217654ca..4cb6af5a 100644 --- a/core/img/categories/files.svg +++ b/core/img/categories/files.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/clients/phone.svg b/core/img/clients/phone.svg index fd821008..0edcba83 100644 --- a/core/img/clients/phone.svg +++ b/core/img/clients/phone.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/icon-add.svg b/core/img/icon-add.svg index 33c5ada6..4f0bd813 100755 --- a/core/img/icon-add.svg +++ b/core/img/icon-add.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/icon-close.svg b/core/img/icon-close.svg index d7b8e496..8ec9a0a4 100755 --- a/core/img/icon-close.svg +++ b/core/img/icon-close.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/icon-home.svg b/core/img/icon-home.svg index bcb5ddf8..e27fc6f6 100755 --- a/core/img/icon-home.svg +++ b/core/img/icon-home.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/icon-search.svg b/core/img/icon-search.svg index d49d5adf..278302ac 100755 --- a/core/img/icon-search.svg +++ b/core/img/icon-search.svg @@ -1,3 +1,3 @@ - + diff --git a/core/img/places/calendar.svg b/core/img/places/calendar.svg index 1c3b19d8..93663fd0 100755 --- a/core/img/places/calendar.svg +++ b/core/img/places/calendar.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/places/contacts.svg b/core/img/places/contacts.svg index a8a53a77..77d0cf91 100755 --- a/core/img/places/contacts.svg +++ b/core/img/places/contacts.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/places/files.svg b/core/img/places/files.svg index 217654ca..4cb6af5a 100644 --- a/core/img/places/files.svg +++ b/core/img/places/files.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/places/home.svg b/core/img/places/home.svg index 598d7680..e5f26e03 100755 --- a/core/img/places/home.svg +++ b/core/img/places/home.svg @@ -6,5 +6,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + diff --git a/core/img/text.svg b/core/img/text.svg index ace96cd9..378ac11b 100755 --- a/core/img/text.svg +++ b/core/img/text.svg @@ -1,3 +1,3 @@ - + -- GitLab From f1a68f3532e60900562a7345ba819cc021cfda47 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 18 Apr 2023 00:22:25 +0530 Subject: [PATCH 11/47] Fix right side of header --- core/css/server.css | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 1aab96f4..f9b19f07 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -364,6 +364,33 @@ footer { height: 92px; } +#header #notifications .notifications-button__icon { + display: none; +} + +#header #notifications .header-menu__trigger, +#header #unified-search .magnify-icon { + opacity: 0.6; +} + +#header #notifications .header-menu__trigger:hover, +#header #unified-search .magnify-icon:hover { + opacity: 1; +} + + +#header #notifications[data-has-notifications="true"] .header-menu__trigger { + background: var(--icon-notifications-notifications-new-000000) no-repeat center; + background-size: 17px; + +} + +#header #notifications .header-menu__trigger { + background: var(--icon-notifications-notifications-000000) no-repeat center; + background-size: 17px; +} + + .notifications-button.hasNotifications { opacity: 0.6 !important; } -- GitLab From 6af5ca9a77033f483a0d4f07ce2ea139136331b4 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 18 Apr 2023 12:06:01 +0530 Subject: [PATCH 12/47] minor fixes for login box --- core/css/guest.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index 42a83c56..95170fcc 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1617,3 +1617,7 @@ a.legal { .v-align > footer p.info { height: 40%; } +#body-login .guest-box.login-box { + border-radius: none; + box-shadow: none; +} \ No newline at end of file -- GitLab From 453f769b21b0384a038b28d047abfd03f235585c Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 19 Apr 2023 17:07:07 +0530 Subject: [PATCH 13/47] Add body before icon classes --- core/css/server.css | 192 ++++++++++++++++++++++---------------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index f9b19f07..da7e805f 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -315,14 +315,14 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, filter: var(--active-icon-filter); } -.icon-folder, -.icon-filetype-folder { +body .icon-folder, +body .icon-filetype-folder { background-image: var(--icon-folder-007FFF); } -.icon-filetype-text { +body .icon-filetype-text { background-image: var(--icon-text-007fff); } -.icon-filetype-folder-drag-accept { +body .icon-filetype-folder-drag-accept { background-image: var(--icon-folder-drag-accept-007fff) !important; } #header .logo { @@ -407,7 +407,7 @@ footer { border-right: 1px solid var(--color-border); } -.icon-home, +body .icon-home, #oc-dialog-filepicker-content .dirtree div:first-child a { background-image: var(--icon-home-808080); } @@ -417,18 +417,18 @@ footer { background-size: 20px; } -.icon-mail { +body .icon-mail { background-image: var(--icon-mail-808080); } -.icon-error { +body .icon-error { background-image: var(--icon-error-808080); } -.icon-details { +body .icon-details { background-image: var(--icon-details-808080); } -.icon-add, +body .icon-add, .action-item.icon-add, button.action-item__menutoggle.icon-add, #content.app-news .add-new button.icon-add, @@ -442,19 +442,19 @@ button.action-item__menutoggle.icon-add, background-size: 40px; } -.icon-rename, +body .icon-rename, .who-has-access .action-item--single.action-item.icon-rename, .where-is-my-data .action-item--single.action-item.icon-rename { background-image: var(--icon-rename-808080); } -.icon-download { +body .icon-download { background-image: var(--icon-download-808080); } -.icon-template-add { +body .icon-template-add { background-image: var(--icon-template-add-808080); } -.icon-tasks, +body .icon-tasks, .panel--header .icon-tasks, .modal__content .icon-tasks { background-image: var(--icon-tasks-tasks-808080); @@ -462,68 +462,68 @@ button.action-item__menutoggle.icon-add, #tasks_panel .empty-content .icon-tasks { background-image: var(--icon-tasks-tasks-808080) !important; } -.icon-checkmark { +body .icon-checkmark { background-image: var(--icon-checkmark-808080); } -.icon-group { +body .icon-group { background-image: var(--icon-group-808080); } -.icon-timezone { +body .icon-timezone { background-image: var(--icon-timezone-808080); } -.icon-edit { +body .icon-edit { background-image: var(--icon-edit-808080); } -.icon-reminder { +body .icon-reminder { background-image: var(--icon-notifications-notifications-808080); } -.icon-gravatar { +body .icon-gravatar { background-image: var(--icon-contacts-gravatar-808080); } #content-vue.app-calendar .app-sidebar-tabs__tab-icon.icon-reminder { background-size: 13px; } -.icon-clippy { +body .icon-clippy { background-image: var(--icon-clippy-808080); } -.icon-confirm { +body .icon-confirm { background-image: var(--icon-confirm-808080); } -.icon-user-admin { +body .icon-user-admin { background-image: var(--icon-user-admin-808080); } -.icon-disabled-users { +body .icon-disabled-users { background-image: var(--icon-disabled-users-808080); } -.icon-notes, -.icon-notes-trans { +body .icon-notes, +body .icon-notes-trans { background-image: var(--icon-notes-notes-808080); } -.icon-projects { +body .icon-projects { background-image: var(--icon-projects-808080); } -.icon-comment { +body .icon-comment { background-image: var(--icon-comment-808080); } -.icon-activity { +body .icon-activity { background-image: var(--icon-activity-activity-808080); } -.icon-link { +body .icon-link { background-image: var(--icon-public-808080); } button .icon-link { background-image: var(--icon-public-ffffff); } -.icon-recent { +body .icon-recent { background-image: var(--icon-files-recent-808080); } -.icon-more, -.icon-more-white { +body .icon-more, +body .icon-more-white { background-image: var(--icon-more-808080); } @@ -541,7 +541,7 @@ button .icon-link { background-color: var(--color-sharing-icon-background); } -.icon-files, +body .icon-files, .icon-category-files, .icon-emptyfolder { background-image: var(--icon-files-app-808080); @@ -552,34 +552,34 @@ button .icon-link { background-size: 17px; } -.icon-notifications-new { +body .icon-notifications-new { background-image: var(--icon-notifications-notifications-new-000000); } -.icon-notifications { +body .icon-notifications { background-image: var(--icon-notifications-notifications-000000); } -.icon-external, -.icon-goto { +body .icon-external, +body .icon-goto { background-image: var(--icon-external-808080); } .action.icon-checkmark { background-image: var(--icon-checkmark-ffffff); } -.icon-phone { +body .icon-phone { background-image: var(--icon-phone-808080); } -.icon-password, -.icon-category-security { +body .icon-password, +body .icon-category-security { background-image: var(--icon-password-808080); } -.icon-link { +body .icon-link { background-image: var(--icon-link-808080); } -.icon-toggle-filelist { +body .icon-toggle-filelist { background-image: var(--icon-toggle-filelist-808080); } @@ -587,7 +587,7 @@ button.icon-toggle-filelist { background-color: var(--color-main-background); } -.icon-toggle-pictures { +body .icon-toggle-pictures { background-image: var(--icon-toggle-pictures-808080); } @@ -612,14 +612,14 @@ button > span[class*=" icon-"], opacity: 1; } -.icon-share, -.icon-shared { +body .icon-share, +body .icon-shared { background-image: var(--icon-share-808080); } -.icon-contacts-dark, -.icon-contacts, -.icon-category-social { +body .icon-contacts-dark, +body .icon-contacts, +body .icon-category-social { background-image: var(--icon-contacts-app-808080); } @@ -627,31 +627,31 @@ button > span[class*=" icon-"], background-image: var(--icon-contacts-000); } -.icon-user, -.icon-category-installed { +body .icon-user, +body .icon-category-installed { background-image: var(--icon-user-808080); } -.icon-category-enabled { +body .icon-category-enabled { background-image: var(--icon-checkmark-808080); } -.icon-star, -.icon-star-dark, -.icon-starred:hover { +body .icon-star, +body .icon-star-dark, +body .icon-starred:hover { background-image: var(--icon-star-808080); } -.icon-starred, -.icon-star:hover, -.icon-star-dark:hover, +body .icon-starred, +body .icon-star:hover, +body .icon-star-dark:hover, #filestable .filename .favorite-mark .icon-starred { background-image: var(--icon-star-FFCC00); } -.icon-close, +body .icon-close, #header-menu-unified-search .icon-close, -.icon-category-disabled { +body .icon-category-disabled { background-image: var(--icon-close-808080); } @@ -670,18 +670,18 @@ table td { border-bottom: 1px solid var(--color-border); } -.icon-files-dark { +body .icon-files-dark { background-image: var(--icon-files-app-808080); } -.icon-fullscreen { +body .icon-fullscreen { background-image: var(--icon-fullscreen-808080); } -.icon-calendar-dark { +body .icon-calendar-dark { background-image: var(--icon-calendar-calendar-808080); } -.icon-talk { +body .icon-talk { background-image: var(--icon-spreed-app-808080); } @@ -916,7 +916,7 @@ body[data-dashboard-background="default"] #app-dashboard h2 { background-image: var(--icon-tag-007fff); } -.icon-quota { +body .icon-quota { background-image: var(--icon-quota-808080); } .app-sidebar-header__star.icon-star, @@ -1016,7 +1016,7 @@ li.app-navigation-entry.active .icon-recent-actors { #content-vue.app-contacts .app-content > .empty-content { margin: 20vh; } -.icon-address-book { +body .icon-address-book { background-image: var(--icon-contacts-address-book-808080); } @@ -1079,7 +1079,7 @@ button.menuitem .icon-delete, .menu-icon svg path { fill: var(--menu-icon-color); } -.icon-recent-actors { +body .icon-recent-actors { background-image: var(--icon-contacts-recent-actors-808080); } @@ -1118,7 +1118,7 @@ button.menuitem .icon-delete, li.active .icon-yourphotos { background-image: var(--icon-photos-app-007fff); } -.icon-yourphotos { +body .icon-yourphotos { background-image: var(--icon-photos-app-808080); } @@ -1126,22 +1126,22 @@ li.active .icon-video { background-image: var(--icon-video-007fff); } -.icon-video { +body .icon-video { background-image: var(--icon-video-808080); } li.active .icon-favorite { background-image: var(--icon-star-outline-007fff); } -.icon-favorite { +body .icon-favorite { background-image: var(--icon-star-outline-808080); } li.active .icon-tag { background-image: var(--icon-tag-007fff); } -.icon-tag, -.icon-systemtags { +body .icon-tag, +body .icon-systemtags { background-image: var(--icon-tag-808080); } @@ -1152,7 +1152,7 @@ li.active .icon-address { background-image: var(--icon-address-007fff); } -.icon-address { +body .icon-address { background-image: var(--icon-address-808080); } @@ -1162,7 +1162,7 @@ li.active .icon-share { #app-navigation-vue #app-settings #app-settings-header .settings-button, #app-navigation #app-settings #app-settings-header .settings-button::before, -.icon-category-tools { +body .icon-category-tools { background-image: var(--icon-settings-808080); } @@ -1174,7 +1174,7 @@ li.active .icon-share { background-color: var(--color-main-background); } -.icon-delete, +body .icon-delete, button.action-button .icon-delete { background-image: var(--icon-files-delete-808080); } @@ -1281,18 +1281,18 @@ button.social-diaspora { border: 0; } -.icon-eye { +body .icon-eye { background-image: var(--icon-calendar-eye-808080); } -.icon-briefcase { +body .icon-briefcase { background-image: var(--icon-calendar-briefcase-808080); } -.icon-color-picker { +body .icon-color-picker { background-image: var(--icon-calendar-color-picker-808080); } -.icon-menu { +body .icon-menu { background-image: var(--icon-menu-808080); } .mx-datepicker .mx-input-wrapper { @@ -1329,15 +1329,15 @@ button.social-diaspora { border-radius: 8px; } -.icon-new-calendar { +body .icon-new-calendar { background-image: var(--icon-calendar-calendar-808080); } -.icon-new-calendar-with-task-list { +body .icon-new-calendar-with-task-list { background-image: var(--icon-calendar-new-calendar-with-task-list-808080); } -.icon-public { +body .icon-public { background-image: var(--icon-public-808080); } @@ -1354,19 +1354,19 @@ button.social-diaspora { font-size: 1em; } -.icon-view-week { +body .icon-view-week { background-image: var(--icon-calendar-view-week-808080); } -.icon-view-day { +body .icon-view-day { background-image: var(--icon-calendar-view-day-808080); } -.icon-view-module { +body .icon-view-module { background-image: var(--icon-calendar-view-module-808080); } -.icon-view-list { +body .icon-view-list { background-image: var(--icon-calendar-view-list-808080); } @@ -1473,38 +1473,38 @@ input[type="email"]:not(:active):not(:hover):not(:focus) + .icon-confirm:focus { } /* Settings Apps categories icons */ -.icon-category-app-bundles { +body .icon-category-app-bundles { background-image: var(--icon-bundles-808080); } -.icon-category-dashboard { +body .icon-category-dashboard { background-image: var(--icon-dashboard-dashboard-808080); } -.icon-category-customization { +body .icon-category-customization { background-image: var(--icon-customization-808080); } -.icon-category-games { +body .icon-category-games { background-image: var(--icon-games-808080); } -.icon-category-integration { +body .icon-category-integration { background-image: var(--icon-integration-808080); } -.icon-category-monitoring { +body .icon-category-monitoring { background-image: var(--icon-monitoring-808080); } -.icon-category-multimedia { +body .icon-category-multimedia { background-image: var(--icon-multimedia-808080); } -.icon-category-office { +body .icon-category-office { background-image: var(--icon-office-808080); } -.icon-category-organization { +body .icon-category-organization { background-image: var(--icon-organization-808080); } -.icon-category-search { +body .icon-category-search { background-image: var(--icon-search-808080); } -.icon-category-workflow { +body .icon-category-workflow { background-image: var(--icon-workflow-808080); } -- GitLab From 3c8695f3d0e1276e195100e25625062ca32dde0f Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 19 Apr 2023 19:49:23 +0530 Subject: [PATCH 14/47] Fix comment editor and sharing sidebar --- core/css/server.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index da7e805f..c3332d79 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -521,7 +521,9 @@ button .icon-link { body .icon-recent { background-image: var(--icon-files-recent-808080); } - +.sharing-entry .avatar-shared.icon-more-white { + background-image: var(--icon-more-fff); +} body .icon-more, body .icon-more-white { background-image: var(--icon-more-808080); @@ -1810,3 +1812,7 @@ body.theme--dark.theme--highcontrast #header .app-menu li:focus a { #content.app-files #filestable { padding-top: 20px; } + +.comments .comment__editor .rich-contenteditable__input { + min-height: 70px; +} \ No newline at end of file -- GitLab From 94bb07d0a20df750106e33ed903c47b34e135f2c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 25 Apr 2023 11:50:39 +0530 Subject: [PATCH 15/47] dark theme fix --- core/css/server.css | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index c3332d79..4319efef 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -58,7 +58,7 @@ } /* Force a few variables to right values for dark theme */ -body.theme--dark { +body[data-themes="dark"] { --color-main-background-header: #272727; --input-background-color: #181818; --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000"); @@ -72,6 +72,15 @@ body.theme--highcontrast { --icon-inactive-color: black; } +body { + background-color: var(--color-main-background); + font-weight: normal; + font-size: var(--default-font-size); + line-height: var(--default-line-height); + font-family: var(--font-face); + color: var(--color-main-text); +} + #body-user #header, #body-settings #header, #body-public #header { @@ -1215,8 +1224,8 @@ body.theme--highcontrast #header .app-menu li:hover a .app-menu-entry--label { transform: none; } -#header .app-menu-main:hover img, -#header .app-menu-main:focus-within img, +#header .app-menu-main:hover img, +#header .app-menu-main:focus-within img, #header .app-menu-main .app-menu-entry:hover img, #header .app-menu-main .app-menu-entry:focus img { margin-top: 0px; -- GitLab From 4c1ce6ff222c24aca141aeb344177e693f6dbfca Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 25 Apr 2023 12:40:02 +0530 Subject: [PATCH 16/47] remove contact app css --- core/css/server.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 4319efef..b8e75e33 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -218,9 +218,6 @@ body.theme--dark #settings #expanddiv { .multiselect .multiselect__input, .multiselect .multiselect__content-wrapper .multiselect__content li.multiselect__element, .multiselect .multiselect__content-wrapper .multiselect__content li.multiselect__element .multiselect__option, -#content-vue.app-contacts .property.property--without-actions.property--last.property-masonry:not(.property--addressbooks):not(.property--groups) .multiselect .multiselect__tags .multiselect__input, -#content-vue.app-contacts .multiselect .multiselect__tags input.multiselect__input, -#content-vue.app-contacts .multiselect > .multiselect__tags > span.multiselect__single, #content.app-files #commentsTabView .newCommentForm .message:hover, #app-dashboard .footer a:hover, #app-content-systemtagsfilter .select2-container ul { -- GitLab From b7e2c57281879da4c9227b0b1adf182f8a932763 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 25 Apr 2023 13:02:12 +0530 Subject: [PATCH 17/47] remove calnedar conflicting css --- core/css/server.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index b8e75e33..f8331477 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -156,8 +156,6 @@ a.primary:not(:disabled):focus { button.primary + button:not(.primary), button.primary + button:not(.primary):active, .entity-picker__navigation button:not(.primary), -.event-popover__buttons button:not(.primary), -.event-popover__buttons button:not(.primary):active, .oc-dialog-buttonrow.twobuttons button:not(.primary), .oc-dialog-buttonrow.twobuttons button:not(.primary):active, .status-buttons .status-buttons__select { -- GitLab From 5d4e658cfe648a75f5f0940de86a7b7d40beba3e Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 25 Apr 2023 18:48:29 +0530 Subject: [PATCH 18/47] Fix typo --- core/css/server.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index c3332d79..d7f437c3 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -137,7 +137,7 @@ input.primary:not(:disabled):hover, input.primary:not(:disabled):focus, button.primary:not(:disabled):hover, button.primary:not(:disabled):focus, -a.pri#808080mary:not(:disabled):hover, +a.primary:not(:disabled):hover, a.primary:not(:disabled):focus { background-image: none; } -- GitLab From 444737f56b606d699b69ee8d868ba52b148699f1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Apr 2023 11:06:12 +0530 Subject: [PATCH 19/47] login page fix --- core/css/guest.css | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 95170fcc..d75f7b0a 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1620,4 +1620,22 @@ a.legal { #body-login .guest-box.login-box { border-radius: none; box-shadow: none; -} \ No newline at end of file +} +#body-login .login-form__headline { + display:none +} +#body-login .input-field__clear-button.button-vue{ + vertical-align: middle; + height: 36px; + line-height: 36px; + top: 12px; +} +#body-login .button-vue--vue-primary{ + padding: 12px 16px; + gap: 10px; + width: 100%; + height: 42px; + background: #0086FF; + border-radius: 24px; + font-size: 16px; +} -- GitLab From 10a3bcbc6462c451acb501a26d2a4195b181b7eb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Apr 2023 11:51:59 +0530 Subject: [PATCH 20/47] login page fix --- core/css/guest.css | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index d75f7b0a..86a7a1c3 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1430,6 +1430,8 @@ a.legal { font-weight: 400 !important; font-size: 16px !important; line-height: 150%; + display: block; + margin: 0 auto; } .v-align main .grouptop, .v-align main .groupbottom{ position: relative; @@ -1631,11 +1633,5 @@ a.legal { top: 12px; } #body-login .button-vue--vue-primary{ - padding: 12px 16px; - gap: 10px; - width: 100%; - height: 42px; - background: #0086FF; - border-radius: 24px; - font-size: 16px; + margin: 46px 0px; } -- GitLab From 88808c8c8f0b00ef538f47633b0c6107061ac50a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Apr 2023 12:49:02 +0530 Subject: [PATCH 21/47] login page fix --- core/js/custom-login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/custom-login.js b/core/js/custom-login.js index 4a375fa4..9cea4222 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -3,7 +3,7 @@ document.addEventListener('DOMContentLoaded', function () { if (event.target.id === "lost-password" && window.innerWidth > 1050) { document.querySelector(".banner-content").style.display = "none"; document.querySelector(".have-an-account").style.display = "none"; - document.querySelector(".banner-right-align").addClass("width0"); + document.querySelector("banner-right-align").classList.add("width0"); document.querySelector(".lines").style.display = "none"; document.querySelector(".v-align").classList.add("warning-message"); document.querySelector("footer").classList.add("forgotpass-footer"); -- GitLab From 585748c1e30d77fd532b60ccd0e7cb1d4754a291 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Apr 2023 13:07:19 +0530 Subject: [PATCH 22/47] login page fix --- core/js/custom-login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/custom-login.js b/core/js/custom-login.js index 9cea4222..2431dfd4 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -8,7 +8,7 @@ document.addEventListener('DOMContentLoaded', function () { document.querySelector(".v-align").classList.add("warning-message"); document.querySelector("footer").classList.add("forgotpass-footer"); } - else if (event.target.parentNode.classList.contains("lost-password-container") && window.innerWidth > 1050) { + else if (event.target.matches('.lost-password-container a') && window.innerWidth > 1050) { document.querySelector(".banner-right-align").classList.remove("width0"); document.querySelector(".v-align").classList.remove("warning-message"); document.querySelector("footer").classList.remove("forgotpass-footer"); -- GitLab From 4378f19026af4dbbd618af0f06812605f97a865f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Apr 2023 13:35:55 +0530 Subject: [PATCH 23/47] login page fix --- core/css/guest.css | 14 ++++++++++++++ core/js/custom-login.js | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 86a7a1c3..fb02cd33 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1635,3 +1635,17 @@ a.legal { #body-login .button-vue--vue-primary{ margin: 46px 0px; } +.show { + opacity: 0; + animation: fadeIn 1s; +} + +@keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: 1; + } +} + diff --git a/core/js/custom-login.js b/core/js/custom-login.js index 2431dfd4..6675860c 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -3,7 +3,7 @@ document.addEventListener('DOMContentLoaded', function () { if (event.target.id === "lost-password" && window.innerWidth > 1050) { document.querySelector(".banner-content").style.display = "none"; document.querySelector(".have-an-account").style.display = "none"; - document.querySelector("banner-right-align").classList.add("width0"); + document.querySelector(".banner-right-align").classList.add("width0"); document.querySelector(".lines").style.display = "none"; document.querySelector(".v-align").classList.add("warning-message"); document.querySelector("footer").classList.add("forgotpass-footer"); -- GitLab From 167be1ed60f8be8d2acd8d81e3d5c75b94ccb4d5 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 26 Apr 2023 14:04:49 +0530 Subject: [PATCH 24/47] Use flex instead of block --- core/js/custom-login.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/js/custom-login.js b/core/js/custom-login.js index 6675860c..4c8499c9 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -12,9 +12,9 @@ document.addEventListener('DOMContentLoaded', function () { document.querySelector(".banner-right-align").classList.remove("width0"); document.querySelector(".v-align").classList.remove("warning-message"); document.querySelector("footer").classList.remove("forgotpass-footer"); - document.querySelector(".lines").style.display = "block"; - document.querySelector(".banner-content").style.display = "block"; - document.querySelector(".have-an-account").style.display = "block"; + document.querySelector(".lines").style.display = "flex"; + document.querySelector(".banner-content").style.display = "flex"; + document.querySelector(".have-an-account").style.display = "flex"; } }) }) -- GitLab From dd89150b14d97a8ba905b0cd1842a6184f229f90 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 26 Apr 2023 14:07:20 +0530 Subject: [PATCH 25/47] Fix lint --- core/js/custom-login.js | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/core/js/custom-login.js b/core/js/custom-login.js index 4c8499c9..b351fa0f 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -1,20 +1,19 @@ -document.addEventListener('DOMContentLoaded', function () { - document.addEventListener("click", function (event) { - if (event.target.id === "lost-password" && window.innerWidth > 1050) { - document.querySelector(".banner-content").style.display = "none"; - document.querySelector(".have-an-account").style.display = "none"; - document.querySelector(".banner-right-align").classList.add("width0"); - document.querySelector(".lines").style.display = "none"; - document.querySelector(".v-align").classList.add("warning-message"); - document.querySelector("footer").classList.add("forgotpass-footer"); - } - else if (event.target.matches('.lost-password-container a') && window.innerWidth > 1050) { - document.querySelector(".banner-right-align").classList.remove("width0"); - document.querySelector(".v-align").classList.remove("warning-message"); - document.querySelector("footer").classList.remove("forgotpass-footer"); - document.querySelector(".lines").style.display = "flex"; - document.querySelector(".banner-content").style.display = "flex"; - document.querySelector(".have-an-account").style.display = "flex"; +document.addEventListener('DOMContentLoaded', function() { + document.addEventListener('click', function(event) { + if (event.target.id === 'lost-password' && window.innerWidth > 1050) { + document.querySelector('.banner-content').style.display = 'none' + document.querySelector('.have-an-account').style.display = 'none' + document.querySelector('.banner-right-align').classList.add('width0') + document.querySelector('.lines').style.display = 'none' + document.querySelector('.v-align').classList.add('warning-message') + document.querySelector('footer').classList.add('forgotpass-footer') + } else if (event.target.matches('.lost-password-container a') && window.innerWidth > 1050) { + document.querySelector('.banner-right-align').classList.remove('width0') + document.querySelector('.v-align').classList.remove('warning-message') + document.querySelector('footer').classList.remove('forgotpass-footer') + document.querySelector('.lines').style.display = 'flex' + document.querySelector('.banner-content').style.display = 'flex' + document.querySelector('.have-an-account').style.display = 'flex' } }) }) -- GitLab From bc6318128fc7d0ccd0eef1fc7b5e95b5542c6d3c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Apr 2023 14:34:48 +0530 Subject: [PATCH 26/47] removed flex --- core/js/custom-login.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/js/custom-login.js b/core/js/custom-login.js index b351fa0f..56c28b52 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -11,9 +11,9 @@ document.addEventListener('DOMContentLoaded', function() { document.querySelector('.banner-right-align').classList.remove('width0') document.querySelector('.v-align').classList.remove('warning-message') document.querySelector('footer').classList.remove('forgotpass-footer') - document.querySelector('.lines').style.display = 'flex' - document.querySelector('.banner-content').style.display = 'flex' - document.querySelector('.have-an-account').style.display = 'flex' + document.querySelector('.lines').style.display = 'block' + document.querySelector('.banner-content').style.display = 'block' + document.querySelector('.have-an-account').style.display = 'block' } }) }) -- GitLab From 8c829e6e9c4689a31390819587b88c7559344c92 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Apr 2023 17:09:34 +0530 Subject: [PATCH 27/47] slow show content --- core/css/guest.css | 8 +++++--- core/js/custom-login.js | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index fb02cd33..0ced81cb 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1635,11 +1635,13 @@ a.legal { #body-login .button-vue--vue-primary{ margin: 46px 0px; } -.show { +.slow-show { opacity: 0; - animation: fadeIn 1s; + animation-name: fadeIn; + animation-duration: 1s; + animation-fill-mode: forwards; + animation-delay: 1s; } - @keyframes fadeIn { from { opacity: 0; diff --git a/core/js/custom-login.js b/core/js/custom-login.js index 56c28b52..a3f4fa9e 100644 --- a/core/js/custom-login.js +++ b/core/js/custom-login.js @@ -7,6 +7,7 @@ document.addEventListener('DOMContentLoaded', function() { document.querySelector('.lines').style.display = 'none' document.querySelector('.v-align').classList.add('warning-message') document.querySelector('footer').classList.add('forgotpass-footer') + document.querySelector('.banner-content').classList.remove('slow-show') } else if (event.target.matches('.lost-password-container a') && window.innerWidth > 1050) { document.querySelector('.banner-right-align').classList.remove('width0') document.querySelector('.v-align').classList.remove('warning-message') @@ -14,6 +15,7 @@ document.addEventListener('DOMContentLoaded', function() { document.querySelector('.lines').style.display = 'block' document.querySelector('.banner-content').style.display = 'block' document.querySelector('.have-an-account').style.display = 'block' + document.querySelector('.banner-content').classList.add('slow-show') } }) }) -- GitLab From 3e795c422a630d2fa0b91394777edc25edd4e8c5 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 26 Apr 2023 19:45:32 +0530 Subject: [PATCH 28/47] Fix app icons that don't need filters --- core/css/server.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index fe53fc9c..627b85df 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -319,6 +319,17 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, filter: var(--active-icon-filter); } +#header .app-menu .app-menu-entry[data-app-id^='external_index'] img, +#header .app-menu .app-menu-entry.app-menu-entry__active[data-app-id^='external_index'] img, +#header .app-menu .app-menu-entry[data-app-id='news'] img, +#header .app-menu .app-menu-entry.app-menu-entry__active[data-app-id='news'] img, +#header .app-menu .app-menu-entry[data-app-id='passwords'] img, +#header .app-menu .app-menu-entry.app-menu-entry.app-menu-entry__active[data-app-id='passwords'] img, +#header .app-menu .app-menu-entry[data-app-id='carnet'] img, +#header .app-menu .app-menu-entry.app-menu-entry__active[data-app-id='carnet'] img { + filter: none; +} + body .icon-folder, body .icon-filetype-folder { background-image: var(--icon-folder-007FFF); -- GitLab From c464ebfc4f5c2b6324dcc58d932a1c20088a5084 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 11:14:53 +0530 Subject: [PATCH 29/47] warning msg --- core/css/guest.css | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 0ced81cb..66595f6f 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1116,6 +1116,14 @@ a.legal { color: #808080; font-family: "Montserrat"; } + +#body-login .v-align.warning-message { + width: 50%; + margin: 0 auto; + margin-top: 0; + padding: 0; +} + #body-login .v-align { display: flex; flex-direction: column; @@ -1134,12 +1142,16 @@ a.legal { max-height: 100%; transition: all 0.3s linear; } -#body-login .warning-message { - width: 50%; - margin: 0 auto; - margin-top: 0; - padding: 0; + +#body-login .v-align .guest-box { + justify-content: center !important; + width: 92%; + margin-left: 0; + margin-right: 0; + border: 1px solid; + box-shadow:none; } + #body-login #user, #body-login #password, #body-login .totp-form > input[type="tel"] { -- GitLab From d47a1290fcade9c22d4fcab04d827191eb29bde3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 11:20:11 +0530 Subject: [PATCH 30/47] warning msg --- core/css/guest.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 66595f6f..bfe727fb 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1149,7 +1149,12 @@ a.legal { margin-left: 0; margin-right: 0; border: 1px solid; - box-shadow:none; + box-shadow: none; + color: #029f3c; +} +#body-login .icon.icon-checkmark, +#body-login .icon-checkmark-white{ + display:none; } #body-login #user, -- GitLab From ae92f6445c166d9064caf42262ee1a82096851a6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 13:11:38 +0530 Subject: [PATCH 31/47] input border fix --- core/css/server.css | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index 627b85df..b4ac5309 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1830,4 +1830,16 @@ body.theme--dark.theme--highcontrast #header .app-menu li:focus a { .comments .comment__editor .rich-contenteditable__input { min-height: 70px; -} \ No newline at end of file +} +input:not([type=range], +.input-field__input, +[type=submit], +[type=button], +[type=reset], +.multiselect__input, +.select2-input, +.action-input__input, +[class^=vs__]) { + border: 1px solid var(--color-border-dark); + border-radius: var(--border-radius); +} -- GitLab From 1f3f1dba589ade1c792c2921f8dce4547dd75b60 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 13:21:00 +0530 Subject: [PATCH 32/47] path fix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a48db098..7f6762a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ include: - | ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME} - sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/themes/${APP_NAME} + sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME}/ ${DEPLOYMENT_PATH}/html/themes/${APP_NAME}/ docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ maintenance:theme:update EOT - echo "SUCCESS" > .job_status -- GitLab From 38804743c2a8fe66f9f099965e83c84b01e35ab8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 13:24:11 +0530 Subject: [PATCH 33/47] path fix --- core/css/server.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index b4ac5309..b6dd7a39 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1839,7 +1839,10 @@ input:not([type=range], .multiselect__input, .select2-input, .action-input__input, -[class^=vs__]) { +[class^=vs__]), +select, +div[contenteditable=true], +textarea { border: 1px solid var(--color-border-dark); border-radius: var(--border-radius); } -- GitLab From 319f384e0be7fe590cd0a1dca1d15b400dac095f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 14:57:05 +0530 Subject: [PATCH 34/47] remove border from login --- core/css/guest.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index bfe727fb..85eb20a0 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1639,6 +1639,8 @@ a.legal { #body-login .guest-box.login-box { border-radius: none; box-shadow: none; + border: none; + color: var(--color-main-text); } #body-login .login-form__headline { display:none -- GitLab From 28bab196180d2c62c36a8df1ce50a4a3e8fc121f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 17:55:59 +0530 Subject: [PATCH 35/47] text label fix --- core/css/guest.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 85eb20a0..fad538b5 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1166,7 +1166,6 @@ a.legal { border: 1px solid #E6E8E9; box-sizing: border-box; border-radius: 8px; - margin: 12px 0px; font-size: 16px; background-color: #ffffff; } -- GitLab From 2e21b45a89efc607ee63b49e224402da74e3d460 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 18:01:08 +0530 Subject: [PATCH 36/47] responsive fix --- core/css/guest.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index fad538b5..e028a349 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1117,7 +1117,7 @@ a.legal { font-family: "Montserrat"; } -#body-login .v-align.warning-message { +#body-login .warning-message { width: 50%; margin: 0 auto; margin-top: 0; -- GitLab From b98c597822209be07458d00ab953f235ae0f8e5c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 18:07:41 +0530 Subject: [PATCH 37/47] responsive fix --- core/css/guest.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/guest.css b/core/css/guest.css index e028a349..8523e127 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1566,6 +1566,7 @@ a.legal { overflow: hidden; position: unset !important; height: unset; + padding: 0 5vh; } .banner-content-get-free-murena{ font-size: 18px; -- GitLab From ffd985580630a7c0f05d28e9b0aae34a23981f1a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 18:10:30 +0530 Subject: [PATCH 38/47] responsive fix --- core/css/guest.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 8523e127..346bb4a6 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1649,7 +1649,6 @@ a.legal { vertical-align: middle; height: 36px; line-height: 36px; - top: 12px; } #body-login .button-vue--vue-primary{ margin: 46px 0px; -- GitLab From 0bfc9e863271c9bb8965a93579eba76cdb4d3233 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Apr 2023 23:36:54 +0530 Subject: [PATCH 39/47] dashboard fix --- core/css/server.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index b6dd7a39..9877043b 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1846,3 +1846,6 @@ textarea { border: 1px solid var(--color-border-dark); border-radius: var(--border-radius); } +#content.app-murena-dashboard{ + overflow:scroll; +} -- GitLab From 84fe43cdabbdaaa6d885027e7b3e366b54f90015 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 00:05:03 +0530 Subject: [PATCH 40/47] remove css --- core/css/server.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index 9877043b..bd294812 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1059,7 +1059,6 @@ button.primary .icon-upload, #content-vue.app-calendar .settings-fieldset-interior-item .icon-upload, #content-vue.app-bookmarks #app-settings-content button .icon-upload, button.import-contact__button-main .icon-upload, -.import-export button.icon-upload, .attachments-drag-zone button.icon-upload { background-image: var(--icon-upload-000); } -- GitLab From aec8ca0e38407394f055ce6e1da80da593b22427 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 00:18:30 +0530 Subject: [PATCH 41/47] remove css --- core/css/server.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index bd294812..2c1a7964 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -416,8 +416,7 @@ footer { #header .notification-wrapper .dismiss-all .icon.icon-close { margin-top: 4px; } -#content #app-navigation, -#content.app-news #app-navigation button { +#content #app-navigation { color: var(--color-main-text); border-right: 1px solid var(--color-border); } -- GitLab From 70e585f45d5bf9de59d98eb4941afe8cd384e8d9 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 28 Apr 2023 00:54:29 +0530 Subject: [PATCH 42/47] Fix plus icon in sidebar --- core/css/server.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 627b85df..e4cac476 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -332,7 +332,7 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, body .icon-folder, body .icon-filetype-folder { - background-image: var(--icon-folder-007FFF); + background-image: var(--icon-folder-007fff); } body .icon-filetype-text { background-image: var(--icon-text-007fff); @@ -444,6 +444,7 @@ body .icon-details { } body .icon-add, +.app-sidebar button .icon-add, .action-item.icon-add, button.action-item__menutoggle.icon-add, #content.app-news .add-new button.icon-add, @@ -1126,7 +1127,7 @@ body .icon-recent-actors { } #content-vue.app-photos .icon-folder { - background-image: var(--icon-folder-007FFF); + background-image: var(--icon-folder-007fff); } #content-vue.app-photos .folder-name__icon { opacity: 0.8; -- GitLab From bd90a32621742443e6f61605275f865aebb56736 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 28 Apr 2023 01:03:29 +0530 Subject: [PATCH 43/47] Fix highlighted file in files grid view --- core/css/server.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index e4cac476..67e6c082 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -776,10 +776,10 @@ body[data-dashboard-background="default"] #app-dashboard h2 { } .breadcrumb .canDrop > a, -#filestable tbody tr.canDrop, -#filestable.view-grid:not(.hidden) #fileList tr:not(.hidden).selected .thumbnail-wrapper, -#filestable.view-grid:not(.hidden) #fileList tr:not(.hidden).selected .fileactions, -#filestable.view-grid:not(.hidden) #fileList tr:not(.hidden).selected .nametext { +.files-filestable tbody tr.canDrop, +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).highlighted .thumbnail-wrapper, +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).highlighted .fileactions, +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).highlighted .nametext { background-color: var(--color-primary-light); } -- GitLab From b2bde2a7204909b182e13e04eb16b22e690df3d3 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 28 Apr 2023 01:06:36 +0530 Subject: [PATCH 44/47] .selected, not .highlighted --- core/css/server.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 67e6c082..4306ebd3 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -777,9 +777,9 @@ body[data-dashboard-background="default"] #app-dashboard h2 { .breadcrumb .canDrop > a, .files-filestable tbody tr.canDrop, -.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).highlighted .thumbnail-wrapper, -.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).highlighted .fileactions, -.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).highlighted .nametext { +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).selected .thumbnail-wrapper, +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).selected .fileactions, +.files-filestable.view-grid:not(.hidden) .files-fileList tr:not(.hidden).selected .nametext { background-color: var(--color-primary-light); } -- GitLab From a206b829cfe4f9143ae30df51d5b1c2a14c8e944 Mon Sep 17 00:00:00 2001 From: Akhil Date: Fri, 28 Apr 2023 01:39:27 +0530 Subject: [PATCH 45/47] Fix settings menu icon colors --- core/css/server.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 4306ebd3..516a345a 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1831,4 +1831,9 @@ body.theme--dark.theme--highcontrast #header .app-menu li:focus a { .comments .comment__editor .rich-contenteditable__input { min-height: 70px; +} + +#header-menu-user-menu .user-menu__nav .menu-entry img { + filter: var(--inactive-icon-filter); + opacity: 1; } \ No newline at end of file -- GitLab From 2b67a5b239385e28398214b00bcc678c54a3163b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 11:25:01 +0530 Subject: [PATCH 46/47] error fix --- core/css/guest.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index 346bb4a6..1ef87c23 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1143,6 +1143,13 @@ a.legal { transition: all 0.3s linear; } +#body-login .warning-messsage { + width: 50%; + margin: 0 auto; + margin-top: 0; + padding: 0; +} + #body-login .v-align .guest-box { justify-content: center !important; width: 92%; -- GitLab From 4fc96089fb403d602860f2ac2967b6ac0c93124a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:42:25 +0530 Subject: [PATCH 47/47] error fix --- core/css/server.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 6f429205..9aae37a1 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1850,6 +1850,3 @@ textarea { border: 1px solid var(--color-border-dark); border-radius: var(--border-radius); } -#content.app-murena-dashboard{ - overflow:scroll; -} -- GitLab