From 167b6fd217b18f91982c7179842c980b6b4bb639 Mon Sep 17 00:00:00 2001 From: Timotej Gally Date: Tue, 15 Oct 2024 22:40:13 +0200 Subject: [PATCH 1/7] Repaired PR request --- webapp/src/css/inbox.less | 52 +++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/webapp/src/css/inbox.less b/webapp/src/css/inbox.less index 758447e252..8a24e06590 100644 --- a/webapp/src/css/inbox.less +++ b/webapp/src/css/inbox.less @@ -198,10 +198,17 @@ body { a .button-label { margin-top: 3px; position: relative; - overflow: hidden; - word-wrap: break-word; color: @nav-icon-gray; font-size: @font-XXS; + overflow-wrap: break-word; + word-break: break-word; + hyphens: auto; + white-space: normal; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + line-clamp: 2; + overflow: hidden; text-overflow: ellipsis; } @@ -1292,6 +1299,7 @@ mm-sidebar-menu .mat-sidenav-container { mm-panel-header { background: @top-header-color; height: @sidebar-menu-header-desktop; + padding: 0px !important; .panel-header { justify-content: flex-end; @@ -1303,13 +1311,13 @@ mm-sidebar-menu .mat-sidenav-container { font-size: @font-XXL; font-weight: bold; line-height: @font-XXL; - margin-left: 15px; + margin-left: -15px; color: @text-inverse-color; letter-spacing: normal; } .panel-header-close { - width: 20px; + width: 80px; text-align: center; mat-icon { @@ -1366,6 +1374,7 @@ mm-sidebar-menu .mat-sidenav-container { mat-icon { text-align: center; margin-right: 15px; + margin-left: 10px; flex-shrink: 0; } } @@ -1402,14 +1411,45 @@ mm-sidebar-menu .mat-sidenav-container { height: calc(@sidebar-menu-height - @sidebar-menu-header-mobile); } + mat-icon { + margin-left: -6px !important; + } + mm-panel-header { height: @sidebar-menu-header-mobile; + .panel-header-title { font-size: @font-extra-large; } + + .panel-header-close { + width: 48px !important; + } + + .panel-header-title { + margin-left: unset; + } } } + .app-root:not(.old-nav) .header .tabs a .button-label { + /* Keep the desired styles */ + margin-top: 3px; + overflow: hidden; + word-wrap: break-word; + color: @nav-icon-gray; + font-size: @font-XXS; + text-overflow: ellipsis; + + /* Unset or override the unwanted properties */ + display: block; + white-space: unset; + word-break: unset; + -webkit-line-clamp: unset; + -webkit-box-orient: unset; + line-clamp: unset; + } + .app-root:not(.old-nav) { &.messages, &.tasks, @@ -1456,7 +1496,6 @@ mm-sidebar-menu .mat-sidenav-container { top: 0; font-size: @font-XXS; padding-top: 5px; - text-overflow: ellipsis; margin-top: 0; } @@ -1882,5 +1921,4 @@ mm-sidebar-menu .mat-sidenav-container { .desktop-only { display: none; } -} - +} \ No newline at end of file From dc2845ed0a6d27b062056ac5eb837de66dfff37f Mon Sep 17 00:00:00 2001 From: GallyTi Date: Thu, 17 Oct 2024 21:17:22 +0200 Subject: [PATCH 2/7] Some changes that was suggessted --- webapp/src/css/inbox.less | 57 +++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/webapp/src/css/inbox.less b/webapp/src/css/inbox.less index 8a24e06590..2001bb765f 100644 --- a/webapp/src/css/inbox.less +++ b/webapp/src/css/inbox.less @@ -207,7 +207,6 @@ body { display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; - line-clamp: 2; overflow: hidden; text-overflow: ellipsis; } @@ -1296,10 +1295,10 @@ mm-sidebar-menu .mat-sidenav-container { } } - mm-panel-header { + .mat-sidenav mm-panel-header { background: @top-header-color; height: @sidebar-menu-header-desktop; - padding: 0px !important; + padding: 0; .panel-header { justify-content: flex-end; @@ -1411,7 +1410,7 @@ mm-sidebar-menu .mat-sidenav-container { height: calc(@sidebar-menu-height - @sidebar-menu-header-mobile); } - mat-icon { + .nav-item mat-icon { margin-left: -6px !important; } @@ -1420,15 +1419,12 @@ mm-sidebar-menu .mat-sidenav-container { .panel-header-title { font-size: @font-extra-large; + margin-left: 0 !important; } .panel-header-close { width: 48px !important; } - - .panel-header-title { - margin-left: unset; - } } } @@ -1492,28 +1488,37 @@ mm-sidebar-menu .mat-sidenav-container { flex-direction: row; align-items: center; justify-content: center; + .button-label { - top: 0; - font-size: @font-XXS; - padding-top: 5px; - margin-top: 0; + top: 0; + font-size: @font-XXS; + padding-top: 5px; + margin-top: 3px; + overflow: hidden; + word-wrap: break-word; + color: @nav-icon-gray; + text-overflow: ellipsis; + white-space: unset; + word-break: unset; + -webkit-line-clamp: unset; + -webkit-box-orient: unset; + line-clamp: unset; } - + a { - min-width: 65px; - margin-top: 1px; - - .mm-icon { - padding: 8px 0; - } - - &.selected - .mm-icon { - border-radius: 999px; - background-color: @tab-selected-color; - } + min-width: 65px; + margin-top: 1px; + + .mm-icon { + padding: 8px 0; + } + + &.selected .mm-icon { + border-radius: 999px; + background-color: @tab-selected-color; + } } - } + } } &.select-mode { From d762f9752d1c7d0dd572a77f087e1f492f3e7723 Mon Sep 17 00:00:00 2001 From: GallyTi <92124229+GallyTi@users.noreply.github.com> Date: Sat, 26 Oct 2024 21:20:28 +0200 Subject: [PATCH 3/7] Update webapp/src/css/inbox.less Co-authored-by: Ben Kiarie <2597305+Benmuiruri@users.noreply.github.com> --- webapp/src/css/inbox.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/src/css/inbox.less b/webapp/src/css/inbox.less index 2001bb765f..52174a1c14 100644 --- a/webapp/src/css/inbox.less +++ b/webapp/src/css/inbox.less @@ -1414,16 +1414,16 @@ mm-sidebar-menu .mat-sidenav-container { margin-left: -6px !important; } - mm-panel-header { + .mat-sidenav mm-panel-header { height: @sidebar-menu-header-mobile; .panel-header-title { font-size: @font-extra-large; - margin-left: 0 !important; + margin-left: 0; } .panel-header-close { - width: 48px !important; + width: 48px; } } } From 7e0ffcdeae414ff6f3238dfa8b4050f825c0bd5b Mon Sep 17 00:00:00 2001 From: GallyTi <92124229+GallyTi@users.noreply.github.com> Date: Sat, 26 Oct 2024 21:20:43 +0200 Subject: [PATCH 4/7] Update webapp/src/css/inbox.less Co-authored-by: Ben Kiarie <2597305+Benmuiruri@users.noreply.github.com> --- webapp/src/css/inbox.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/css/inbox.less b/webapp/src/css/inbox.less index 52174a1c14..5b10bb1ed0 100644 --- a/webapp/src/css/inbox.less +++ b/webapp/src/css/inbox.less @@ -1411,7 +1411,7 @@ mm-sidebar-menu .mat-sidenav-container { } .nav-item mat-icon { - margin-left: -6px !important; + margin-left: -6px; } .mat-sidenav mm-panel-header { From 2a12ad4ca0fd6734e3bcb58244f01f330a8719c1 Mon Sep 17 00:00:00 2001 From: GallyTi Date: Sat, 26 Oct 2024 21:24:24 +0200 Subject: [PATCH 5/7] Removed unecesary code block --- webapp/src/css/inbox.less | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/webapp/src/css/inbox.less b/webapp/src/css/inbox.less index 5b10bb1ed0..80eb7ffbc7 100644 --- a/webapp/src/css/inbox.less +++ b/webapp/src/css/inbox.less @@ -1428,24 +1428,6 @@ mm-sidebar-menu .mat-sidenav-container { } } - .app-root:not(.old-nav) .header .tabs a .button-label { - /* Keep the desired styles */ - margin-top: 3px; - overflow: hidden; - word-wrap: break-word; - color: @nav-icon-gray; - font-size: @font-XXS; - text-overflow: ellipsis; - - /* Unset or override the unwanted properties */ - display: block; - white-space: unset; - word-break: unset; - -webkit-line-clamp: unset; - -webkit-box-orient: unset; - line-clamp: unset; - } - .app-root:not(.old-nav) { &.messages, &.tasks, From 6a075d5b1192fc13fa6fab559202bd6556d4e213 Mon Sep 17 00:00:00 2001 From: GallyTi <92124229+GallyTi@users.noreply.github.com> Date: Mon, 28 Oct 2024 14:56:17 +0100 Subject: [PATCH 6/7] Update webapp/src/css/inbox.less Co-authored-by: Jennifer Q <66472237+latin-panda@users.noreply.github.com> --- webapp/src/css/inbox.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/css/inbox.less b/webapp/src/css/inbox.less index 80eb7ffbc7..3326f13778 100644 --- a/webapp/src/css/inbox.less +++ b/webapp/src/css/inbox.less @@ -1471,7 +1471,7 @@ mm-sidebar-menu .mat-sidenav-container { align-items: center; justify-content: center; - .button-label { + a .button-label { top: 0; font-size: @font-XXS; padding-top: 5px; From d950e01e213adc4b9db17b11cd929ec8997bcd73 Mon Sep 17 00:00:00 2001 From: GallyTi Date: Mon, 28 Oct 2024 20:10:17 +0100 Subject: [PATCH 7/7] Removed webkit --- webapp/src/css/inbox.less | 3 --- 1 file changed, 3 deletions(-) diff --git a/webapp/src/css/inbox.less b/webapp/src/css/inbox.less index 3326f13778..71a71b4af9 100644 --- a/webapp/src/css/inbox.less +++ b/webapp/src/css/inbox.less @@ -1482,9 +1482,6 @@ mm-sidebar-menu .mat-sidenav-container { text-overflow: ellipsis; white-space: unset; word-break: unset; - -webkit-line-clamp: unset; - -webkit-box-orient: unset; - line-clamp: unset; } a {