Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit e243fea

Browse files
committed
style(demo-app): Use minified js, minor adjustments to toolbar and typography demo
1 parent 02424d2 commit e243fea

File tree

4 files changed

+9
-18
lines changed

4 files changed

+9
-18
lines changed

config/webpack/webpack.dev.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ module.exports = [{
4141
}]
4242
},
4343
plugins: [
44-
new webpack.LoaderOptionsPlugin({
45-
minimize: true,
46-
debug: false
47-
}),
4844
new webpack.LoaderOptionsPlugin({
4945
options: {
5046
postcss: function() {
@@ -59,9 +55,6 @@ module.exports = [{
5955
output: {
6056
path: OUT_PATH,
6157
filename: '[name].bundle.js'
62-
// filename: '[name].[chunkhash].bundle.js',
63-
// sourceMapFilename: '[name].[chunkhash].bundle.js.map',
64-
// chunkFilename: '[name].chunk.[chunkhash].js',
6558
},
6659
entry: {
6760
'polyfills': './src/demo-app/polyfills.ts',
@@ -76,7 +69,7 @@ module.exports = [{
7669
rules: [{
7770
test: /\.ts$/,
7871
use: [{
79-
loader: 'babel-loader?presets[]=es2015',
72+
loader: 'babel-loader?presets[]=env',
8073
}, {
8174
loader: 'awesome-typescript-loader',
8275
options: {
@@ -92,7 +85,7 @@ module.exports = [{
9285
"use": [{
9386
"loader": 'babel-loader',
9487
"options": {
95-
"presets": ['es2015'],
88+
"presets": ['env'],
9689
},
9790
}, ],
9891
"exclude": [
@@ -115,10 +108,6 @@ module.exports = [{
115108
}]
116109
},
117110
plugins: [
118-
new webpack.LoaderOptionsPlugin({
119-
//minimize: true, do not minimize for any loader - this will result in weird, unpredictable behavior
120-
debug: false
121-
}),
122111
// Workaround for angular/angular#1158
123112
new webpack.ContextReplacementPlugin(
124113
/angular(\\|\/)core(\\|\/)@angular/,

src/demo-app/app/components/toolbar-demo/toolbar-demo.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h1 mdc-typography-headline>Examples</h1>
6767
<mdc-toolbar [flexible]="false" [fixed]="false" [waterfall]="false" [fixedLastrow]="false" [flexibleTitle]="true">
6868
<mdc-toolbar-row>
6969
<mdc-toolbar-section [alignStart]="true">
70-
<a class="material-icons">menu</a>
70+
<a href="#" class="material-icons" aria-label="menu">menu</a>
7171
<span mdc-toolbar-title>Title</span>
7272
</mdc-toolbar-section>
7373
<mdc-toolbar-section [alignEnd]="true">
@@ -86,7 +86,7 @@ <h1 mdc-typography-headline>Examples</h1>
8686
[flexibleTitle]="true"&gt;
8787
&lt;mdc-toolbar-row&gt;
8888
&lt;mdc-toolbar-section [alignStart]="true"&gt;
89-
&lt;a class="material-icons"&gt;menu&lt;/a&gt;
89+
&lt;a href="#" class="material-icons" aria-label="menu"&gt;menu&lt;/a&gt;
9090
&lt;span mdc-toolbar-title&gt;Title&lt;/span&gt;
9191
&lt;/mdc-toolbar-section&gt;
9292
&lt;mdc-toolbar-section [alignEnd]="true"&gt;

src/demo-app/app/components/typography-demo/typography-demo.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ <h1 mdc-typography-headline>Usage</h1>
88
</div>
99
<h1 mdc-typography-headline>Examples</h1>
1010
<div fxLayout="column">
11-
<h2 mdc-typography-display4 mdc-typography-adjust-margin>Display 4 with adjust margins</h2>
11+
<h3 mdc-typography-title mdc-typography-adjust-margin>Text with adjust margins directive</h3>
12+
<h4 mdc-typography-caption mdc-typography-adjust-margin>Sample text showing the aligned margin</h4>
1213
<span>If you include the mdc-typography-adjust-margin directive, positioning will be adjusted according to the style.</span>
1314
<pre class="prettyprint">
14-
&lt;h2 mdc-typography-display4 mdc-typography-adjust-margin&gt;Adjust margins of text&lt;/h2&gt;
15+
&lt;h3 mdc-typography-title mdc-typography-adjust-margin&gt;Text with adjust margins directive&lt;/h3&gt;
16+
&lt;h4 mdc-typography-caption mdc-typography-adjust-margin&gt;Sample text showing the aligned margins&lt;/h4&gt;
1517
</pre>
1618
</div>
1719
<div fxLayout="column">

src/demo-app/root.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { enableProdMode } from '@angular/core';
22
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
33
import { AppModule } from './app/app.module';
4-
import './../../dist/bundle/core.js';
4+
import './../../dist/bundle/core.min.js';
55

66
enableProdMode();
77

0 commit comments

Comments
 (0)