Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sidebar navigation styles in files and photos app #327

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Fix sidebar navigation styles in files and photos app #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7abc5a7
Adapt files sidebar navigation for v28
aleksei-nmc Apr 9, 2024
0141003
Fix sidebar view for photos
aleksei-nmc Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions css/apps/photos.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
}
}

.app-navigation__content {
&.app-navigation__content {
ul.app-navigation__list {
padding: 4rem 1.5rem 1.5rem;

Expand Down Expand Up @@ -370,7 +370,7 @@
}

// contains 'Photos settings' button
&>li.app-navigation-entry-wrapper {
.app-navigation__footer {
display: none;
}
}
Expand Down
128 changes: 72 additions & 56 deletions css/components/ncappnavigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
}

#app-navigation-vue.app-navigation {
.app-navigation {
border-right: 1px solid var(--telekom-color-ui-faint);

// prevent mobile navigation toggle button to visually overlap underlying content
Expand All @@ -23,73 +23,89 @@
}
}

.app-navigation__content {
// remove gaps between navigation items
.app-navigation__list {
gap: var(--telekom-spacing-composition-space-03);
padding: 4rem 1.5rem 1.5rem;
// remove gaps between navigation items
nav.app-navigation__content ul.app-navigation__list {
gap: var(--telekom-spacing-composition-space-03);
padding: 4rem 1.5rem 1.5rem;

[data-cy-files-navigation-item="recent"],
[data-cy-files-navigation-item="shareoverview"] {
display: none;
}
[data-cy-files-navigation-item="recent"] {
display: none;
}

// default navbar link styling
.app-navigation-entry {
border-radius: var(--telekom-radius-standard);
font: var(--telekom-text-style-ui-bold);
transition: none;
.app-navigation-entry-link {
padding: 0.25rem;
}
&-icon {
// default navbar link styling
.app-navigation-entry {
border-radius: var(--telekom-radius-standard);
font: var(--telekom-text-style-ui-bold);
transition: none;
.app-navigation-entry-link {
padding: 0.25rem;
.app-navigation-entry-icon {
background-size: 24px;
background-position: center;
}
&:hover, &.active {
background-color: var(--nmc-color-background-hover);
}
&:hover, &.active, &.active:hover {
background-color: var(--nmc-color-background-hover) !important;
}
// do not pin app navigation entries to the bottom
&--pinned {
margin-top: initial;
margin-bottom: auto;
}

// active link styling
&.active {
&::before {
background-color: var(--telekom-color-primary-standard);
}
// do not pin app navigation entries to the bottom
&--pinned {
margin-top: initial;
margin-bottom: auto;
span {
color: var(--telekom-color-text-and-icon-primary-standard);
}

// active link styling
&.active {
&::before {
background-color: var(--telekom-color-primary-standard);
}
span {
color: var(--telekom-color-text-and-icon-primary-standard);
}
.app-navigation-entry-icon {
filter: var(--nmc-color-icon)
}
.app-navigation-entry-icon {
filter: var(--nmc-color-icon)
}
}

// on hover link styling
&:hover {
span {
color: var(--telekom-color-text-and-icon-primary-standard);
}
.app-navigation-entry-icon {
filter: var(--nmc-color-icon)
}
// on hover link styling
&:hover {
span {
color: var(--telekom-color-text-and-icon-primary-standard);
}
.app-navigation-entry-icon {
filter: var(--nmc-color-icon)
}
}

// hide Collapse buttons
&--collapsible button.icon-collapse{
display: none;
}

// hide Collapse buttons
&--collapsible button.icon-collapse{
&--collapsible[data-cy-files-navigation-item=shareoverview] {
// hide 'Shares' link
> div.app-navigation-entry {
display: none;
}

.app-navigation-entry {
padding-left: 0px;
}

// hide every subentry except 'Shared with you' and 'Shared with others'
ul.app-navigation-entry__children {
display: flex;
li:not([data-cy-files-navigation-item=sharingin]):not([data-cy-files-navigation-item=sharingout]) {
display: none;
}
}
}
}
}

.app-navigation-entry__settings {
// hide nextcloud quota and files settings links
.app-navigation-entry-wrapper {
display: none;
}
&__content &-entry__settings {
// hide nextcloud quota and files settings links
.app-navigation-entry-wrapper {
display: none;
}
}
}
Expand All @@ -101,19 +117,19 @@
display: none;
}

.app-navigation-entry-icon.nav-icon-favorites {
[data-cy-files-navigation-item=favorites] .app-navigation-entry-icon {
background-image: var(--icon-star-dark);
}

.app-navigation-entry-icon.nav-icon-files {
[data-cy-files-navigation-item=files] .app-navigation-entry-icon {
background-image: var(--icon-folder-dark);
}

.app-navigation-entry-icon.nav-icon-sharingout {
[data-cy-files-navigation-item=shareoverview] [data-cy-files-navigation-item=sharingout] .app-navigation-entry-icon {
background-image: var(--icon-share-dark);
}

.app-navigation-entry-icon.nav-icon-sharingin {
[data-cy-files-navigation-item=shareoverview] [data-cy-files-navigation-item=sharingin] .app-navigation-entry-icon {
background-image: var(--icon-attachment-dark);
}

Expand Down
Loading