Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Pleroma
admin-fe
Commits
220ad055
Commit
220ad055
authored
6 years ago
by
feld
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/mobile-ui' into 'master'
Improve UI on mobile Closes
#5
See merge request
!4
parents
3c524b3c
36c7004a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!4
Improve UI on mobile
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/views/layout/components/Navbar.vue
+5
-0
5 additions, 0 deletions
src/views/layout/components/Navbar.vue
src/views/users/index.vue
+43
-8
43 additions, 8 deletions
src/views/users/index.vue
with
48 additions
and
8 deletions
src/views/layout/components/Navbar.vue
+
5
−
0
View file @
220ad055
<
template
>
<div
class=
"navbar"
>
<hamburger
:toggle-click=
"toggleSideBar"
:is-active=
"sidebar.opened"
class=
"hamburger-container"
/>
<div
class=
"right-menu"
>
<el-dropdown
class=
"avatar-container right-menu-item hover-effect"
trigger=
"click"
>
<div
class=
"avatar-wrapper"
>
...
...
@@ -22,8 +23,12 @@
<
script
>
import
{
mapGetters
}
from
'
vuex
'
import
Hamburger
from
'
@/components/Hamburger
'
export
default
{
components
:
{
Hamburger
},
computed
:
{
...
mapGetters
([
'
sidebar
'
,
...
...
This diff is collapsed.
Click to expand it.
src/views/users/index.vue
+
43
−
8
View file @
220ad055
<
template
>
<div
class=
"users-container"
>
<h1>
Users
</h1>
<div
class=
"search
C
ontainer"
>
<el-checkbox
:value=
"showLocalUsers"
@
change=
"handleLocalUsersCheckbox"
>
Show l
ocal users only
</el-checkbox>
<div
class=
"search
-c
ontainer"
>
<el-checkbox
:value=
"showLocalUsers"
@
change=
"handleLocalUsersCheckbox"
>
L
ocal users only
</el-checkbox>
<el-input
placeholder=
"Search"
class=
"search"
@
input=
"handleDebounceSearchInput"
/>
</div>
<el-table
v-loading=
"loading"
:data=
"users"
style=
"width: 100%"
>
<el-table-column
prop=
"id"
label=
"ID"
width=
"180"
/>
<el-table-column
:min-width=
"width"
prop=
"id"
label=
"ID"
/>
<el-table-column
prop=
"nickname"
label=
"Name"
/>
<el-table-column
label=
"Status"
>
<el-table-column
:min-width=
"width"
label=
"Status"
>
<template
slot-scope=
"scope"
>
<el-tag
:type=
"scope.row.deactivated ? 'danger' : 'success'"
>
{{
scope
.
row
.
deactivated
?
'
deactivated
'
:
'
active
'
}}
</el-tag>
<el-tag
:type=
"scope.row.deactivated ? 'danger' : 'success'"
>
<span
v-if=
"isDesktop"
>
{{
scope
.
row
.
deactivated
?
'
deactivated
'
:
'
active
'
}}
</span>
<i
v-else
:class=
"activationIcon(scope.row.deactivated)"
/>
</el-tag>
</
template
>
</el-table-column>
<el-table-column
fixed=
"right"
label=
"Actions"
>
...
...
@@ -62,6 +63,15 @@ export default {
},
showLocalUsers
()
{
return
this
.
$store
.
state
.
users
.
showLocalUsers
},
isDesktop
()
{
return
this
.
$store
.
state
.
app
.
device
===
'
desktop
'
},
isMobile
()
{
return
this
.
$store
.
state
.
app
.
device
===
'
mobile
'
},
width
()
{
return
this
.
isMobile
?
60
:
false
}
},
created
()
{
...
...
@@ -89,6 +99,9 @@ export default {
},
handleLocalUsersCheckbox
(
e
)
{
this
.
$store
.
dispatch
(
'
ToggleLocalUsersFilter
'
,
e
)
},
activationIcon
(
status
)
{
return
status
?
'
el-icon-error
'
:
'
el-icon-success
'
}
}
}
...
...
@@ -111,11 +124,33 @@ export default {
margin-right
:
15px
;
float
:
right
;
}
.search
C
ontainer
{
.search
-c
ontainer
{
display
:
flex
;
justify-content
:
space-between
;
align-items
:
baseline
;
margin-left
:
15px
;
}
}
@media
only
screen
and
(
max-width
:
760px
)
,
(
min-device-width
:
768px
)
and
(
max-device-width
:
1024px
)
{
.users-container
{
h1
{
margin-left
:
7px
;
}
.search
{
width
:
50%
;
margin-bottom
:
21
.5px
;
margin-right
:
7px
;
float
:
right
;
}
.search-container
{
display
:
flex
;
justify-content
:
space-between
;
align-items
:
baseline
;
margin-left
:
7px
;
}
}
}
</
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