Merge remote-tracking branch 'origin/develop' into next

2021-09-18 20:52:26 -05:00 · 2021-09-18 20:52:26 -05:00 · 008d53a7d9
commit 008d53a7d9
parent 48216659d6 b1d884f370
25 changed files with 0 additions and 30 deletions
--- a/app/soapbox/components/profile_hover_card.js
+++ b/app/soapbox/components/profile_hover_card.js
--- a/app/soapbox/containers/soapbox.js
+++ b/app/soapbox/containers/soapbox.js
--- a/app/soapbox/features/account/components/header.js
+++ b/app/soapbox/features/account/components/header.js
--- a/app/soapbox/features/follow_recommendations/components/follow_recommendations_container.js
+++ b/app/soapbox/features/follow_recommendations/components/follow_recommendations_container.js
--- a/app/soapbox/features/follow_recommendations/index.js
+++ b/app/soapbox/features/follow_recommendations/index.js
--- a/app/soapbox/features/home_timeline/index.js
+++ b/app/soapbox/features/home_timeline/index.js
--- a/app/soapbox/features/public_layout/index.js
+++ b/app/soapbox/features/public_layout/index.js
--- a/app/soapbox/features/ui/components/image_loader.js
+++ b/app/soapbox/features/ui/components/image_loader.js
--- a/app/soapbox/features/ui/components/modal_root.js
+++ b/app/soapbox/features/ui/components/modal_root.js
--- a/app/soapbox/features/ui/containers/loading_bar_container.js
+++ b/app/soapbox/features/ui/containers/loading_bar_container.js
--- a/app/soapbox/features/ui/index.js
+++ b/app/soapbox/features/ui/index.js
--- a/app/soapbox/features/ui/util/async-components.js
+++ b/app/soapbox/features/ui/util/async-components.js
--- a/app/soapbox/middleware/loading_bar.js
+++ b/app/soapbox/middleware/loading_bar.js
--- a/app/soapbox/pages/admin_page.js
+++ b/app/soapbox/pages/admin_page.js
--- a/app/soapbox/pages/default_page.js
+++ b/app/soapbox/pages/default_page.js
--- a/app/soapbox/pages/home_page.js
+++ b/app/soapbox/pages/home_page.js
--- a/app/soapbox/pages/profile_page.js
+++ b/app/soapbox/pages/profile_page.js
--- a/app/soapbox/pages/remote_instance_page.js
+++ b/app/soapbox/pages/remote_instance_page.js
--- a/app/soapbox/reducers/index.js
+++ b/app/soapbox/reducers/index.js
--- a/app/soapbox/store/configureStore.js
+++ b/app/soapbox/store/configureStore.js
--- a/app/styles/loading.scss
+++ b/app/styles/loading.scss
@ -148,14 +148,6 @@
  animation: shake-bottom 0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955) 2s 2 both;
 }

-.loading-bar {
-  background-color: var(--highlight-text-color);
-  height: 3px;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
 .load-more {
  display: block;
  color: var(--primary-text-color);
--- a/app/styles/ui.scss
+++ b/app/styles/ui.scss
@ -279,10 +279,6 @@
    object-fit: contain;
  }

-  .loading-bar {
-    position: relative;
-  }
-
  &.image-loader--amorphous .image-loader__preview-canvas {
    display: none;
  }
--- a/docs/store.md
+++ b/docs/store.md
@ -104,15 +104,6 @@ If it's not documented, it's because I inherited it from Mastodon and I don't kn
  alerts: []
    ```

- `loadingBar` - Managed by [react-redux-loading-bar](https://github.com/mironov/react-redux-loading-bar)
-
-    Sample:
-    ```
-  loadingBar: {
-    'default': 0
-  }
-    ```
-
 - `modal`

    Sample:
--- a/package.json
+++ b/package.json
@ -126,7 +126,6 @@
    "react-overlays": "^0.9.0",
    "react-popper": "^2.2.3",
    "react-redux": "^7.2.5",
-    "react-redux-loading-bar": "^5.0.0",
    "react-router-dom": "^4.3.1",
    "react-router-scroll-4": "^1.0.0-beta.1",
    "react-sparklines": "^1.7.0",
--- a/yarn.lock
+++ b/yarn.lock
@ -7897,14 +7897,6 @@ react-popper@^2.2.3, react-popper@^2.2.5:
    react-fast-compare "^3.0.1"
    warning "^4.0.2"

-react-redux-loading-bar@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-5.0.2.tgz#e62d527892b0a7682baa2ebbb3fd34c0b807e485"
-  integrity sha512-M+gK/Q79UG3iVljv6myRJptdQ5sIKdYDigeukwGocvWLCgWFdtpeP8IY8lBIYsqHXtuFBP/gj7E3qvGwCtcpRQ==
-  dependencies:
-    prop-types "^15.7.2"
-    react-lifecycles-compat "^3.0.4"
-
 react-redux@^7.2.5:
  version "7.2.5"
  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.5.tgz#213c1b05aa1187d9c940ddfc0b29450957f6a3b8"