From ae42298d081d3410a686b648418f6c7d2461f3b0 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed, 28 Mar 2018 18:00:56 -0700
Subject: [PATCH 1/2] [Frontend]  CSS for better startup

Fixes #1966
- Transitions and opacity styles moved to new _app-start.scss,
which loads at the very end of all other CSS needed by the app;
---
 .../commonUI/general/res/sass/_app-start.scss    | 11 +++++++++++
 platform/commonUI/general/res/sass/_main.scss    |  4 +++-
 .../commonUI/general/res/sass/startup-base.scss  | 16 +++++++---------
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 platform/commonUI/general/res/sass/_app-start.scss

diff --git a/platform/commonUI/general/res/sass/_app-start.scss b/platform/commonUI/general/res/sass/_app-start.scss
new file mode 100644
index 0000000000..b2ab6eed3c
--- /dev/null
+++ b/platform/commonUI/general/res/sass/_app-start.scss
@@ -0,0 +1,11 @@
+// At the last, hide .l-splash-holder and show .holder-all
+.l-splash-holder.fadeout {
+    @include trans-prop-nice($props: opacity, $dur: 1000ms);
+    opacity: 0;
+    pointer-events: none;
+}
+
+.user-environ .holder-all {
+    opacity: 1;
+    pointer-events: inherit;
+}
\ No newline at end of file
diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss
index 395b54eb6c..9a48936d88 100644
--- a/platform/commonUI/general/res/sass/_main.scss
+++ b/platform/commonUI/general/res/sass/_main.scss
@@ -76,9 +76,11 @@
 @import "items/item";
 @import "mobile/item";
 
-
 /********************************* TO BE MOVED */
 @import "autoflow";
 @import "features/imagery";
 @import "features/time-display";
 @import "widgets";
+
+/********************************* APP STARTUP */
+@import "app-start";
\ No newline at end of file
diff --git a/platform/commonUI/general/res/sass/startup-base.scss b/platform/commonUI/general/res/sass/startup-base.scss
index f324295f43..87b2c93112 100644
--- a/platform/commonUI/general/res/sass/startup-base.scss
+++ b/platform/commonUI/general/res/sass/startup-base.scss
@@ -32,11 +32,7 @@ body, html {
 }
 
 .l-splash-holder {
-    // Main outer holder.
-    @include transition-property(opacity);
-    @include transition-duration(500ms);
-    @include transition-timing-function(ease-in-out);
-    @include transition-delay(1s);
+    // Main outer holder for splash.
     position: absolute;
     top: 0;
     right: 0;
@@ -44,16 +40,18 @@ body, html {
     left: 0;
     z-index: 10000;
     opacity: 1;
-    &.fadeout {
-        opacity: 0;
-        pointer-events: none;
-    }
     .l-splash {
         // The splash element.
         @include splashElem();
     }
 }
 
+.user-environ .holder-all {
+    // Gets shown again by main CSS, once loaded
+    opacity: 0;
+    pointer-events: none;
+}
+
 @media only screen and (max-device-width: 767px) {
     .l-splash-holder .l-splash {
         @include splashElem(0);

From ba0077498c05836975802a870977cce7872ca4e4 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed, 18 Apr 2018 16:33:02 -0700
Subject: [PATCH 2/2] [Frontend]  Added return at eof

Fixes #1966
---
 platform/commonUI/general/res/sass/_main.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss
index 9a48936d88..b09753896d 100644
--- a/platform/commonUI/general/res/sass/_main.scss
+++ b/platform/commonUI/general/res/sass/_main.scss
@@ -83,4 +83,4 @@
 @import "widgets";
 
 /********************************* APP STARTUP */
-@import "app-start";
\ No newline at end of file
+@import "app-start";