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

feat(menu): Eva style #1421

Merged
merged 15 commits into from
Apr 25, 2019
Merged

feat(menu): Eva style #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4206012
feat(menu): drop inverse support
yggg Apr 21, 2019
2b97e73
refactor(menu): remove unused import
yggg Apr 21, 2019
08740a7
refactor(menu): add autoCollapse getter
yggg Apr 21, 2019
e71873b
refactor(menu): change private to protected
yggg Apr 21, 2019
490941c
fix(menu): hide chevron in sidebar
yggg Apr 25, 2019
a8d7aa7
fix(menu group): align icon with text
yggg Apr 25, 2019
835787e
feat(menu): Eva theme
yggg Apr 25, 2019
0d9abcc
fix(menu): remove margin when menu collapsed
yggg Apr 25, 2019
3e2fefb
docs(menu): update theme properties list
yggg Apr 25, 2019
d5cf1b0
Merge branch 'next' into feat/eva-menu
yggg Apr 25, 2019
622dc39
fix(menu): show dividers
yggg Apr 25, 2019
473fb13
feat(menu): remove menu borders
yggg Apr 25, 2019
bcbc8ba
feat(menu): add cursor theme property
yggg Apr 25, 2019
8740966
fix(menu): remove double border
yggg Apr 25, 2019
c45a5e1
Merge branch 'next' into feat/eva-menu
yggg Apr 25, 2019
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
143 changes: 74 additions & 69 deletions src/framework/theme/components/menu/_menu.component.theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,118 +6,123 @@

@mixin nb-menu-theme() {
nb-menu {
font-family: nb-theme(menu-font-family);
font-size: nb-theme(menu-font-size);
font-weight: nb-theme(menu-font-weight);
background: nb-theme(menu-bg);
color: nb-theme(menu-fg);
background-color: nb-theme(menu-background-color);

ul.menu-items {
margin: 0;
padding: 0;
}

.menu-group {
font-weight: nb-theme(menu-group-font-weight);
font-size: nb-theme(menu-group-font-size);
color: nb-theme(menu-group-fg);
padding: nb-theme(menu-group-padding);
.menu-group,
.menu-item a {
font-family: nb-theme(menu-text-font-family);
font-size: nb-theme(menu-text-font-size);
font-weight: nb-theme(menu-text-font-weight);
line-height: nb-theme(menu-text-line-height);
padding: nb-theme(menu-item-padding);
}

.menu-group,
.menu-group nb-icon.menu-icon {
color: nb-theme(menu-group-text-color);
}

.menu-item {
a {
padding: nb-theme(menu-item-padding);
border-radius: nb-theme(menu-submenu-item-border-radius);
color: nb-theme(menu-text-color);
border-radius: nb-theme(menu-item-border-radius);
}

a:hover,
a.active {
background-color: nb-theme(menu-active-bg);
color: nb-theme(menu-active-fg);
font-weight: nb-theme(menu-active-font-weight);
background-color: nb-theme(menu-item-active-background-color);
color: nb-theme(menu-item-active-text-color);

.menu-icon,
.chevron {
color: nb-theme(menu-icon-active-color);
.menu-icon {
color: nb-theme(menu-item-icon-active-color);
}
}

.menu-icon {
font-size: nb-theme(menu-icon-font-size);
width: nb-theme(menu-icon-font-size);
margin: nb-theme(menu-icon-margin);
text-align: center;
color: nb-theme(menu-icon-color);
a:hover {
background-color: nb-theme(menu-item-hover-background-color);
color: nb-theme(menu-item-hover-text-color);
cursor: nb-theme(menu-item-hover-cursor);

.menu-icon {
color: nb-theme(menu-item-icon-hover-color);
}
}

.chevron {
font-size: 1rem;
color: nb-theme(menu-icon-color);
.menu-icon {
color: nb-theme(menu-item-icon-color);
font-size: nb-theme(menu-item-icon-width);
margin: nb-theme(menu-item-icon-margin);
width: 1em;
text-align: center;
}
}

.menu-items > .menu-item {
border-bottom: 1px solid nb-theme(menu-item-separator);
$divider: nb-theme(menu-item-divider-width) nb-theme(menu-item-divider-style) nb-theme(menu-item-divider-color);
.menu-item {
border-bottom: $divider;

&:first-child {
border-top: 1px solid nb-theme(menu-item-separator);
border-top: none;
}
&:last-child {
border-bottom: none;
}

.menu-item:first-child {
border-top: $divider;
}
}

.menu-item > .menu-items {
background-color: nb-theme(menu-submenu-bg);
background-color: nb-theme(menu-submenu-background-color);
margin: nb-theme(menu-submenu-margin);
padding: nb-theme(menu-submenu-padding);
}

.menu-item > .menu-items > .menu-item {
border: none;
background: nb-theme(menu-submenu-bg);
color: nb-theme(menu-submenu-fg);
padding: nb-theme(menu-submenu-item-container-padding);

&:first-child {
margin-top: nb-theme(menu-submenu-padding);
}
&:last-child {
margin-bottom: nb-theme(menu-submenu-padding);
}
background: nb-theme(menu-submenu-background-color);
color: nb-theme(menu-submenu-text-color);

a {
border: nb-theme(menu-submenu-item-border-width) solid nb-theme(menu-submenu-bg);
border-color: nb-theme(menu-submenu-item-border-color);
border-style: nb-theme(menu-submenu-item-border-style);
border-width: nb-theme(menu-submenu-item-border-width);
padding: nb-theme(menu-submenu-item-padding);
}

a:hover {
color: nb-theme(menu-submenu-hover-fg);
background: nb-theme(menu-submenu-hover-bg);
}

a.active {
background-color: nb-theme(menu-submenu-active-bg);
color: nb-theme(menu-submenu-active-fg);
border-color: nb-theme(menu-submenu-active-border-color);
box-shadow: nb-theme(menu-submenu-active-shadow);
}
}
}
background-color: nb-theme(menu-submenu-item-active-background-color);
border-color: nb-theme(menu-submenu-item-active-border-color);
color: nb-theme(menu-submenu-item-active-text-color);

nb-menu.inverse {
.menu-item {
a {
color: nb-theme(menu-bg);
.menu-icon {
color: nb-theme(menu-submenu-item-icon-active-color);
}
}

a:hover {
background-color: nb-theme(menu-active-fg);
color: nb-theme(menu-active-bg);
}
background-color: nb-theme(menu-submenu-item-hover-background-color);
border-color: nb-theme(menu-submenu-item-hover-border-color);
color: nb-theme(menu-submenu-item-hover-text-color);

a.active {
background-color: nb-theme(menu-active-fg);
color: nb-theme(menu-active-bg);
.menu-icon {
color: nb-theme(menu-submenu-item-icon-hover-color);
}
}
}

.menu-group {
color: nb-theme(menu-bg);
a.active:hover {
background-color: nb-theme(menu-submenu-item-active-hover-background-color);
border-color: nb-theme(menu-submenu-item-active-hover-border-color);
color: nb-theme(menu-submenu-item-active-hover-text-color);

.menu-icon {
color: nb-theme(menu-submenu-item-icon-active-hover-color);
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/framework/theme/components/menu/menu-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
href="#">
<nb-icon class="menu-icon" [icon]="menuItem.icon" *ngIf="menuItem.icon"></nb-icon>
<span class="menu-title">{{ menuItem.title }}</span>
<nb-icon [icon]="getExpandStateIcon()" pack="nebular-essentials"></nb-icon>
<nb-icon class="expand-state" [icon]="getExpandStateIcon()" pack="nebular-essentials"></nb-icon>
</a>
<ul *ngIf="menuItem.children"
[class.collapsed]="!(menuItem.children && menuItem.expanded)"
Expand Down
4 changes: 4 additions & 0 deletions src/framework/theme/components/menu/menu.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,8 @@
@include nb-rtl(text-align, right);
}
}

.menu-group span {
display: flex;
}
}
Loading