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

Commit 5bc28e2

Browse files
btronconebtroncone
committed
styling and formatting updates
1 parent a43f86d commit 5bc28e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+189
-157
lines changed

‎src/app/operators/components/operator/operator.component.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66
</app-operator-header>
77
<section class="main-operator-container mat-typography">
88
<h3 class="short-description" [innerHTML]="shortDescription"></h3>
9-
<h2> Examples </h2>
9+
<img class="marble-diagram mat-elevation-z2" [src]="marbleUrl" *ngIf="marbleUrl"/>
10+
<h2 class="examples-header"> Examples </h2>
1011
<div
1112
class="code-example"
1213
*ngFor="let example of examples"
1314
appHighlightJs>
14-
<h3> {{ example.name }} </h3>
15-
<pre [innerHTML]="example.code"></pre>
15+
<h3 [innerHTML]="example.name"></h3>
16+
<pre [innerHTML]="example.code" class="mat-elevation-z2"></pre>
1617
</div>
17-
<h2> Related Operators </h2>
18+
<h2 class="related-operators"> Related Operators </h2>
1819
<ul class="related-list">
1920
<li *ngFor="let related of relatedOperators">
2021
<a [href]="'/operators#' + related"> {{ related }} </a>

‎src/app/operators/components/operator/operator.component.scss‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.main-operator-container {
22
padding: 5px;
3-
height: 1000px;
3+
// height: 1000px;
44
display: flex;
55
flex-direction: column;
66
padding: 0 16px;
@@ -17,6 +17,20 @@
1717
padding-bottom: 0;
1818
}
1919
}
20+
}
21+
22+
.short-description {
23+
margin: 16px 0 32px;
24+
}
2025

26+
.related-operators {
27+
margin-top: 16px;
28+
}
29+
30+
.examples-header {
31+
margin: 32px 0 16px;
32+
}
2133

34+
.marble-diagram {
35+
max-width: 100%;
2236
}

‎src/app/operators/components/operator/operator.component.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ export class OperatorComponent {
1717
return this.operator.signature || 'Signature Placeholder';
1818
}
1919

20+
get marbleUrl() {
21+
return this.operator.marbleUrl;
22+
}
23+
2024
get shortDescription() {
2125
return this.operator.shortDescription;
2226
}

‎src/app/operators/operators.module.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import {
66
MatListModule,
77
MatToolbarModule,
88
MatExpansionModule,
9-
MatCardModule
9+
MatCardModule,
10+
MatInputModule
1011
} from '@angular/material';
1112
import { RouterModule } from '@angular/router';
1213

@@ -39,7 +40,8 @@ const OPERATOR_ROUTES = [
3940
MatIconModule,
4041
MatListModule,
4142
MatToolbarModule,
42-
MatCardModule
43+
MatCardModule,
44+
MatInputModule
4345
]
4446
})
4547
export class OperatorsModule { }

‎src/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<link rel="icon" type="image/x-icon" href="favicon.ico">
1111
<link rel="manifest" href="manifest.json">
1212
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
13-
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,600,700" rel="stylesheet">
13+
<link href="https://fonts.googleapis.com/css?family=Roboto|Roboto+Mono:300,400,500,600,700" rel="stylesheet">
1414
<link href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.5.0/styles/github-gist.min.css" rel="stylesheet">
1515
</head>
1616
<body>

‎src/operator-docs/combination/combineAll.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { OperatorDoc } from '../operator.model';
22

33
export const combineAll: OperatorDoc = {
4-
"name": "combineAll",
5-
"operatorType": "combination",
6-
"signature": "public combineAll(project: function): Observable",
7-
"shortDescription": "Flattens an Observable-of-Observables by applying <a href='/operators#combineLatest'>combineLatest</a> when the Observable-of-Observables completes.",
8-
"examples": [
4+
'name': 'combineAll',
5+
'operatorType': 'combination',
6+
'signature': 'public combineAll(project: function): Observable',
7+
'marbleUrl': 'http://reactivex.io/rxjs/img/combineAll.png',
8+
'shortDescription': 'Flattens an Observable-of-Observables by applying <a href="/operators#combineLatest" class="markdown-code">combineLatest</a> when the Observable-of-Observables completes.',
9+
'examples': [
910
{
10-
name: "Map two click events to a finite interval Observable, then apply combineAll",
11+
name: 'Map two click events to a finite interval Observable, then apply <span class="markdown-code">combineAll</span>',
1112
code: `
1213
const clicks = Rx.Observable.fromEvent(document, 'click');
1314
const higherOrder = clicks.map(ev =>
@@ -21,5 +22,5 @@ export const combineAll: OperatorDoc = {
2122
]
2223
}
2324
],
24-
"relatedOperators": [ "combineLatest", "mergeAll" ]
25+
'relatedOperators': [ 'combineLatest', 'mergeAll' ]
2526
};

‎src/operator-docs/combination/combineLatest.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { OperatorDoc } from '../operator.model';
22

33
export const combineLatest: OperatorDoc = {
4-
"name": "combineLatest",
5-
"operatorType": "combination"
4+
'name': 'combineLatest',
5+
'operatorType': 'combination'
66
};

‎src/operator-docs/combination/concat.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { OperatorDoc } from '../operator.model';
22

33
export const concat: OperatorDoc = {
4-
"name": "concat",
5-
"operatorType": "combination"
4+
'name': 'concat',
5+
'operatorType': 'combination'
66
};

‎src/operator-docs/combination/concatAll.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { OperatorDoc } from '../operator.model';
22

33
export const concatAll: OperatorDoc = {
4-
"name": "concatAll",
5-
"operatorType": "combination"
4+
'name': 'concatAll',
5+
'operatorType': 'combination'
66
};

‎src/operator-docs/combination/forkJoin.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { OperatorDoc } from '../operator.model';
22

33
export const forkJoin: OperatorDoc = {
4-
"name": "forkJoin",
5-
"operatorType": "combination"
4+
'name': 'forkJoin',
5+
'operatorType': 'combination'
66
};

0 commit comments

Comments
 (0)