Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit e879c5d

Browse files
committed
Rename "theme-chooser" to "theme-picker"
1 parent b95cd21 commit e879c5d

File tree

14 files changed

+39
-38
lines changed

14 files changed

+39
-38
lines changed

src/app/app-module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
MdNativeDateModule,
1515
MdSidenavModule, MdTabsModule,
1616
MdToolbarModule,
17-
MdTooltipModule,
17+
MdTooltipModule, PortalModule,
1818
} from '@angular/material';
1919
import {ExampleModule} from '@angular/material-examples';
2020

@@ -45,6 +45,7 @@ export const MATERIAL_COMPONENTS_USED = [
4545
MdTabsModule,
4646
MdToolbarModule,
4747
MdTooltipModule,
48+
PortalModule,
4849
];
4950

5051
@NgModule({

src/app/shared/navbar/navbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<a md-button class="docs-button" routerLink="components">Components</a>
1010
<a md-button class="docs-button" routerLink="guides">Guides</a>
1111
<div class="flex-spacer"></div>
12-
<theme-chooser></theme-chooser>
12+
<theme-picker></theme-picker>
1313
<a md-button class="docs-button" href="https://github.com/angular/material2" aria-label="GitHub Repository">
1414
<img class="docs-github-logo"
1515
src="../../../assets/img/homepage/github-circle-white-transparent.svg"

src/app/shared/shared-module.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {NgModule} from '@angular/core';
22
import {HttpModule} from '@angular/http';
3-
import {MaterialModule} from '@angular/material';
43
import {BrowserModule} from '@angular/platform-browser';
54
import {RouterModule} from '@angular/router';
65

@@ -9,22 +8,23 @@ import {DocViewer} from './doc-viewer/doc-viewer';
98
import {DocumentationItems} from './documentation-items/documentation-items';
109
import {PlunkerButton} from './plunker';
1110
import {GuideItems} from './guide-items/guide-items';
12-
import {ThemeStorage} from './theme-chooser/theme-storage/theme-storage';
13-
import {ThemeChooser} from './theme-chooser/theme-chooser';
11+
import {ThemeStorage} from './theme-picker/theme-storage/theme-storage';
12+
import {ThemePicker} from './theme-picker/theme-picker';
1413
import {NavBar} from './navbar/navbar';
1514
import {SvgBuilder} from './svg-viewer/svg-builder';
1615
import {SvgViewer} from './svg-viewer/svg-viewer';
16+
import {DocsMaterialModule} from '../app-module';
1717

1818

1919
@NgModule({
2020
imports: [
2121
HttpModule,
2222
RouterModule,
2323
BrowserModule,
24-
MaterialModule,
24+
DocsMaterialModule,
2525
],
26-
declarations: [DocViewer, ExampleViewer, NavBar, PlunkerButton, ThemeChooser, SvgViewer],
27-
exports: [DocViewer, ExampleViewer, NavBar, PlunkerButton, ThemeChooser, SvgViewer],
26+
declarations: [DocViewer, ExampleViewer, NavBar, PlunkerButton, ThemePicker, SvgViewer],
27+
exports: [DocViewer, ExampleViewer, NavBar, PlunkerButton, ThemePicker, SvgViewer],
2828
providers: [DocumentationItems, GuideItems, ThemeStorage, SvgBuilder],
2929
entryComponents: [
3030
ExampleViewer,

src/app/shared/svg-viewer/svg-builder.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {async, inject, TestBed} from '@angular/core/testing';
33
import {HttpModule} from '@angular/http';
44
import {MaterialModule} from '@angular/material';
55

6-
import {DocsSiteTheme} from '../theme-chooser/theme-storage/theme-storage';
6+
import {DocsSiteTheme} from '../theme-picker/theme-storage/theme-storage';
77
import {SvgBuilder} from './svg-builder';
88

99

src/app/shared/svg-viewer/svg-builder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Injectable} from '@angular/core';
22
import {Http} from '@angular/http';
33

4-
import {DocsSiteTheme} from '../theme-chooser/theme-storage/theme-storage';
4+
import {DocsSiteTheme} from '../theme-picker/theme-storage/theme-storage';
55

66
import * as Color from 'color';
77

src/app/shared/svg-viewer/svg-viewer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Observable} from 'rxjs/Observable';
44
import {Subscription} from 'rxjs/Subscription';
55

66
import {ThemeColors, SvgBuilder} from './svg-builder';
7-
import {ThemeStorage, DocsSiteTheme} from '../theme-chooser/theme-storage/theme-storage';
7+
import {ThemeStorage, DocsSiteTheme} from '../theme-picker/theme-storage/theme-storage';
88

99

1010
@Component({

src/app/shared/theme-chooser/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/app/shared/theme-picker/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './theme-picker';

src/app/shared/theme-chooser/theme-chooser.html renamed to src/app/shared/theme-picker/theme-picker.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
</button>
44

55
<!-- TODO: replace use of `md-menu` here with a custom overlay -->
6-
<md-menu class="docs-theme-chooser-menu" #themeMenu="mdMenu" x-position="before">
6+
<md-menu class="docs-theme-picker-menu" #themeMenu="mdMenu" x-position="before">
77
<md-grid-list cols="2">
88
<md-grid-tile *ngFor="let theme of themes">
99
<div md-menu-item (click)="installTheme(theme.href)">
10-
<div class="docs-theme-chooser-swatch">
10+
<div class="docs-theme-picker-swatch">
1111
<md-icon class="docs-theme-chosen-icon" *ngIf="currentTheme === theme">check_circle</md-icon>
12-
<div class="docs-theme-chooser-primary" [style.background]="theme.primary"></div>
12+
<div class="docs-theme-picker-primary" [style.background]="theme.primary"></div>
1313
</div>
1414
</div>
1515
</md-grid-tile>

src/app/shared/theme-chooser/theme-chooser.scss renamed to src/app/shared/theme-picker/theme-picker.scss

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
$theme-chooser-menu-padding: 8px;
2-
$theme-chooser-grid-cell-size: 48px;
3-
$theme-chooser-grid-cells-per-row: 2;
4-
$theme-chooser-swatch-size: 36px;
5-
$theme-chooser-accent-stripe-size: 6px;
1+
$theme-picker-menu-padding: 8px;
2+
$theme-picker-grid-cell-size: 48px;
3+
$theme-picker-grid-cells-per-row: 2;
4+
$theme-picker-swatch-size: 36px;
5+
$theme-picker-accent-stripe-size: 6px;
66

77

8-
.docs-theme-chooser-menu {
8+
.docs-theme-picker-menu {
99
.md-menu-content {
10-
padding: $theme-chooser-menu-padding;
10+
padding: $theme-picker-menu-padding;
1111
}
1212

1313
[md-menu-item] {
@@ -16,11 +16,11 @@ $theme-chooser-accent-stripe-size: 6px;
1616
overflow: hidden;
1717
}
1818

19-
.docs-theme-chooser-swatch {
19+
.docs-theme-picker-swatch {
2020
position: relative;
21-
width: $theme-chooser-swatch-size;
22-
height: $theme-chooser-swatch-size;
23-
margin: ($theme-chooser-grid-cell-size - $theme-chooser-swatch-size) / 2;
21+
width: $theme-picker-swatch-size;
22+
height: $theme-picker-swatch-size;
23+
margin: ($theme-picker-grid-cell-size - $theme-picker-swatch-size) / 2;
2424
border-radius: 50%;
2525
overflow: hidden;
2626

@@ -44,15 +44,15 @@ $theme-chooser-accent-stripe-size: 6px;
4444
}
4545
}
4646

47-
.docs-theme-chooser-primary {
47+
.docs-theme-picker-primary {
4848
width: 100%;
4949
height: 100%;
5050
}
5151

52-
.docs-theme-chooser-accent {
52+
.docs-theme-picker-accent {
5353
position: absolute;
54-
bottom: $theme-chooser-accent-stripe-size;
54+
bottom: $theme-picker-accent-stripe-size;
5555
width: 100%;
56-
height: $theme-chooser-accent-stripe-size;
56+
height: $theme-picker-accent-stripe-size;
5757
}
5858
}

0 commit comments

Comments
 (0)