Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
342
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
29
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
21457304
Commit
21457304
authored
6 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
[wip] darkmode
parent
cba07d08
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/client/app/desktop/script.ts
+14
-1
14 additions, 1 deletion
src/client/app/desktop/script.ts
src/client/app/desktop/views/widgets/users.vue
+30
-54
30 additions, 54 deletions
src/client/app/desktop/views/widgets/users.vue
with
44 additions
and
55 deletions
src/client/app/desktop/script.ts
+
14
−
1
View file @
21457304
...
@@ -46,15 +46,28 @@ init(async (launch) => {
...
@@ -46,15 +46,28 @@ init(async (launch) => {
// Dark/Light
// Dark/Light
Vue
.
mixin
({
Vue
.
mixin
({
data
()
{
return
{
_darkmode_
:
false
};
},
beforeCreate
()
{
// なぜか警告が出るため
this
.
_darkmode_
=
false
;
},
mounted
()
{
mounted
()
{
const
set
=
()
=>
{
const
set
=
()
=>
{
if
(
!
this
.
$el
||
!
this
.
os
||
!
this
.
os
.
i
)
return
;
if
(
!
this
.
$el
||
!
this
.
$el
.
setAttribute
||
!
this
.
os
||
!
this
.
os
.
i
)
return
;
if
(
this
.
os
.
i
.
clientSettings
.
dark
)
{
if
(
this
.
os
.
i
.
clientSettings
.
dark
)
{
document
.
documentElement
.
setAttribute
(
'
data-darkmode
'
,
'
true
'
);
document
.
documentElement
.
setAttribute
(
'
data-darkmode
'
,
'
true
'
);
this
.
$el
.
setAttribute
(
'
data-darkmode
'
,
'
true
'
);
this
.
$el
.
setAttribute
(
'
data-darkmode
'
,
'
true
'
);
this
.
_darkmode_
=
true
;
this
.
$forceUpdate
();
}
else
{
}
else
{
document
.
documentElement
.
removeAttribute
(
'
data-darkmode
'
);
document
.
documentElement
.
removeAttribute
(
'
data-darkmode
'
);
this
.
$el
.
removeAttribute
(
'
data-darkmode
'
);
this
.
$el
.
removeAttribute
(
'
data-darkmode
'
);
this
.
_darkmode_
=
false
;
this
.
$forceUpdate
();
}
}
};
};
...
...
This diff is collapsed.
Click to expand it.
src/client/app/desktop/views/widgets/users.vue
+
30
−
54
View file @
21457304
<
template
>
<
template
>
<div
class=
"mkw-users"
>
<div
class=
"mkw-users"
>
<template
v-if=
"!props.compact"
>
<mk-widget-container
:show-header=
"!props.compact"
>
<p
class=
"title"
>
%fa:users%%i18n:@title%
</p>
<template
slot=
"header"
>
%fa:users%%i18n:@title%
</
template
>
<button
@
click=
"refresh"
title=
"%i18n:@refresh%"
>
%fa:sync%
</button>
<button
slot=
"func"
title=
"%i18n:@refresh%"
@
click=
"refresh"
>
%fa:sync%
</button>
</
template
>
<p
class=
"fetching"
v-if=
"fetching"
>
%fa:spinner .pulse .fw%%i18n:common.loading%
<mk-ellipsis/></p>
<div
class=
"mkw-users--body"
:data-darkmode=
"_darkmode_"
>
<
template
v-else-if=
"users.length != 0"
>
<p
class=
"fetching"
v-if=
"fetching"
>
%fa:spinner .pulse .fw%%i18n:common.loading%
<mk-ellipsis/></p>
<div
class=
"user"
v-for=
"_user in users"
>
<
template
v-else-if=
"users.length != 0"
>
<router-link
class=
"avatar-anchor"
:to=
"_user | userPage"
>
<div
class=
"user"
v-for=
"_user in users"
>
<img
class=
"avatar"
:src=
"`$
{_user.avatarUrl}?thumbnail
&
size=42`" alt="" v-user-preview="_user.id"/>
<router-link
class=
"avatar-anchor"
:to=
"_user | userPage"
>
</router-link>
<img
class=
"avatar"
:src=
"`$
{_user.avatarUrl}?thumbnail
&
size=42`" alt="" v-user-preview="_user.id"/>
<div
class=
"body"
>
</router-link>
<router-link
class=
"name"
:to=
"_user | userPage"
v-user-preview=
"_user.id"
>
{{
_user
|
userName
}}
</router-link>
<div
class=
"body"
>
<p
class=
"username"
>
@
{{
_user
|
acct
}}
</p>
<router-link
class=
"name"
:to=
"_user | userPage"
v-user-preview=
"_user.id"
>
{{
_user
|
userName
}}
</router-link>
</div>
<p
class=
"username"
>
@
{{
_user
|
acct
}}
</p>
<mk-follow-button
:user=
"_user"
/>
</div>
<mk-follow-button
:user=
"_user"
/>
</div>
</
template
>
<p
class=
"empty"
v-else
>
%i18n:@no-one%
</p>
</div>
</div>
</
template
>
</mk-widget-container>
<p
class=
"empty"
v-else
>
%i18n:@no-one%
</p>
</div>
</div>
</template>
</template>
...
@@ -71,43 +74,10 @@ export default define({
...
@@ -71,43 +74,10 @@ export default define({
</
script
>
</
script
>
<
style
lang=
"stylus"
scoped
>
<
style
lang=
"stylus"
scoped
>
.mkw-users
root(isDark)
background #fff
border solid 1px rgba(0, 0, 0, 0.075)
border-radius 6px
> .title
margin 0
padding 0 16px
line-height 42px
font-size 0.9em
font-weight bold
color #888
border-bottom solid 1px #eee
> [data-fa]
margin-right 4px
> button
position absolute
z-index 2
top 0
right 0
padding 0
width 42px
font-size 0.9em
line-height 42px
color #ccc
&:hover
color #aaa
&:active
color #999
> .user
> .user
padding 16px
padding 16px
border-bottom solid 1px #eee
border-bottom solid 1px
isDark ? #1c2023 :
#eee
&:last-child
&:last-child
border-bottom none
border-bottom none
...
@@ -138,14 +108,14 @@ export default define({
...
@@ -138,14 +108,14 @@ export default define({
margin 0
margin 0
font-size 16px
font-size 16px
line-height 24px
line-height 24px
color #555
color
isDark ? #fff :
#555
> .username
> .username
display block
display block
margin 0
margin 0
font-size 15px
font-size 15px
line-height 16px
line-height 16px
color #ccc
color
isDark ? #606984 :
#ccc
> .mk-follow-button
> .mk-follow-button
position absolute
position absolute
...
@@ -167,4 +137,10 @@ export default define({
...
@@ -167,4 +137,10 @@ export default define({
> [data-fa]
> [data-fa]
margin-right 4px
margin-right 4px
.mkw-users--body[data-darkmode]
root(true)
.mkw-users--body:not([data-darkmode])
root(false)
</
style
>
</
style
>
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