Skip to content

Commit b00396d

Browse files
committed
feat(app-content): Revise sidebar selection and content edge styling
Main content now has a subtle left divider and rounded left edge next to the navigation. Selected nav and list items use a softly tinted pill instead of a solid primary fill.
1 parent e5d5bd6 commit b00396d

3 files changed

Lines changed: 17 additions & 9 deletions

File tree

src/assets/NcAppNavigationItem.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
}
2929
}
3030

31-
// When .active class is applied, change color background of link and utils. The
32-
// !important prevents the focus state to override the active state.
31+
// When .active class is applied, render a softly tinted "pill" highlight.
32+
// The !important prevents the focus state to override the active state.
3333
&.active {
34-
background-color: var(--color-primary-element) !important;
34+
background-color: var(--color-primary-element-light) !important;
3535

3636
&:hover {
37-
background-color: var(--color-primary-element-hover) !important;
37+
background-color: var(--color-primary-element-light-hover) !important;
3838
}
3939

4040
// overwrite active text color
4141
.app-navigation-entry-link, .app-navigation-entry-button {
42-
color: var(--color-primary-element-text) !important;
42+
color: var(--color-primary-element-light-text) !important;
4343
}
4444
}
4545
&:focus-within,

src/components/NcAppContent/NcAppContent.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,14 @@ export default {
466466
&:not(.app-content--has-list) {
467467
overflow: auto;
468468
}
469+
470+
// Subtle divider + rounded left edge when the navigation sits next to the content.
471+
// Hidden on mobile where the navigation slides over the content.
472+
@media only screen and (min-width: $breakpoint-mobile) {
473+
border-inline-start: 1px solid var(--color-border);
474+
border-start-start-radius: var(--body-container-radius);
475+
border-end-start-radius: var(--body-container-radius);
476+
}
469477
}
470478
471479
.app-content-wrapper {

src/components/NcListItem/NcListItem.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -854,22 +854,22 @@ export default {
854854
&--active,
855855
&.active {
856856
.list-item {
857-
background-color: var(--color-primary-element);
858-
color: var(--color-primary-element-text) !important;
857+
background-color: var(--color-primary-element-light);
858+
color: var(--color-primary-element-light-text) !important;
859859
860860
&:hover,
861861
&:focus-within,
862862
&:has(:focus-visible),
863863
&:has(:active) {
864-
background-color: var(--color-primary-element-hover);
864+
background-color: var(--color-primary-element-light-hover);
865865
}
866866
}
867867
868868
.list-item-content__name,
869869
.list-item-content__subname,
870870
.list-item-content__details,
871871
.list-item-details__details {
872-
color: var(--color-primary-element-text) !important;
872+
color: var(--color-primary-element-light-text) !important;
873873
}
874874
}
875875
.list-item-content__name,

0 commit comments

Comments
 (0)