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

Jump to bottom

Remove border from sidebar tabs #4449

Merged
merged 2 commits into from Aug 23, 2023
Merged

Remove border from sidebar tabs #4449

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
2412bbf
Improve active state of listitem
marcoambrosini Aug 11, 2023
d59c939
Remove borders from sidebar tabs
marcoambrosini Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/components/NcAppSidebar/NcAppSidebarTabs.vue
View file
Open in desktop
Expand Up @@ -311,4 +311,8 @@ export default {
}
}
}

:deep(.checkbox-radio-switch--button-variant.checkbox-radio-switch) {
border: unset;
}
</style>
25 changes: 25 additions & 0 deletions src/components/NcCounterBubble/NcCounterBubble.vue
View file
Open in desktop
Expand Up @@ -62,13 +62,24 @@ export default {
return ['highlighted', 'outlined', ''].indexOf(value) !== -1
},
},

/**
* Specifies whether the component is used within a component that is
* active and therefore has a primary background. Inverts the color of
* this component when that is the case.
*/
active: {
type: Boolean,
default: false,
},
},

computed: {
counterClassObject() {
return {
'counter-bubble__counter--highlighted': this.type === 'highlighted',
'counter-bubble__counter--outlined': this.type === 'outlined',
active: this.active,
}
},
},
Expand All @@ -91,16 +102,30 @@ export default {
font-weight: bold;
color: var(--color-primary-element-light-text);

& .active {
color: var(--color-main-background);
background-color: var(--color-primary-element-light);
}

&--highlighted {
color: var(--color-primary-element-text);
background-color: var(--color-primary-element);
}

&--highlighted,.active {
color: var(--color-primary-element);
background-color: var(--color-main-background);
}

&--outlined {
color: var(--color-primary-element);
background: transparent;
box-shadow: inset 0 0 0 2px;
}
&--outlined,.active {
color: var(--color-main-background);
box-shadow: inset 0 0 0 2px;
}
}

</style>
36 changes: 18 additions & 18 deletions src/components/NcListItem/NcListItem.vue
View file
Open in desktop
Expand Up @@ -26,11 +26,13 @@
<template>
<ul>
<NcListItem
:name="'Name of the element'"
:name="'This is an active element'"
:bold="false"
:active="true"
:details="'1h'"
:counter-number="44"
counterType="highlighted">
counterType="highlighted"
class="active">
<template #icon>
<NcAvatar :size="44" user="janedoe" display-name="Jane Doe" />
</template>
Expand All @@ -39,7 +41,7 @@
</template>
<template #indicator>
<!-- Color dot -->
<CheckboxBlankCircle :size="16" fill-color="#0082c9" />
<CheckboxBlankCircle :size="16" fill-color="#fff" />
</template>
<template #actions>
<NcActionButton>
Expand Down Expand Up @@ -205,7 +207,7 @@
:to="to"
:exact="to ? exact : null">
<li class="list-item__wrapper"
:class="{ 'list-item__wrapper--active' : isActive }">
:class="{ 'list-item__wrapper--active' : isActive || active }">
<a :id="anchorId"
ref="list-item"
:href="routerLinkHref || href"
Expand Down Expand Up @@ -253,6 +255,7 @@
<!-- Counter and indicator -->
<span v-if="showAdditionalElements" class="line-two__additional_elements">
<NcCounterBubble v-if="counterNumber != 0"
:active="isActive || active"
class="line-two__counter"
:type="counterType">
{{ counterNumber }}
Expand All @@ -272,6 +275,7 @@
class="list-item-content__actions"
@click.prevent.stop="">
<NcActions ref="actions"
:primary="isActive || active"
:aria-label="computedActionsAriaLabel"
@update:open="handleActionsUpdateOpen">
<!-- @slot Provide the actions for the right side quick menu -->
Expand All @@ -284,6 +288,7 @@
class="list-item-content__actions"
@click.prevent.stop="">
<NcActions ref="actions"
:primary="isActive || active"
:aria-label="computedActionsAriaLabel"
@update:open="handleActionsUpdateOpen">
<!-- @slot Provide the actions for the right side quick menu -->
Expand Down Expand Up @@ -602,7 +607,15 @@ export default {
&:active,
&.active {
.list-item {
background-color: var(--color-primary-element-light);
background-color: var(--color-primary-element);
}

.line-one__name, .line-one__details {
color: var(--color-primary-element-text) !important;
}

.line-two__subname {
color: var(--color-primary-element-text) !important;
}
}
}
Expand Down Expand Up @@ -671,19 +684,6 @@ export default {
}
}

// Add more contrast for active entry
[data-themes*='highcontrast'] {
.list-item__wrapper {
&--active,
&:active,
&.active {
.list-item {
background-color: var(--color-primary-element-light-hover);
}
}
}
}

.line-one {
display: flex;
align-items: center;
Expand Down