Skip to content

Commit e00b347

Browse files
niklas-wortmannJan-Niklas Wortmannbenlesh
authored
Preparation v7 Docs (#6270)
* chore(docs): link to change list document * chore(docs): make blm page standalone and promote rxjs v7 * docs: minor correction. * docs: slight grammar correction * docs: sound more stern about CoC Co-authored-by: Jan-Niklas Wortmann <[email protected]> Co-authored-by: Ben Lesh <[email protected]>
1 parent 917fef7 commit e00b347

File tree

8 files changed

+335
-104
lines changed

8 files changed

+335
-104
lines changed

docs_app/content/blackLivesMatter.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<style>
2+
.blm-background {
3+
background-color: black;
4+
color: white;
5+
display: flex;
6+
min-height: calc(100vh + 64px);
7+
margin: -20px -50px;
8+
}
9+
10+
.text-container.blm-container {
11+
text-align: center;
12+
line-height: inherit;
13+
max-width: inherit;
14+
}
15+
16+
.blm-text {
17+
font-size: 2rem;
18+
line-height: inherit
19+
}
20+
21+
.blm-list-item {
22+
margin: 10px 0
23+
}
24+
</style>
25+
26+
<article class="blm-background">
27+
<div layout="row" layout-xs="column" class="home-row homepage-container">
28+
<div class="text-container blm-container">
29+
<h1 class="no-anchor no-toc" style="font-size: 3rem; line-height: inherit">BLACK LIVES MATTER</h1>
30+
<p class="blm-text">
31+
We stand in solidarity with the Black Lives Matter movement. We believe that technologists must not be silent in the fight to end racial inequality. </p>
32+
<p class="blm-text">
33+
We ask you to stand with us and help educate your team members and those in your network on how to help dismantle a system that oppresses Black people. Find a list of starting resources here:
34+
<ul style="list-style-type: none; line-height: inherit; padding-inline-start: 0">
35+
<li class="blm-list-item"><a class="blm-text" href="https://www.youtube.com/watch?v=-aCn72iXO9s">Let's get to the root of racial injustice by Megan Ming Francis</a></li>
36+
<li class="blm-list-item"><a class="blm-text" href="http://www.changecadet.com/blog/2020/5/30/what-leaders-can-do-for-black-employees">What Leaders can do for Black Employees by Dr. Akilah Cadet</a></li>
37+
<li class="blm-list-item"><a class="blm-text" href="https://blacktechpipeline.substack.com/p/hey-employers-do-black-lives-matter">Hey Employers: Do Black Lives Matter? by Pariss Athena</a></li>
38+
<li class="blm-list-item"><a class="blm-text" href="https://safiyaunoble.com/">Algorithms of Oppression by Safiya Umoja Noble</a></li>
39+
<li class="blm-list-item"><a class="blm-text" href="https://www.rageinsidethemachine.com/">Rage Inside The Machine by Robert Smith</a></li>
40+
<li class="blm-list-item"><a class="blm-text" href="https://www.sarawb.com/">Technically Wrong by Sara Wachter-Boettcher</a></li>
41+
</ul>
42+
</p>
43+
<p class="blm-text">
44+
In solidarity, we ask you to consider financially supporting efforts such as <a class="blm-text" href="https://secure.actblue.com/donate/ms_blm_homepage_2019">Black Lives Matter</a>,
45+
<a class="blm-text" href="https://support.eji.org/give/153413/#!/donation/checkout">The Equal Justice Initiative</a> or local charity organizations.
46+
</p>
47+
</div>
48+
</div>
49+
</article>

docs_app/content/marketing/index.html

Lines changed: 72 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,78 @@
1+
<!-- FULL HEADER BLOCK -->
2+
<header>
3+
4+
<!-- BACKGROUND IMAGE -->
5+
<div class="hero"></div>
6+
7+
<!-- INTRO SECTION -->
8+
<section id="intro">
9+
10+
<!-- LOGO -->
11+
<div class="hero-logo">
12+
<img src="generated/images/marketing/home/Rx_Logo-512-512.png" alt="RxJS logo"/>
13+
</div>
14+
15+
<!-- CONTAINER -->
16+
<div class="homepage-container">
17+
<div class="headline-container">
18+
<h2 class="hero-headline no-toc">RxJS</h2>
19+
<span class="hero-subheadline">Reactive Extensions Library for JavaScript</span>
20+
</div>
21+
<a class="button hero-cta" href="/guide/overview">Get Started</a>
22+
<a class="button hero-cta" href="/api">API Docs</a>
23+
</div>
24+
25+
</section>
26+
27+
</header>
28+
129
<!-- MAIN CONTENT -->
2-
<article class="blm-background">
30+
<article>
331

4-
<div layout="row" layout-xs="column" class="home-row homepage-container">
5-
<div class="text-container blm-container">
6-
<h1 class="no-anchor no-toc" style="font-size: 3rem; line-height: inherit">BLACK LIVES MATTER</h1>
7-
<p class="blm-text">
8-
We stand in solidarity with the Black Lives Matter movement. We believe that technologists must not be silent in the fight to end racial inequality. </p>
9-
<p class="blm-text">
10-
We ask you to stand with us and help educate your team members and those in your network on how to help dismantle a system that oppresses Black people. Find a list of starting resources here:
11-
<ul style="list-style-type: none; line-height: inherit; padding-inline-start: 0">
12-
<li class="blm-list-item"><a class="blm-text" href="https://www.youtube.com/watch?v=-aCn72iXO9s">Let's get to the root of racial injustice by Megan Ming Francis</a></li>
13-
<li class="blm-list-item"><a class="blm-text" href="http://www.changecadet.com/blog/2020/5/30/what-leaders-can-do-for-black-employees">What Leaders can do for Black Employees by Dr. Akilah Cadet</a></li>
14-
<li class="blm-list-item"><a class="blm-text" href="https://blacktechpipeline.substack.com/p/hey-employers-do-black-lives-matter">Hey Employers: Do Black Lives Matter? by Pariss Athena</a></li>
15-
<li class="blm-list-item"><a class="blm-text" href="https://safiyaunoble.com/">Algorithms of Oppression by Safiya Umoja Noble</a></li>
16-
<li class="blm-list-item"><a class="blm-text" href="https://www.rageinsidethemachine.com/">Rage Inside The Machine by Robert Smith</a></li>
17-
<li class="blm-list-item"><a class="blm-text" href="https://www.sarawb.com/">Technically Wrong by Sara Wachter-Boettcher</a></li>
32+
<h1 class="no-anchor no-toc" style="display: none"></h1>
33+
34+
<div class="home-rows">
35+
36+
<aio-announcement-bar></aio-announcement-bar>
37+
<div layout="row" class="home-row homepage-container">
38+
<div class="card">
39+
<div class="promo-1-desc l-pad-top-2">
40+
<div class="text-headline">Version 7 released!</div>
41+
<p>here are a some of the benefits of running on the latest version</p>
42+
<ul>
43+
<li>~50% smaller</li>
44+
<li>improved typings</li>
45+
<li>more consistent APIs</li>
46+
<li>and much more...</li>
1847
</ul>
19-
</p>
20-
<p class="blm-text">
21-
In solidarity, we ask you to consider financially supporting efforts such as <a class="blm-text" href="https://secure.actblue.com/donate/ms_blm_homepage_2019">Black Lives Matter</a>,
22-
<a class="blm-text" href="https://support.eji.org/give/153413/#!/donation/checkout">The Equal Justice Initiative</a> or local charity organizations.
23-
</p>
48+
</div>
49+
</div>
50+
</div>
51+
52+
53+
<div layout="row" layout-xs="column" class="home-row homepage-container">
54+
55+
<div class="text-container">
56+
<div class="text-block promo-1-desc l-pad-top-2">
57+
<div class="text-headline">Reactive Extensions Library for JavaScript</div>
58+
<p class="text-body">
59+
RxJS is a library for reactive programming using Observables, to make it easier to compose asynchronous or callback-based code. This project is a rewrite of Reactive-Extensions/RxJS with better performance, better modularity, better debuggable call stacks, while staying mostly backwards compatible, with some breaking changes that reduce the API surface
60+
</p>
61+
</div>
2462
</div>
2563
</div>
64+
<hr>
65+
<div layout="row" layout-xs="column" class="home-row homepage-container">
66+
<div layout="row" layout-xs="column" class="home-row">
67+
<a href="code-of-conduct">
68+
<div class="card">
69+
<div class="card-text-container">
70+
<p>When participating in our community, you must follow our</p>
71+
<div class="text-headline">Code of Conduct</div>
72+
</div>
73+
</div>
74+
</a>
75+
</div>
76+
</div><!-- end of home rows -->
77+
2678
</article>

docs_app/content/navigation.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@
9999
}
100100
]
101101
},
102+
{
103+
"url": "6-to-7-change-summary",
104+
"title": "Detailed Change List",
105+
"tooltip": "Detailed Change List"
106+
},
102107
{
103108
"url": "code-of-conduct",
104109
"title": "Code of Conduct",

docs_app/src/app/app.component.html

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,54 @@
77
<mat-toolbar color="primary" class="app-toolbar no-print" [class.transitioning]="isTransitioning">
88
<mat-toolbar-row class="notification-container">
99
<aio-notification
10-
notificationId="angular-v6-announcement"
11-
expirationDate="2018-07-01"
12-
[dismissOnContentClick]="true"
13-
(dismissed)="notificationDismissed()">
14-
<a href="https://blog.angular.io/version-6-0-0-of-angular-now-available-cc56b0efa7a4">
15-
<mat-icon class="icon" svgIcon="insert_comment" aria-label="Announcement"></mat-icon>
16-
<span class="message">Version 6 of Angular Now Available!</span>
17-
<span class="action-button">Learn More</span>
18-
</a>
10+
notificationId="blm-2020"
11+
expirationDate="2022-04-15"
12+
[dismissOnContentClick]="false"
13+
(dismissed)="notificationDismissed()"
14+
>
15+
<a href="/blackLivesMatter">#BlackLivesMatter</a>
1916
</aio-notification>
2017
</mat-toolbar-row>
2118
<mat-toolbar-row>
2219
<button mat-button class="hamburger" [class.starting]="isStarting" (click)="sidenav.toggle()" title="Docs menu">
2320
<mat-icon svgIcon="menu"></mat-icon>
2421
</button>
2522
<a class="nav-link home" href="/" [ngSwitch]="isSideBySide">
26-
<img *ngSwitchCase="true" src="assets/images/logos/logo.png" width="150" height="40" title="Home" alt="Home">
27-
<img *ngSwitchDefault src="assets/images/logos/Rx_Logo_S.png" width="37" height="40" title="Home" alt="Home">
23+
<img *ngSwitchCase="true" src="assets/images/logos/logo.png" width="150" height="40" title="Home" alt="Home" />
24+
<img *ngSwitchDefault src="assets/images/logos/Rx_Logo_S.png" width="37" height="40" title="Home" alt="Home" />
2825
</a>
2926
<aio-top-menu *ngIf="isSideBySide" [nodes]="topMenuNodes"></aio-top-menu>
3027
<aio-search-box class="search-container" #searchBox (onSearch)="doSearch($event)" (onFocus)="doSearch($event)"></aio-search-box>
3128
<div class="toolbar-external-icons-container">
3229
<a href="https://github.com/ReactiveX/rxjs" title="GitHub" target="_blank">
33-
<img src="assets/images/logos/github-icon.svg" alt="View on GitHub"></a>
30+
<img src="assets/images/logos/github-icon.svg" alt="View on GitHub"
31+
/></a>
3432
</div>
3533
</mat-toolbar-row>
3634
</mat-toolbar>
3735

38-
<aio-search-results #searchResultsView *ngIf="showSearchResults" [searchResults]="searchResults | async" (resultSelected)="hideSearchResults()"></aio-search-results>
36+
<aio-search-results
37+
#searchResultsView
38+
*ngIf="showSearchResults"
39+
[searchResults]="searchResults | async"
40+
(resultSelected)="hideSearchResults()"
41+
></aio-search-results>
3942

4043
<mat-sidenav-container class="sidenav-container" [class.starting]="isStarting" [class.has-floating-toc]="hasFloatingToc">
41-
42-
<mat-sidenav [ngClass]="{'collapsed': !isSideBySide}" #sidenav class="sidenav" [mode]="mode" [opened]="isOpened" (openedChange)="updateHostClasses()">
43-
<aio-nav-menu *ngIf="!isSideBySide" [nodes]="topMenuNarrowNodes" [currentNode]="currentNodes?.TopBarNarrow" [isWide]="false"></aio-nav-menu>
44+
<mat-sidenav
45+
[ngClass]="{ collapsed: !isSideBySide }"
46+
#sidenav
47+
class="sidenav"
48+
[mode]="mode"
49+
[opened]="isOpened"
50+
(openedChange)="updateHostClasses()"
51+
>
52+
<aio-nav-menu
53+
*ngIf="!isSideBySide"
54+
[nodes]="topMenuNarrowNodes"
55+
[currentNode]="currentNodes?.TopBarNarrow"
56+
[isWide]="false"
57+
></aio-nav-menu>
4458
<aio-nav-menu [nodes]="sideNavNodes" [currentNode]="currentNodes?.SideNav" [isWide]="isSideBySide"></aio-nav-menu>
4559

4660
<div class="doc-version">
@@ -50,18 +64,23 @@
5064

5165
<section class="sidenav-content" [id]="pageId" role="main">
5266
<aio-mode-banner [mode]="deployment.mode" [version]="versionInfo"></aio-mode-banner>
53-
<aio-doc-viewer [class.no-animations]="isStarting"
54-
[doc]="currentDocument"
55-
(docReady)="onDocReady()"
56-
(docRemoved)="onDocRemoved()"
57-
(docInserted)="onDocInserted()"
58-
(docRendered)="onDocRendered()">
67+
<aio-doc-viewer
68+
[class.no-animations]="isStarting"
69+
[doc]="currentDocument"
70+
(docReady)="onDocReady()"
71+
(docRemoved)="onDocRemoved()"
72+
(docInserted)="onDocInserted()"
73+
(docRendered)="onDocRendered()"
74+
>
5975
</aio-doc-viewer>
6076
<aio-dt *ngIf="dtOn" [(doc)]="currentDocument"></aio-dt>
6177
</section>
62-
6378
</mat-sidenav-container>
6479

6580
<div *ngIf="hasFloatingToc" class="toc-container no-print" [style.max-height.px]="tocMaxHeight" (mousewheel)="restrainScrolling($event)">
6681
<aio-lazy-ce selector="aio-toc"></aio-lazy-ce>
67-
</div>
82+
</div>
83+
84+
<footer class="no-print">
85+
<aio-footer [nodes]="footerNodes" [versionInfo]="versionInfo"></aio-footer>
86+
</footer>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<p>
2+
Code licensed under an <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0 License</a>. Documentation licensed under
3+
<a href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
4+
</p>
5+
<p>Version {{ versionInfo?.full }}.</p>
6+
<!-- TODO: twitter widget (but only on pages that use twitter) -->
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
footer {
2+
position: relative;
3+
line-height: 24px;
4+
flex: 1;
5+
padding: 48px;
6+
z-index: 0;
7+
background-color: $pink;
8+
color: $offwhite;
9+
font-weight: 300;
10+
11+
aio-footer {
12+
position: relative;
13+
z-index: 0;
14+
}
15+
16+
.footer-block {
17+
margin: 0 24px;
18+
vertical-align: top;
19+
}
20+
21+
a {
22+
color: $offwhite;
23+
font-weight: 300;
24+
text-decoration: none;
25+
z-index: 20;
26+
position: relative;
27+
&:hover {
28+
text-decoration: underline;
29+
}
30+
&:visited {
31+
text-decoration: none;
32+
}
33+
}
34+
a.action {
35+
cursor: pointer;
36+
}
37+
h3 {
38+
font-size: 16px;
39+
text-transform: uppercase;
40+
font-weight: 400;
41+
margin: 0 0 16px;
42+
}
43+
p {
44+
text-align: center;
45+
margin: 10px 0px 5px;
46+
47+
@media (max-width: 480px) {
48+
text-align: left;
49+
}
50+
}
51+
52+
div.grid-fluid {
53+
display: -ms-flexbox;
54+
display: -webkit-flex;
55+
display: flex;
56+
57+
justify-content: center;
58+
59+
text-align: left;
60+
margin: 0 0 40px;
61+
62+
ul {
63+
list-style-position: inside;
64+
padding: 0px;
65+
margin: 0px;
66+
67+
li {
68+
list-style-type: none;
69+
padding: 0px;
70+
text-align: left;
71+
}
72+
}
73+
74+
@media (max-width: 480px) {
75+
flex-direction: column;
76+
.footer-block {
77+
margin: 8px 24px;
78+
}
79+
}
80+
}
81+
82+
@media (max-width: 700px) {
83+
h3 {
84+
font-size: 110%;
85+
}
86+
}
87+
@media (max-width: 600px) {
88+
h3 {
89+
font-size: 100%;
90+
}
91+
}
92+
}
93+
94+
footer::after {
95+
content: '';
96+
position: absolute;
97+
z-index: -1;
98+
top: 0;
99+
bottom: 0;
100+
left: 0;
101+
right: 0;
102+
background-size: 320px auto;
103+
}

0 commit comments

Comments
 (0)