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

Commit f6551f8

Browse files
devversionandrewseguin
authored andcommitted
fix(): code elements exceeding page (#95)
* Fixes an issue where the code examples (`pre` elements) exceed the page boundaries and show extra scroll-space on mobile. * Removes not-working pre-render scripts * Removes unused dependencies and also bump for latest Angular 2.X (not 4.x-beta) * Changes margin on mobile for guides. Those look weird on mobile.
1 parent 4e479f8 commit f6551f8

File tree

8 files changed

+1490
-4296
lines changed

8 files changed

+1490
-4296
lines changed

package.json

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,52 +9,43 @@
99
"test": "ng test",
1010
"pree2e": "webdriver-manager update",
1111
"e2e": "protractor",
12-
"prerender": "node tools/prerenderer/get-all-urls.js && protractor config/protractor-prerender.conf.js",
13-
"prerender:serve": "node tools/prerenderer/serve.js",
1412
"prod-build": "ng build --aot --prod && npm run prerender && cp -r tmp/prerendered/* dist/",
1513
"postinstall": "webdriver-manager update",
1614
"publish-prod": "ng build --aot --prod && firebase use material-angular-io && firebase deploy",
1715
"publish-dev": "ng build --aot --prod && firebase use material2-docs-dev && firebase deploy"
1816
},
1917
"private": true,
2018
"dependencies": {
21-
"@angular/common": "^2.4.1",
22-
"@angular/compiler": "^2.4.1",
23-
"@angular/core": "^2.4.1",
24-
"@angular/forms": "^2.4.1",
25-
"@angular/http": "^2.4.1",
26-
"@angular/material": "angular/material2-builds",
27-
"@angular/platform-browser": "^2.4.1",
28-
"@angular/platform-browser-dynamic": "^2.4.1",
29-
"@angular/router": "~3.2.3",
19+
"@angular/common": "^2.4.6",
20+
"@angular/compiler": "^2.4.6",
21+
"@angular/core": "^2.4.6",
22+
"@angular/forms": "^2.4.6",
23+
"@angular/http": "^2.4.6",
24+
"@angular/material": "^2.0.0-beta.1",
25+
"@angular/platform-browser": "^2.4.6",
26+
"@angular/platform-browser-dynamic": "^2.4.6",
27+
"@angular/router": "~3.4.6",
3028
"core-js": "^2.4.1",
31-
"fs-extra": "^1.0.0",
32-
"hapi": "^15.2.0",
33-
"inert": "^4.0.2",
34-
"rxjs": "^5.0.1",
35-
"ts-helpers": "^1.1.1",
36-
"zone.js": "^0.7.4"
29+
"rxjs": "^5.1.0",
30+
"zone.js": "^0.7.6"
3731
},
3832
"devDependencies": {
39-
"@angular/compiler-cli": "^2.4.1",
40-
"@types/jasmine": "^2.2.30",
41-
"@types/node": "^6.0.42",
42-
"angular-cli": "1.0.0-beta.24",
43-
"codelyzer": "1.0.0-beta.1",
33+
"@angular/cli": "^1.0.0-beta.30",
34+
"@angular/compiler-cli": "^2.4.6",
35+
"@types/jasmine": "^2.5.41",
36+
"@types/node": "^7.0.5",
4437
"highlight.js": "^9.9.0",
4538
"jasmine-core": "2.4.1",
4639
"jasmine-spec-reporter": "2.5.0",
4740
"karma": "1.2.0",
48-
"karma-browserstack-launcher": "^1.1.1",
41+
"karma-browserstack-launcher": "^1.2.0",
4942
"karma-chrome-launcher": "^2.0.0",
50-
"karma-cli": "^1.0.1",
51-
"karma-jasmine": "^1.0.2",
43+
"karma-jasmine": "^1.1.0",
5244
"karma-remap-istanbul": "^0.2.1",
5345
"karma-sauce-launcher": "^1.1.0",
54-
"protractor": "4.0.9",
55-
"ts-node": "1.2.1",
56-
"tslint": "3.13.0",
57-
"typescript": "~2.0.10",
58-
"webdriver-manager": "10.2.5"
46+
"protractor": "^5.1.1",
47+
"ts-node": "^2.0.0",
48+
"tslint": "^4.4.2",
49+
"typescript": "~2.0.10"
5950
}
6051
}

protractor-prerender.conf.js

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
@import "~@angular/material/core/style/variables";
2+
3+
/* For desktop, the content should be aligned with the page title. */
4+
$guide-content-margin-side: 70px;
5+
$guide-content-margin-side-xs: 15px;
6+
17
:host {
28
display: flex;
39
flex-direction: column;
@@ -6,6 +12,11 @@
612

713
.docs-guide-content {
814
display: block;
9-
margin: 20px 0 0 70px;
15+
margin: 20px $guide-content-margin-side 0;
1016
flex-grow: 1;
11-
}
17+
18+
@media ($md-xsmall) {
19+
margin-left: $guide-content-margin-side-xs;
20+
margin-right: $guide-content-margin-side-xs;
21+
}
22+
}

src/main.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ h1, h2 {
2929
weight: 400;
3030
}
3131

32+
pre {
33+
// Pre elements won't wrap text by default and can exceed the boundaries of their parent element.
34+
// This adds extra scroll space when visiting the docs mobile. Pre-wrapping the code examples
35+
// will ensure that the code never exceeds the page width.
36+
white-space: pre-wrap;
37+
}
38+
3239
.docs-primary-header {
3340
padding-left: 20px;
3441

tools/prerenderer/README.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

tools/prerenderer/get-all-urls.js

Lines changed: 0 additions & 80 deletions
This file was deleted.

tools/prerenderer/serve.js

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)