diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2ffa638d..2c1cdbf5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -449,8 +449,6 @@ workflows:
branches:
only:
- /^release-\d+(\.\d+){1,2}(-rc.*)?/
- - MM-36793
-
- store_artifacts:
# for master/PR builds
requires:
diff --git a/src/assets/loader/StippleMask.jpg b/src/assets/loader/StippleMask.jpg
new file mode 100644
index 00000000..0edf2b1b
Binary files /dev/null and b/src/assets/loader/StippleMask.jpg differ
diff --git a/src/assets/window-background-dots.svg b/src/assets/window-background-dots.svg
deleted file mode 100644
index 4a17343c..00000000
--- a/src/assets/window-background-dots.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-
diff --git a/src/assets/window-background-dots_dark.svg b/src/assets/window-background-dots_dark.svg
deleted file mode 100644
index 83377239..00000000
--- a/src/assets/window-background-dots_dark.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-
diff --git a/src/assets/window-background.svg b/src/assets/window-background.svg
deleted file mode 100644
index 4bf54f0a..00000000
--- a/src/assets/window-background.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-
diff --git a/src/assets/window-background_dark.svg b/src/assets/window-background_dark.svg
deleted file mode 100644
index 896f13fd..00000000
--- a/src/assets/window-background_dark.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-
diff --git a/src/renderer/components/LoadingScreen/LoadingBackground.tsx b/src/renderer/components/LoadingScreen/LoadingBackground.tsx
new file mode 100644
index 00000000..3a99dedf
--- /dev/null
+++ b/src/renderer/components/LoadingScreen/LoadingBackground.tsx
@@ -0,0 +1,78 @@
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+function LoadingBackground() {
+ return (
+
+
+
+ );
+}
+
+export default LoadingBackground;
diff --git a/src/renderer/components/LoadingScreen.tsx b/src/renderer/components/LoadingScreen/LoadingScreen.tsx
similarity index 92%
rename from src/renderer/components/LoadingScreen.tsx
rename to src/renderer/components/LoadingScreen/LoadingScreen.tsx
index 2f91b4b0..9ee068c0 100644
--- a/src/renderer/components/LoadingScreen.tsx
+++ b/src/renderer/components/LoadingScreen/LoadingScreen.tsx
@@ -4,9 +4,11 @@
import React from 'react';
import classNames from 'classnames';
-import useTransitionEnd from '../hooks/useTransitionEnd';
+import useTransitionEnd from '../../hooks/useTransitionEnd';
-import LoadingAnimation from './LoadingAnimation';
+import LoadingAnimation from '../LoadingAnimation';
+
+import LoadingBackground from './LoadingBackground';
type Props = {
loading?: boolean;
@@ -63,6 +65,7 @@ function LoadingScreen({loading = false, darkMode = false, onFadeOutComplete = (
'LoadingScreen--loaded': loadingIsComplete && loadAnimationIsComplete,
})}
>
+
svg
+{
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+}
+
+.LoadingScreen__backgound {
+ background: var(--background-color);
+}
+
+.LoadingScreen .Pill__stipple {
+ fill: var(--stipple-color);
+ fill-opacity: var(--stipple-opacity);
+}
+
+.LoadingScreen .Pill__gradient {
+ stop-color: var(--background-color);
+}
+
+.LoadingScreen .Pill__gradientHighlight {
+ stop-color: var(--background-color-highlight);
}
.LoadingScreen--loaded {
- opacity: 0;
- visibility: hidden;
-
- transition: opacity 150ms 0ms ease-in, visibility 150ms 0ms step-end;
+ opacity: 0;
+ visibility: hidden;
+
+ transition: opacity 150ms 0ms ease-in, visibility 150ms 0ms step-end;
}