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.

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

[stable3] Fix counter margin #1933

Merged
merged 1 commit into from
May 6, 2021
Merged
Changes from all commits
Commits
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
20 changes: 14 additions & 6 deletions src/components/AppNavigationItem/AppNavigationItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,10 @@ Just set the `pinned` prop.

<!-- Counter and Actions -->
<div v-if="hasUtils" class="app-navigation-entry__utils">
<slot name="counter" />
<div v-if="$slots.counter"
class="app-navigation-entry__counter-wrapper">
<slot name="counter" />
</div>
<Actions menu-align="right"
:placement="menuPlacement"
:open="menuOpen"
Expand Down Expand Up @@ -450,6 +453,7 @@ export default {
box-sizing: border-box;
width: 100%;
min-height: $clickable-area;
padding-right: 4px;

// When .active class is applied, change color background of link and utils. The
// !important prevents the focus state to override the active state.
Expand Down Expand Up @@ -584,11 +588,15 @@ export default {
display: flex;
align-items: center;
flex: 0 1 auto;
// visually balance the menu so it's not
// stuck to the scrollbar
.action-item {
margin-right: 2px;
}
}

/* counter */
.app-navigation-entry__counter-wrapper {
// Add slightly more space to the right of the counter
margin-right: 2px;
display: flex;
align-items: center;
flex: 0 1 auto;
}

// STATES
Expand Down