UNCLASSIFIED
Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Platform One
P
Party Bus
Launchboard
launchboard-fe
Commits
74b2090a
Commit
74b2090a
authored
Dec 07, 2020
by
graham.smith
Browse files
update splash rocket
parent
556e99c0
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
120 additions
and
75 deletions
+120
-75
src/InitialLoadingApp.vue
src/InitialLoadingApp.vue
+19
-72
src/assets/images/logos/LB-rocket-logo.svg
src/assets/images/logos/LB-rocket-logo.svg
+91
-0
src/assets/images/logos/yoda_head_unite_logo.png
src/assets/images/logos/yoda_head_unite_logo.png
+0
-0
src/main.js
src/main.js
+4
-3
src/scss/custom.scss
src/scss/custom.scss
+6
-0
No files found.
src/InitialLoadingApp.vue
View file @
74b2090a
<
template
>
<
template
>
<v-app
id=
"initial-loading-app"
>
<v-app
id=
"initial-loading-app"
>
<div
class=
"fade-container"
:class=
"
{ fade: fading }">
<div
class=
"fade-container"
:class=
"
{ fade: fading }">
<v-img
<img
contain
src=
"@/assets/images/logos/LB-Logo_Horizontal_White-PNG.png"
src=
"@/assets/images/logos/LB-Logo_Horizontal_White-PNG.png"
class=
"logo"
class=
"logo"
alt=
"Launchboard"
/>
/>
<div
<div
...
@@ -21,12 +21,7 @@
...
@@ -21,12 +21,7 @@
<li></li>
<li></li>
<li></li>
<li></li>
</ul>
</ul>
<div
class=
"rocket-body"
>
<RocketLogo
class=
"rocket-body"
/>
<div
class=
"body"
></div>
<div
class=
"fin fin-left"
></div>
<div
class=
"fin fin-right"
></div>
<div
class=
"window"
></div>
</div>
<div
class=
"exhaust-flame"
></div>
<div
class=
"exhaust-flame"
></div>
<ul
class=
"exhaust-fumes"
>
<ul
class=
"exhaust-fumes"
>
<li></li>
<li></li>
...
@@ -82,7 +77,11 @@
...
@@ -82,7 +77,11 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
RocketLogo
from
"
@/assets/images/logos/LB-rocket-logo.svg
"
;
export
default
{
export
default
{
components
:
{
RocketLogo
},
data
:
()
=>
({
data
:
()
=>
({
launching
:
false
,
launching
:
false
,
fading
:
false
,
fading
:
false
,
...
@@ -153,8 +152,9 @@ export default {
...
@@ -153,8 +152,9 @@ export default {
.logo
{
.logo
{
width
:
300px
;
width
:
300px
;
margin-top
:
15px
;
margin-bottom
:
15px
;
align-self
:
center
;
align-self
:
center
;
margin-top
:
-20rem
;
}
}
.v-card
{
.v-card
{
...
@@ -166,7 +166,6 @@ export default {
...
@@ -166,7 +166,6 @@ export default {
.rocket-container
{
.rocket-container
{
position
:
relative
;
position
:
relative
;
flex-grow
:
1
;
flex-grow
:
1
;
margin-top
:
-15rem
;
&
.launch
{
&
.launch
{
.rocket
{
.rocket
{
...
@@ -196,77 +195,25 @@ export default {
...
@@ -196,77 +195,25 @@ export default {
.rocket
{
.rocket
{
position
:
absolute
;
position
:
absolute
;
top
:
20%
;
@media
only
screen
and
(
min-height
:
400px
)
{
width
:
80px
;
top
:
20%
;
}
top
:
0px
;
left
:
calc
(
50%
-
40px
);
left
:
calc
(
50%
-
40px
);
.rocket-body
{
.rocket-body
{
width
:
80px
;
position
:
relative
;
left
:
calc
(
50%
-
50px
);
width
:
220px
;
left
:
calc
(
50%
-
180px
);
transform
:
translate3d
(
0px
,
0px
,
0
);
transform
:
translate3d
(
0px
,
0px
,
0
);
animation
:
bounce
0
.5s
infinite
;
animation
:
bounce
0
.5s
infinite
;
.body
{
background-color
:
$lightgrey
;
height
:
180px
;
left
:
calc
(
50%
-
50px
);
border-top-right-radius
:
100%
;
border-top-left-radius
:
100%
;
border-bottom-left-radius
:
50%
;
border-bottom-right-radius
:
50%
;
border-top
:
5px
solid
$white
;
}
&
:before
{
content
:
""
;
position
:
absolute
;
left
:
calc
(
50%
-
24px
);
width
:
48px
;
height
:
13px
;
background-color
:
$darkgrey
;
bottom
:
-13px
;
border-bottom-right-radius
:
60%
;
border-bottom-left-radius
:
60%
;
}
}
.window
{
position
:
absolute
;
width
:
40px
;
height
:
40px
;
border-radius
:
100%
;
background-color
:
rgba
(
178
,
213
,
238
,
0
.5
);
background-image
:
url("~@/assets/images/logos/yoda_head_unite_logo.png")
;
background-position-x
:
center
;
background-position-y
:
12px
;
background-size
:
130%
;
left
:
calc
(
50%
-
20px
);
top
:
40px
;
border
:
5px
solid
$midgrey
;
}
.fin
{
position
:
absolute
;
z-index
:
-100
;
height
:
55px
;
width
:
50px
;
background-color
:
$darkred
;
}
.fin-left
{
left
:
-30px
;
top
:
calc
(
100%
-
55px
);
border-top-left-radius
:
80%
;
border-bottom-left-radius
:
20%
;
}
.fin-right
{
right
:
-30px
;
top
:
calc
(
100%
-
55px
);
border-top-right-radius
:
80%
;
border-bottom-right-radius
:
20%
;
}
}
.exhaust-flame
{
.exhaust-flame
{
position
:
absolute
;
position
:
absolute
;
bottom
:
-1
45
px
;
bottom
:
-1
00
px
;
width
:
28px
;
width
:
28px
;
background
:
linear-gradient
(
to
bottom
,
transparent
10%
,
$white
100%
);
background
:
linear-gradient
(
to
bottom
,
transparent
10%
,
$white
100%
);
height
:
150px
;
height
:
150px
;
left
:
calc
(
50%
-
14
px
);
left
:
calc
(
50%
-
83
px
);
animation
:
exhaust
0
.2s
infinite
;
animation
:
exhaust
0
.2s
infinite
;
}
}
.exhaust-fumes
li
{
.exhaust-fumes
li
{
...
@@ -450,7 +397,7 @@ export default {
...
@@ -450,7 +397,7 @@ export default {
transform
:
translate3d
(
0px
,
0px
,
0
);
transform
:
translate3d
(
0px
,
0px
,
0
);
}
}
to
{
to
{
transform
:
translate3d
(
0px
,
7
0vh
,
0
)
rotate
(
-90deg
);
transform
:
translate3d
(
0px
,
9
0vh
,
0
)
rotate
(
-90deg
);
}
}
}
}
...
...
src/assets/images/logos/LB-rocket-logo.svg
0 → 100644
View file @
74b2090a
This diff is collapsed.
Click to expand it.
src/assets/images/logos/yoda_head_unite_logo.png
deleted
100644 → 0
View file @
556e99c0
62.3 KB
src/main.js
View file @
74b2090a
...
@@ -31,13 +31,14 @@ const startTime = new Date();
...
@@ -31,13 +31,14 @@ const startTime = new Date();
createLoadingApp
();
createLoadingApp
();
// fetch global data
// fetch global data
const
minWaitTime
=
1000
;
Promise
.
all
([
UserService
.
getUser
(),
UserPreferenceService
.
getUserPreferences
()])
Promise
.
all
([
UserService
.
getUser
(),
UserPreferenceService
.
getUserPreferences
()])
.
then
(
async
results
=>
{
.
then
(
async
results
=>
{
// wait at least
1s
so the splash screen doesn't disappear too fast
// wait at least
minWaitTime
so the splash screen doesn't disappear too fast
const
timeDiff
=
new
Date
()
-
startTime
;
const
timeDiff
=
new
Date
()
-
startTime
;
if
(
timeDiff
<
1000
)
{
if
(
timeDiff
<
minWaitTime
)
{
await
new
Promise
(
resolve
=>
{
await
new
Promise
(
resolve
=>
{
setTimeout
(
resolve
,
1000
-
timeDiff
);
setTimeout
(
resolve
,
minWaitTime
-
timeDiff
);
});
});
}
}
...
...
src/scss/custom.scss
View file @
74b2090a
...
@@ -382,4 +382,10 @@ body {
...
@@ -382,4 +382,10 @@ body {
flex
:
1
;
flex
:
1
;
}
}
}
}
// fix for https://github.com/vuetifyjs/vuetify/issues/9130
.v-card__text
,
.v-card__title
{
word-break
:
normal
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment