From ae0011c05a8b9621ddd8fb8f7b428ee767d1745c Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Thu, 27 Oct 2016 16:27:31 +0300 Subject: [PATCH 1/4] fix(breadcrumbs): breadcrumbs color in mint theme should not be the same as background is (#378) --- src/app/theme/components/baContentTop/baContentTop.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/theme/components/baContentTop/baContentTop.scss b/src/app/theme/components/baContentTop/baContentTop.scss index 0184ad3c..520bb903 100644 --- a/src/app/theme/components/baContentTop/baContentTop.scss +++ b/src/app/theme/components/baContentTop/baContentTop.scss @@ -32,7 +32,7 @@ h1.al-title { } &.breadcrumb-item.active { - color: $default; + color: $default-text; } } } From bb4bf77ceb06816befb2a9b74aff66e93050fd71 Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Thu, 27 Oct 2016 16:28:02 +0300 Subject: [PATCH 2/4] fix(sidebar): add href attribute to placeholder links in sidebar and pageTop (#377) --- .../components/baMenu/components/baMenuItem/baMenuItem.html | 2 +- src/app/theme/components/baPageTop/baPageTop.component.ts | 1 + src/app/theme/components/baPageTop/baPageTop.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html b/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html index 737aecc2..b741dd9b 100644 --- a/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html +++ b/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html @@ -8,7 +8,7 @@ {{ menuItem.title }} - + {{ menuItem.title }} diff --git a/src/app/theme/components/baPageTop/baPageTop.component.ts b/src/app/theme/components/baPageTop/baPageTop.component.ts index 82f690cd..e20d38a7 100644 --- a/src/app/theme/components/baPageTop/baPageTop.component.ts +++ b/src/app/theme/components/baPageTop/baPageTop.component.ts @@ -22,6 +22,7 @@ export class BaPageTop { public toggleMenu() { this.isMenuCollapsed = !this.isMenuCollapsed; this._state.notifyDataChanged('menu.isCollapsed', this.isMenuCollapsed); + return false; } public scrolledChanged(isScrolled) { diff --git a/src/app/theme/components/baPageTop/baPageTop.html b/src/app/theme/components/baPageTop/baPageTop.html index c899c7ca..1c6b660d 100644 --- a/src/app/theme/components/baPageTop/baPageTop.html +++ b/src/app/theme/components/baPageTop/baPageTop.html @@ -1,7 +1,7 @@
- +
From 3f824b6e82834e0a83a2498d7617d3fd427deb58 Mon Sep 17 00:00:00 2001 From: AlbertXingZhang Date: Thu, 27 Oct 2016 06:28:48 -0700 Subject: [PATCH 3/4] fix(menu): prevent extra '/' in menu link for empty path string (#375) --- src/app/theme/components/baMenu/baMenu.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/theme/components/baMenu/baMenu.service.ts b/src/app/theme/components/baMenu/baMenu.service.ts index 5595b2d5..20787e5d 100644 --- a/src/app/theme/components/baMenu/baMenu.service.ts +++ b/src/app/theme/components/baMenu/baMenu.service.ts @@ -80,7 +80,7 @@ export class BaMenuService { item.route.paths = item.route.path; } else { item.route.paths = parent && parent.route && parent.route.paths ? parent.route.paths.slice(0) : ['/']; - item.route.paths.push(item.route.path); + if (!!item.route.path) item.route.paths.push(item.route.path); } if (object.children && object.children.length > 0) { From ecfb007a71d14a9af2afd4c18e396abde14a3b21 Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Thu, 27 Oct 2016 16:30:23 +0300 Subject: [PATCH 4/4] feat(sidebar): add ability to customize sidebar styles (#373) --- src/app/theme/components/baSidebar/baSidebar.scss | 10 +++++----- src/app/theme/sass/_layout.scss | 6 ++++-- src/app/theme/sass/conf/_variables.scss | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/app/theme/components/baSidebar/baSidebar.scss b/src/app/theme/components/baSidebar/baSidebar.scss index b5f6d40b..29920784 100644 --- a/src/app/theme/components/baSidebar/baSidebar.scss +++ b/src/app/theme/components/baSidebar/baSidebar.scss @@ -1,6 +1,6 @@ @import '../../sass/conf/conf'; -$sidebar-width: 180px; +$sidebar-scroll-width: 4px; $angle-left: "\f100"; $angle-right: "\f101"; @@ -113,8 +113,8 @@ a.al-sidebar-list-link { .slimScrollBar, .slimScrollRail { border-radius: 0px !important; - width: 4px !important; - left: 176px; + width: $sidebar-scroll-width !important; + left: $sidebar-width - $sidebar-scroll-width; } @mixin layout-collapsed() { @@ -170,11 +170,11 @@ a.al-sidebar-list-link { } .sidebar-hover-elem{ - width: 4px; + width: $sidebar-scroll-width; background: $primary; position: absolute; top: -150px; - left: 176px; + left: $sidebar-width - $sidebar-scroll-width; transition: all 0.5s ease; transition-property: top, height; height: 42px; diff --git a/src/app/theme/sass/_layout.scss b/src/app/theme/sass/_layout.scss index 53d06608..df07d1c0 100644 --- a/src/app/theme/sass/_layout.scss +++ b/src/app/theme/sass/_layout.scss @@ -1,4 +1,6 @@ -$left-space: 180px; +@import 'conf/conf'; + +$left-space: $sidebar-width; @include scrollbars(.5em, #d9d9d9, rgba(0, 0, 0, 0)); @@ -66,7 +68,7 @@ a { .al-footer { height: 34px; - padding: 0 18px 0 200px; + padding: 0 18px 0 ($left-space + 20px); width: 100%; position: absolute; display: block; diff --git a/src/app/theme/sass/conf/_variables.scss b/src/app/theme/sass/conf/_variables.scss index 275f21d0..32111079 100644 --- a/src/app/theme/sass/conf/_variables.scss +++ b/src/app/theme/sass/conf/_variables.scss @@ -10,6 +10,7 @@ $resXXS: 435px; $resMin: 320px; $top-height: 66px; +$sidebar-width: 180px; $small-card-height: 114px; $xsmall-card-height: 187px;