diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts index 7b30190b8..00643a7e5 100644 --- a/e2e/src/app.e2e-spec.ts +++ b/e2e/src/app.e2e-spec.ts @@ -8,7 +8,7 @@ describe('Material Docs App', () => { page = new MaterialDocsAppPage(); }); - it('should display welcome message', async() => { + it('should display welcome message', async () => { await page.navigateTo(); expect(await page.getTitleText()).toEqual('Angular Material'); }); diff --git a/package.json b/package.json index cf0150783..bf2cba577 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "start": "yarn build-themes && ng serve", "start:jit": "yarn build-themes && ng serve --aot=false", "start:prod": "yarn build-themes && ng serve --prod", - "lint": "tslint -p tsconfig.json", + "lint": "ng lint", "test": "yarn build-themes && ng test", "pree2e": "webdriver-manager update", "e2e": "yarn build-themes && ng e2e", diff --git a/src/app/material-docs-app.html b/src/app/material-docs-app.html index e068a91b2..b7b9af2d0 100644 --- a/src/app/material-docs-app.html +++ b/src/app/material-docs-app.html @@ -1,3 +1,2 @@ - diff --git a/src/app/pages/component-page-header/component-page-header.html b/src/app/pages/component-page-header/component-page-header.html index 52266ab16..2e9f18857 100644 --- a/src/app/pages/component-page-header/component-page-header.html +++ b/src/app/pages/component-page-header/component-page-header.html @@ -1,7 +1,7 @@ -
+

{{getTitle()}}

-
+ diff --git a/src/app/pages/component-sidenav/_component-sidenav-theme.scss b/src/app/pages/component-sidenav/_component-sidenav-theme.scss index 6951d5e95..43569b2ae 100644 --- a/src/app/pages/component-sidenav/_component-sidenav-theme.scss +++ b/src/app/pages/component-sidenav/_component-sidenav-theme.scss @@ -17,7 +17,8 @@ } .docs-nav-content-btn { - color: rgba(mat-color($foreground, text), .5); + color: rgba(mat-color($foreground, text), 0.7); + font-family: Roboto, "Helvetica Neue", sans-serif; &:focus { // override the default background @@ -37,6 +38,10 @@ &:hover { color: mat-color($primary, if($is-dark-theme, 200, default)); } + + &.docs-component-viewer-sidenav-item-selected { + background: rgba(0, 0, 0, $nav-background-focus-opacity); + } } } diff --git a/src/app/pages/component-sidenav/component-nav.html b/src/app/pages/component-sidenav/component-nav.html index 167ea3a1c..c9468e6f4 100644 --- a/src/app/pages/component-sidenav/component-nav.html +++ b/src/app/pages/component-sidenav/component-nav.html @@ -1,23 +1,23 @@
- +
diff --git a/src/app/pages/component-sidenav/component-sidenav.html b/src/app/pages/component-sidenav/component-sidenav.html index 49577abb0..547bb3d3c 100644 --- a/src/app/pages/component-sidenav/component-sidenav.html +++ b/src/app/pages/component-sidenav/component-sidenav.html @@ -2,23 +2,23 @@
-
+
-
+
diff --git a/src/app/pages/component-sidenav/component-sidenav.ts b/src/app/pages/component-sidenav/component-sidenav.ts index 4d6ec07c8..ffc0990aa 100644 --- a/src/app/pages/component-sidenav/component-sidenav.ts +++ b/src/app/pages/component-sidenav/component-sidenav.ts @@ -37,6 +37,7 @@ import {HttpClientModule} from '@angular/common/http'; import {StackBlitzButtonModule} from '../../shared/stack-blitz'; import {SvgViewerModule} from '../../shared/svg-viewer/svg-viewer'; import {ExampleModule} from '@angular/components-examples'; +import {MatListModule} from '@angular/material/list'; const SMALL_WIDTH_BREAKPOINT = 720; @@ -81,6 +82,7 @@ export class ComponentSidenav implements OnInit { export class ComponentNav implements OnInit, OnDestroy { @Input() params: Observable; expansions: {[key: string]: boolean} = {}; + currentItemId: string; private _onDestroy = new Subject(); constructor(public docItems: DocumentationItems, @@ -91,7 +93,7 @@ export class ComponentNav implements OnInit, OnDestroy { startWith(null), switchMap(() => this.params), takeUntil(this._onDestroy) - ).subscribe(p => this.setExpansions(p)); + ).subscribe(params => this.setExpansions(params)); } ngOnDestroy() { @@ -103,14 +105,12 @@ export class ComponentNav implements OnInit, OnDestroy { setExpansions(params: Params) { const categories = this.docItems.getCategories(params.section); for (const category of (categories || [])) { - if (this.expansions[category.id]) { - continue; - } let match = false; for (const item of category.items) { if (this._router.url.indexOf(item.id) > -1) { match = true; + this.currentItemId = item.id; break; } } @@ -167,6 +167,9 @@ const routes: Routes = [ { @NgModule({ imports: [ + MatSidenavModule, + MatListModule, + RouterModule, CommonModule, ComponentCategoryListModule, ComponentHeaderModule, diff --git a/src/app/pages/component-viewer/component-overview.html b/src/app/pages/component-viewer/component-overview.html index b991105db..c9cc55102 100644 --- a/src/app/pages/component-viewer/component-overview.html +++ b/src/app/pages/component-viewer/component-overview.html @@ -1,7 +1,7 @@ - +

Overview for {{docItem?.id}} - +

-