From 34a27b3b31924dd62752138e9b35b146eaf90cee Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 19 Oct 2017 22:00:06 +0100 Subject: [PATCH 1/2] simplify sass imports --- src/app/components/current-user/current-user.component.scss | 2 +- src/app/components/header/header.component.scss | 2 +- src/app/components/search/search.component.scss | 2 +- src/app/components/sidenav/sidenav.component.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/components/current-user/current-user.component.scss b/src/app/components/current-user/current-user.component.scss index 18a48aea1..7aae7f531 100644 --- a/src/app/components/current-user/current-user.component.scss +++ b/src/app/components/current-user/current-user.component.scss @@ -1,4 +1,4 @@ -@import './../../ui/variables'; +@import 'variables'; $am-avatar-size: 40px; diff --git a/src/app/components/header/header.component.scss b/src/app/components/header/header.component.scss index d1932d476..576e8f580 100644 --- a/src/app/components/header/header.component.scss +++ b/src/app/components/header/header.component.scss @@ -1,4 +1,4 @@ -@import './../../ui/variables'; +@import 'variables'; .app-menu { diff --git a/src/app/components/search/search.component.scss b/src/app/components/search/search.component.scss index 580754e74..293d94453 100644 --- a/src/app/components/search/search.component.scss +++ b/src/app/components/search/search.component.scss @@ -1,4 +1,4 @@ -@import './../../ui/variables'; +@import 'variables'; adf-search-control { color: $alfresco-white; diff --git a/src/app/components/sidenav/sidenav.component.scss b/src/app/components/sidenav/sidenav.component.scss index 3a6bb0630..33d0be7e0 100644 --- a/src/app/components/sidenav/sidenav.component.scss +++ b/src/app/components/sidenav/sidenav.component.scss @@ -1,4 +1,4 @@ -@import '../../ui/_variables.scss'; +@import 'variables'; $sidenav-section--h-padding: 24px; $sidenav-section--v-padding: 8px; From 1a5bce46925943d83c96bccb09841ba4b0e3d094 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 19 Oct 2017 22:04:27 +0100 Subject: [PATCH 2/2] use hash with navigation --- src/app/app.module.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1d3fb6ec9..67d22bc47 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,7 +28,8 @@ import { SidenavComponent } from './components/sidenav/sidenav.component'; imports: [ BrowserModule, RouterModule.forRoot(APP_ROUTES, { - enableTracing: true + useHash: true, + enableTracing: false // enable for debug only }), AdfModule, CommonModule,