diff --git a/src/assets/img/splash.png b/src/assets/img/splash.png new file mode 100644 index 000000000..e7889ccf9 Binary files /dev/null and b/src/assets/img/splash.png differ diff --git a/src/assets/img/splash_logo.png b/src/assets/img/splash_logo.png deleted file mode 100644 index 8c9fdfa9a..000000000 Binary files a/src/assets/img/splash_logo.png and /dev/null differ diff --git a/src/core/login/pages/init/init.html b/src/core/login/pages/init/init.html index 53461969c..a76c49166 100644 --- a/src/core/login/pages/init/init.html +++ b/src/core/login/pages/init/init.html @@ -1,8 +1,5 @@ diff --git a/src/core/login/pages/init/init.scss b/src/core/login/pages/init/init.scss index 79f1005d0..f456779df 100644 --- a/src/core/login/pages/init/init.scss +++ b/src/core/login/pages/init/init.scss @@ -1,34 +1,30 @@ +$core-splash-bgsize: 100vmax !default; +$core-splash-spinner-color: $core-init-screen-spinner-color !default; +$core-splash-bgcolor: $core-color-init-screen !default; + ion-app.app-root page-core-login-init { .scroll-content { - background-color: $core-color-init-screen; /* Change this to add a bg image or change color */ - background: -webkit-radial-gradient($core-color-init-screen-alt, $core-color-init-screen); - background: radial-gradient($core-color-init-screen-alt, $core-color-init-screen); - background-repeat: no-repeat; - background-position: center center; - } - .core-bglogo { + background: $core-splash-bgcolor; /* Change this to add a bg image or change color */ + overflow: hidden; position: absolute; @include position(0, 0, 0, 0); height: 100%; width: 100%; display: table; + } + .core-bglogo { + display: table-cell; + text-align: center; + vertical-align: middle; - .core-logo { - display: table-cell; - text-align: center; - vertical-align: middle; - } - - img { - width: $core-init-screen-logo-width; - max-width: $core-init-screen-logo-max-width; - display: block; - margin: 0 auto; - margin-bottom: 30px; - } + background-image: url('/assets/img/splash.png'); + background-repeat: no-repeat; + background-size: 100%; + background-size: $core-splash-bgsize; + background-position: center; .spinner circle, .spinner line { - stroke: $core-init-screen-spinner-color; + stroke: $core-splash-spinner-color; } } } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 36a6110c3..919afa355 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -133,10 +133,7 @@ $core-star-color: $core-color !default; // Init screen. $core-color-init-screen: #ffffff !default; -$core-color-init-screen-alt: #ffffff !default; $core-init-screen-spinner-color: $core-color !default; -$core-init-screen-logo-width: 60% !default; -$core-init-screen-logo-max-width: 300px !default; $core-fixed-url: false !default;