From 8580a5eca172a1ac90a589a340b9b5e2b178488e Mon Sep 17 00:00:00 2001 From: Mauro Mura Date: Fri, 30 Aug 2024 15:09:40 +0200 Subject: [PATCH 1/2] fixed several issues --- css/apps/photos.scss | 3 +- css/apps/viewer.scss | 72 +++++++++++++++++++++++++++++ css/components/ncactions.scss | 6 ++- css/components/ncappnavigation.scss | 24 +++++++++- css/components/ncfields.scss | 14 +++++- css/components/search.scss | 9 ++-- lib/Themes/MagentaDark.php | 2 +- lib/Themes/MagentaLight.php | 2 +- 8 files changed, 120 insertions(+), 12 deletions(-) diff --git a/css/apps/photos.scss b/css/apps/photos.scss index f71ed644..c9ba7724 100644 --- a/css/apps/photos.scss +++ b/css/apps/photos.scss @@ -107,7 +107,7 @@ } } - .files-list-viewer.timeline__file-list { + .files-list-viewer { padding: 0 32px; // Date container @@ -176,7 +176,6 @@ .grid { .grid-item-wrapper { .folder { - border: 1px solid var(--telekom-color-functional-informational-subtle); &:active, &:hover, diff --git a/css/apps/viewer.scss b/css/apps/viewer.scss index 7ddefe50..45e42a89 100644 --- a/css/apps/viewer.scss +++ b/css/apps/viewer.scss @@ -93,11 +93,83 @@ .SfxPopper-wrapper { *, label { font-family: inherit !important; + text-align: center; } } + .SfxModal-Container { .SfxModal-root, .SfxModalTitle-root { text-align: center; } } + +.viewer__image-editor { + + .FIE_topbar-buttons-wrapper { + + .FIE_tabs_toggle_btn { + margin-right: 1rem !important; + } + + .FIE_topbar-save-button { + border-radius: var(--telekom-radius-standard); + background-color: var(--telekom-color-primary-standard); + color: var(--telekom-color-text-and-icon-white-standard); + border: 0; + border-radius: var(--telekom-radius-standard); + font: var(--telekom-text-style-body); + font-weight: var(--telekom-typography-font-weight-bold); + line-height: 1.125rem; + margin-left: 1rem; + min-height: var(--telekom-spacing-composition-space-13); + min-width: var(--telekom-spacing-composition-space-13); + padding-left: var(--telekom-spacing-composition-space-07); + padding-right: var(--telekom-spacing-composition-space-07); + transition: all var(--telekom-motion-duration-transition) var(--telekom-motion-easing-standard); + + &:after { + top: 0; + left: 0; + width: 100%; + border: var(--telekom-spacing-composition-space-01) solid transparent; + height: 100%; + content: ''; + display: block; + position: absolute; + box-sizing: border-box; + pointer-events: none; + border-radius: var(--telekom-radius-standard); + } + + &:hover:not(:disabled) { + background-color: var(--telekom-color-primary-hovered); + } + + &:active { + background-color: var(--telekom-color-primary-pressed); + } + + &:disabled { + background-color: var(--telekom-color-ui-disabled); + color: var(--telekom-color-text-and-icon-disabled); + } + } + } + + .FIE_topbar-close-button { + background-image: var(--icon-close-dark); + background-position: center; + background-repeat: no-repeat; + + &:hover { + background: var(--icon-close-dark); + background-position: center; + background-repeat: no-repeat; + } + + svg { + display: none; + } + } +} \ No newline at end of file diff --git a/css/components/ncactions.scss b/css/components/ncactions.scss index 02a95c19..c80db2c9 100644 --- a/css/components/ncactions.scss +++ b/css/components/ncactions.scss @@ -127,12 +127,16 @@ &.folder-icon { background-image: var(--icon-folder-dark); } + + svg { + display: none; + } } li.action { .action-button__icon { - background-size: 20px; + background-size: 25px; background-position: center; } diff --git a/css/components/ncappnavigation.scss b/css/components/ncappnavigation.scss index f8471efb..4b8587bd 100644 --- a/css/components/ncappnavigation.scss +++ b/css/components/ncappnavigation.scss @@ -28,10 +28,32 @@ gap: var(--telekom-spacing-composition-space-03); padding: 4rem 1.5rem 1.5rem; - [data-cy-files-navigation-item="recent"] { + [data-cy-files-navigation-item="recent"], + [data-cy-files-navigation-item="personal"] { display: none; } + [data-cy-files-navigation-item="favorites"] { + order: 1; + } + + [data-cy-files-navigation-item="files"] { + order: 2; + } + + [data-cy-files-navigation-item="sharingout"], + [data-cy-files-navigation-item="shareoverview"] { + order: 3; + } + + [data-cy-files-navigation-item="sharingin"] { + order: 4; + } + + [data-cy-files-navigation-item="trashbin"] { + order: 5; + } + // default navbar link styling .app-navigation-entry { border-radius: var(--telekom-radius-standard); diff --git a/css/components/ncfields.scss b/css/components/ncfields.scss index 080186e2..910c6933 100644 --- a/css/components/ncfields.scss +++ b/css/components/ncfields.scss @@ -12,6 +12,7 @@ #body-public .input-field, #body-login .input-field { border-radius: var(--telekom-radius-small); + margin-block-start: 0; &__main-wrapper { height: 44px; @@ -58,10 +59,19 @@ } } + &__label { + display: none; + } + &__icon { &--leading { - bottom: 6px; - left: 6px; + bottom: -2px; + left: -2px; + + svg { + height: 20px; + width: 20px; + } } &--trailing { diff --git a/css/components/search.scss b/css/components/search.scss index 006eccf5..baaac179 100644 --- a/css/components/search.scss +++ b/css/components/search.scss @@ -79,18 +79,19 @@ div.unified-search-modal__filters { gap: 0; - // Hide People filter - > .v-popper.v-popper--theme-dropdown { + // Hide people and places filter + > [data-cy-unified-search-filter="people"], + > [data-cy-unified-search-filter="places"] { display: none; } button.button-vue { all: unset !important; - &[title="Dateien"], &[title="Files"] { + &[title="Dateien"], &[title="Files"], &[data-cy-unified-search-filter="current-view"] { display: none !important; } - + .button-vue__text { color: var(--color-primary); } diff --git a/lib/Themes/MagentaDark.php b/lib/Themes/MagentaDark.php index 3036720c..9771a217 100644 --- a/lib/Themes/MagentaDark.php +++ b/lib/Themes/MagentaDark.php @@ -26,7 +26,7 @@ public function __construct( } public function getId(): string { - return 'magenta25dark'; + return 'dark-magenta'; } public function getTitle(): string { diff --git a/lib/Themes/MagentaLight.php b/lib/Themes/MagentaLight.php index 49229496..a060119a 100644 --- a/lib/Themes/MagentaLight.php +++ b/lib/Themes/MagentaLight.php @@ -26,7 +26,7 @@ public function __construct( } public function getId(): string { - return 'magenta25light'; + return 'light-magenta'; } public function getTitle(): string { From 6d03317463a588e86330e1817326a10004b63bfb Mon Sep 17 00:00:00 2001 From: Mauro Mura Date: Fri, 30 Aug 2024 15:17:29 +0200 Subject: [PATCH 2/2] raised version number --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 5ca685bf..d098129b 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -8,7 +8,7 @@ implementing Telekom Scale branding system supporting refactored style system since Nextcloud V25 - 1.1.0 + 1.1.1 agpl T-Systems International NMCTheme