Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
337
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
25
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TransFem.org
Sharkey
Commits
15731608
Commit
15731608
authored
7 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
✌️
parent
18595dd3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/web/app/desktop/views/components/ui.header.vue
+77
-13
77 additions, 13 deletions
src/web/app/desktop/views/components/ui.header.vue
src/web/app/mobile/views/components/ui.header.vue
+62
-4
62 additions, 4 deletions
src/web/app/mobile/views/components/ui.header.vue
with
139 additions
and
17 deletions
src/web/app/desktop/views/components/ui.header.vue
+
77
−
13
View file @
15731608
<
template
>
<div
class=
"header"
>
<mk-special-message/>
<div
class=
"main"
>
<div
class=
"main"
ref=
"main"
>
<div
class=
"backdrop"
></div>
<div
class=
"main"
>
<div
class=
"container"
>
<p
ref=
"welcomeback"
v-if=
"os.isSignedIn"
>
おかえりなさい、
<b>
{{
os
.
i
.
name
}}
</b>
さん
</p>
<div
class=
"container"
ref=
"mainContainer"
>
<div
class=
"left"
>
<x-nav/>
</div>
...
...
@@ -23,6 +24,7 @@
<
script
lang=
"ts"
>
import
Vue
from
'
vue
'
;
import
*
as
anime
from
'
animejs
'
;
import
XNav
from
'
./ui.header.nav.vue
'
;
import
XSearch
from
'
./ui.header.search.vue
'
;
...
...
@@ -39,6 +41,53 @@ export default Vue.extend({
XNotifications
,
XPost
,
XClock
,
},
mounted
()
{
if
((
this
as
any
).
os
.
isSignedIn
)
{
const
ago
=
(
new
Date
().
getTime
()
-
new
Date
((
this
as
any
).
os
.
i
.
last_used_at
).
getTime
())
/
1000
const
isHisasiburi
=
ago
>=
3600
;
if
(
isHisasiburi
)
{
(
this
.
$refs
.
main
as
any
).
style
.
overflow
=
'
hidden
'
;
anime
({
targets
:
this
.
$refs
.
welcomeback
,
top
:
'
0
'
,
opacity
:
1
,
delay
:
1000
,
duration
:
500
,
easing
:
'
easeOutQuad
'
});
anime
({
targets
:
this
.
$refs
.
mainContainer
,
opacity
:
0
,
delay
:
1000
,
duration
:
500
,
easing
:
'
easeOutQuad
'
});
setTimeout
(()
=>
{
anime
({
targets
:
this
.
$refs
.
welcomeback
,
top
:
'
-48px
'
,
opacity
:
0
,
duration
:
500
,
complete
:
()
=>
{
(
this
.
$refs
.
welcomeback
as
any
).
style
.
display
=
'
none
'
;
(
this
.
$refs
.
main
as
any
).
style
.
overflow
=
'
initial
'
;
},
easing
:
'
easeInQuad
'
});
anime
({
targets
:
this
.
$refs
.
mainContainer
,
opacity
:
1
,
duration
:
500
,
easing
:
'
easeInQuad
'
});
},
2000
);
}
}
}
});
</
script
>
...
...
@@ -53,6 +102,7 @@ export default Vue.extend({
box-shadow 0 1px 1px rgba(0, 0, 0, 0.075)
> .main
height 48px
> .backdrop
position absolute
...
...
@@ -63,17 +113,6 @@ export default Vue.extend({
backdrop-filter blur(12px)
background #f7f7f7
&:after
content ""
display block
width 100%
height 48px
background-image url(/assets/desktop/header-logo.svg)
background-size 46px
background-position center
background-repeat no-repeat
opacity 0.3
> .main
z-index 1024
margin 0
...
...
@@ -82,12 +121,37 @@ export default Vue.extend({
font-size 0.9rem
user-select none
> p
display block
position absolute
top 48px
width 100%
line-height 48px
margin 0
text-align center
color #888
opacity 0
> .container
display flex
width 100%
max-width 1300px
margin 0 auto
&:before
content ""
position absolute
top 0
left 0
display block
width 100%
height 48px
background-image url(/assets/desktop/header-logo.svg)
background-size 46px
background-position center
background-repeat no-repeat
opacity 0.3
> .left
margin 0 auto 0 0
height 48px
...
...
This diff is collapsed.
Click to expand it.
src/web/app/mobile/views/components/ui.header.vue
+
62
−
4
View file @
15731608
<
template
>
<div
class=
"header"
>
<mk-special-message/>
<div
class=
"main"
>
<div
class=
"main"
ref=
"main"
>
<div
class=
"backdrop"
></div>
<div
class=
"content"
>
<p
ref=
"welcomeback"
v-if=
"os.isSignedIn"
>
おかえりなさい、
<b>
{{
os
.
i
.
name
}}
</b>
さん
</p>
<div
class=
"content"
ref=
"mainContainer"
>
<button
class=
"nav"
@
click=
"$parent.isDrawerOpening = true"
>
%fa:bars%
</button>
<template
v-if=
"hasUnreadNotifications || hasUnreadMessagingMessages"
>
%fa:circle%
</
template
>
<h1>
...
...
@@ -17,6 +18,7 @@
<
script
lang=
"ts"
>
import
Vue
from
'
vue
'
;
import
*
as
anime
from
'
animejs
'
;
export
default
Vue
.
extend
({
props
:
[
'
func
'
],
...
...
@@ -51,6 +53,50 @@ export default Vue.extend({
this
.
hasUnreadMessagingMessages
=
true
;
}
});
const
ago
=
(
new
Date
().
getTime
()
-
new
Date
((
this
as
any
).
os
.
i
.
last_used_at
).
getTime
())
/
1000
const
isHisasiburi
=
ago
>=
3600
;
if
(
isHisasiburi
)
{
(
this
.
$refs
.
main
as
any
).
style
.
overflow
=
'
hidden
'
;
anime
({
targets
:
this
.
$refs
.
welcomeback
,
top
:
'
0
'
,
opacity
:
1
,
delay
:
1000
,
duration
:
500
,
easing
:
'
easeOutQuad
'
});
anime
({
targets
:
this
.
$refs
.
mainContainer
,
opacity
:
0
,
delay
:
1000
,
duration
:
500
,
easing
:
'
easeOutQuad
'
});
setTimeout
(()
=>
{
anime
({
targets
:
this
.
$refs
.
welcomeback
,
top
:
'
-48px
'
,
opacity
:
0
,
duration
:
500
,
complete
:
()
=>
{
(
this
.
$refs
.
welcomeback
as
any
).
style
.
display
=
'
none
'
;
(
this
.
$refs
.
main
as
any
).
style
.
overflow
=
'
initial
'
;
},
easing
:
'
easeInQuad
'
});
anime
({
targets
:
this
.
$refs
.
mainContainer
,
opacity
:
1
,
duration
:
500
,
easing
:
'
easeInQuad
'
});
},
2000
);
}
}
},
beforeDestroy
()
{
...
...
@@ -95,15 +141,27 @@ export default Vue.extend({
> .backdrop
position absolute
top 0
z-index 10
23
z-index 10
00
width 100%
height $height
-webkit-backdrop-filter blur(12px)
backdrop-filter blur(12px)
background-color rgba(#1b2023, 0.75)
> p
display block
position absolute
z-index 1002
top $height
width 100%
line-height $height
margin 0
text-align center
color #fff
opacity 0
> .content
z-index 10
24
z-index 10
01
> h1
display block
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment