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

Sidebar navigation - styling fixes #156

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Sidebar navigation - styling fixes #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@mixin color-icon {
filter: invert(14%) sepia(83%) saturate(3815%) hue-rotate(313deg) brightness(89%) contrast(127%);
filter: invert(17%) sepia(87%) saturate(5418%) hue-rotate(319deg) brightness(85%) contrast(110%);
@media (prefers-color-scheme: dark) {
filter: brightness(0) saturate(100%) invert(14%) sepia(83%) saturate(3815%) hue-rotate(313deg) brightness(89%) contrast(127%);
filter: brightness(0) saturate(100%) invert(17%) sepia(87%) saturate(5418%) hue-rotate(319deg) brightness(85%) contrast(110%);
}
}

Expand Down
15 changes: 3 additions & 12 deletions css/components/ncappnavigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
$breakpoint-mobile: 1024px;

:root {
--color-hover: var(--telekom-color-text-and-icon-primary-hovered);
--color-active: var(--telekom-color-text-and-icon-primary-pressed);
--internal-padding: 0;
}

Expand Down Expand Up @@ -43,7 +41,7 @@ $breakpoint-mobile: 1024px;
padding: 0.25rem;
}
&:hover, &.active {
background-color: var(--color-background-hover);
background-color: var(--nmc-color-background-hover);
}
// do not pin app navigation entries to the bottom
&--pinned {
Expand All @@ -62,7 +60,7 @@ $breakpoint-mobile: 1024px;
background-color: var(--telekom-color-primary-standard);
}
span {
color: var(--color-active);
color: var(--telekom-color-text-and-icon-primary-standard);
}
.app-navigation-entry-icon {
@include color-icon;
Expand All @@ -72,7 +70,7 @@ $breakpoint-mobile: 1024px;
// on hover link styling
.app-navigation-entry:hover {
span {
color: var(--color-hover);
color: var(--telekom-color-text-and-icon-primary-standard);
}
.app-navigation-entry-icon {
@include color-icon;
Expand All @@ -85,13 +83,6 @@ $breakpoint-mobile: 1024px;
}
}

@media (prefers-color-scheme: dark) {
:root {
--color-hover: var(--telekom-color-text-and-icon-primary-pressed);
--color-active: var(--telekom-color-text-and-icon-primary-hovered);
}
}

// icon update
#app-navigation-vue .app-navigation__list {
// remove all the svgs
Expand Down
3 changes: 2 additions & 1 deletion css/components/ncbuttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
padding: 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;
min-height: var(--telekom-spacing-composition-space-13);
min-width: var(--telekom-spacing-composition-space-13);
Expand Down Expand Up @@ -95,7 +96,7 @@

&:hover:not(:disabled) {
color: var(--telekom-color-text-and-icon-standard);
background-color: var(--telekom-color-ui-state-fill-standard);
background-color: var(--nmc-color-background-hover);
border-color: var(--telekom-color-ui-border-hovered);
}

Expand Down
1 change: 1 addition & 0 deletions css/nmcdefault.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,5 @@
--color-background-plain: var(--telekom-color-background-canvas);

--nmc-breakpoint-mobile: 1024px;
--nmc-color-background-hover: #EDEDED;
}
9 changes: 7 additions & 2 deletions css/v25/ncappnavigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ $breakpoint-mobile: 1024px;
}

& > ul > li {
// remove already hidden from DOM so they won't take up space
&.hidden-visually{
display: none;
}

font: var(--telekom-text-style-ui-bold);
margin-bottom: var(--telekom-spacing-composition-space-03);

Expand Down Expand Up @@ -51,8 +56,8 @@ $breakpoint-mobile: 1024px;
}

& > a:hover, & > a.active, &.active > a {
color: var(--color-hover);
background-color: var(--color-background-hover);
color: var(--telekom-color-text-and-icon-primary-standard);
background-color: var(--nmc-color-background-hover);

&::after, img {
@include color-icon;
Expand Down
9 changes: 2 additions & 7 deletions src/components/StorageQuota.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<p v-if="memoryUsed > 0">
{{ t('nmctheme', 'Memory used up to {memoryUsage}%', { memoryUsage }) }}
</p>
<a class="storage-quota__link"
<a class="button-vue--vue-secondary storage-quota__link"
target="_blank"
rel="noopener"
href="https://cloud.telekom-dienste.de/tarife">
Expand Down Expand Up @@ -132,13 +132,8 @@ export default {
&__link {
width: fit-content;
padding: 0.5rem 1.5rem;
border-radius: var(--telekom-radius-small);
font: var(--telekom-text-style-body);
border: 1px solid #191919;
&:hover {
border-color: var(--telekom-color-primary-standard);
color: var(--telekom-color-primary-standard);
}
font-weight: bold;
}
}
</style>