From 7be67fa90f2f328906c3c0b8c8a3ee73d6b3941c Mon Sep 17 00:00:00 2001 From: Jan-Niklas W <6104311+niklas-wortmann@users.noreply.github.com> Date: Mon, 26 Apr 2021 12:22:08 -0500 Subject: [PATCH] Version 7 (#5912) * docs(release): prepare docs for version 7 release * docs(index): support blm movement Co-authored-by: Jan-Niklas Wortmann Co-authored-by: Jan-Niklas Wortmann <6104311+JWO719@users.noreply.github.com> --- docs_app/.firebaserc | 4 +- docs_app/content/marketing/index.html | 84 ++++--------- docs_app/content/navigation.json | 6 +- docs_app/firebase.json | 2 +- docs_app/src/app/app.component.html | 7 +- .../app/layout/footer/footer.component.html | 10 -- docs_app/src/styles/1-layouts/_footer.scss | 110 ------------------ .../styles/1-layouts/_marketing-layout.scss | 22 ++++ docs_app/src/styles/1-layouts/_top-menu.scss | 5 +- 9 files changed, 55 insertions(+), 195 deletions(-) diff --git a/docs_app/.firebaserc b/docs_app/.firebaserc index 2103ee2be4..20d36e6eae 100644 --- a/docs_app/.firebaserc +++ b/docs_app/.firebaserc @@ -2,8 +2,8 @@ "targets": { "rxjs-dev": { "hosting": { - "next": [ - "next-rxjs" + "stable": [ + "rxjs-dev" ] } } diff --git a/docs_app/content/marketing/index.html b/docs_app/content/marketing/index.html index 339becb967..b111391559 100644 --- a/docs_app/content/marketing/index.html +++ b/docs_app/content/marketing/index.html @@ -1,64 +1,26 @@ - -
- - -
- - -
- - - - - -
-
-

RxJS

- Reactive Extensions Library for JavaScript -
- Get Started - API Docs -
- -
- -
- -
- -

- -
- - - - -
- -
-
-
Reactive Extensions Library for JavaScript
-

- 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 -

-
-
+
+ +
+
+

BLACK LIVES MATTER

+

+ 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.

+

+ 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: +

+

+

+ In solidarity, we ask you to consider financially supporting efforts such as Black Lives Matter, + The Equal Justice Initiative or local charity organizations. +

-
-
-
- -
-
-

Please pay attention to our

-
Code of Conduct
-
-
- -
-
- +
diff --git a/docs_app/content/navigation.json b/docs_app/content/navigation.json index 4acf5dd5bf..310b57c94f 100644 --- a/docs_app/content/navigation.json +++ b/docs_app/content/navigation.json @@ -103,12 +103,12 @@ ], "docVersions": [ { - "title": "v7", - "url": "https://next-rxjs.web.app/" + "title": "stable", + "url": "https://rxjs.dev/" }, { "title": "v6", - "url": "https://rxjs.dev/" + "url": "https://v6.rxjs.dev/" } ] } diff --git a/docs_app/firebase.json b/docs_app/firebase.json index db28107b05..701d3b98b1 100644 --- a/docs_app/firebase.json +++ b/docs_app/firebase.json @@ -4,7 +4,7 @@ }, "hosting": { "public": "dist", - "target": "next", + "target": "stable", "cleanUrls": true, "redirects": [ ////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/docs_app/src/app/app.component.html b/docs_app/src/app/app.component.html index 71603e672d..a0287dee85 100644 --- a/docs_app/src/app/app.component.html +++ b/docs_app/src/app/app.component.html @@ -64,9 +64,4 @@
-
- -
- -
- +
\ No newline at end of file diff --git a/docs_app/src/app/layout/footer/footer.component.html b/docs_app/src/app/layout/footer/footer.component.html index 2e0cfcc26e..e69de29bb2 100644 --- a/docs_app/src/app/layout/footer/footer.component.html +++ b/docs_app/src/app/layout/footer/footer.component.html @@ -1,10 +0,0 @@ - -

- Code licensed under an Apache-2.0 License. - Documentation licensed under - CC BY 4.0. -

-

- Version {{versionInfo?.full}}. -

- diff --git a/docs_app/src/styles/1-layouts/_footer.scss b/docs_app/src/styles/1-layouts/_footer.scss index 4209a584fc..e69de29bb2 100644 --- a/docs_app/src/styles/1-layouts/_footer.scss +++ b/docs_app/src/styles/1-layouts/_footer.scss @@ -1,110 +0,0 @@ -footer { - position: relative; - line-height: 24px; - flex: 1; - padding: 48px; - z-index: 0; - background-color: $pink; - color: $offwhite; - font-weight: 300; - - aio-footer { - position: relative; - z-index: 0; - } - - .footer-block { - margin: 0 24px; - vertical-align: top; - } - - a { - color: $offwhite; - font-weight: 300; - text-decoration: none; - z-index: 20; - position: relative; - &:hover { - text-decoration: underline; - } - &:visited { - text-decoration: none; - } - } - a.action { - cursor: pointer; - } - h3 { - font-size: 16px; - text-transform: uppercase; - font-weight: 400; - margin: 0 0 16px; - } - p { - text-align: center; - margin: 10px 0px 5px; - - @media (max-width: 480px) { - text-align: left; - } - } - - div.grid-fluid { - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - - justify-content: center; - - text-align: left; - margin: 0 0 40px; - - ul { - list-style-position: inside; - padding: 0px; - margin: 0px; - - li { - list-style-type: none; - padding: 0px; - text-align: left; - } - } - - @media (max-width: 480px) { - flex-direction: column; - .footer-block { - margin: 8px 24px; - } - } - } - - - - - @media (max-width: 700px) { - h3 { - font-size: 110%; - } - } - @media (max-width: 600px) { - h3 { - font-size: 100%; - } - } -} - -footer::after { - content: ""; - position: absolute; - z-index: -1; - top: 0; - bottom: 0; - left: 0; - right: 0; - //background: - // url('../src/assets/images/logos/angular/angular_whiteTransparent_withMargin.png') top 0 left 0 repeat, - // url('../src/assets/images/logos/angular/angular_whiteTransparent_withMargin.png') top 80px left 160px repeat; - //opacity: 0.05; - background-size: 320px auto; -} diff --git a/docs_app/src/styles/1-layouts/_marketing-layout.scss b/docs_app/src/styles/1-layouts/_marketing-layout.scss index 43ac572e63..a3f3864e5d 100644 --- a/docs_app/src/styles/1-layouts/_marketing-layout.scss +++ b/docs_app/src/styles/1-layouts/_marketing-layout.scss @@ -456,3 +456,25 @@ div[layout=row]{ .page-features .marketing-banner { margin-bottom: 20px; } + +.blm-background { + background-color: black; + color: white; + display: flex; + min-height: calc(100vh - 64px) +} + +.text-container.blm-container { + text-align: center; + line-height: inherit; + max-width: inherit; +} + +.blm-text { + font-size: 2rem; + line-height: inherit +} + +.blm-list-item { + margin: 10px 0 +} \ No newline at end of file diff --git a/docs_app/src/styles/1-layouts/_top-menu.scss b/docs_app/src/styles/1-layouts/_top-menu.scss index f7c39b78ca..dbe482de88 100644 --- a/docs_app/src/styles/1-layouts/_top-menu.scss +++ b/docs_app/src/styles/1-layouts/_top-menu.scss @@ -11,6 +11,7 @@ mat-toolbar.mat-toolbar { left: 0; z-index: 10; box-shadow: 0 2px 5px 0 rgba(0,0,0,0.30); + background-color: black !important; mat-toolbar-row { padding: 0 16px 0 0; @@ -24,11 +25,11 @@ mat-toolbar.mat-toolbar { // HOME PAGE OVERRIDE: TOPNAV TOOLBAR aio-shell.page-home mat-toolbar.mat-toolbar { - background-color: $pink; + background-color: black; @media (min-width: 481px) { &:not(.transitioning) { - background-color: $pink; + background-color: black; transition: background-color .2s linear; } }