Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Ilja
pleroma-fe
Commits
747e4090
Commit
747e4090
authored
6 years ago
by
Shpuld Shpludson
Browse files
Options
Downloads
Patches
Plain Diff
Cleanup and remove divider element in side drawer
parent
65065570
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/App.js
+0
-3
0 additions, 3 deletions
src/App.js
src/components/side_drawer/side_drawer.js
+1
-0
1 addition, 0 deletions
src/components/side_drawer/side_drawer.js
src/components/side_drawer/side_drawer.vue
+22
-21
22 additions, 21 deletions
src/components/side_drawer/side_drawer.vue
with
23 additions
and
24 deletions
src/App.js
+
0
−
3
View file @
747e4090
...
...
@@ -70,9 +70,6 @@ export default {
'
background-image
'
:
`url(
${
this
.
background
}
)`
}
},
mobileShowOnlyIn
()
{
return
view
=>
({
'
mobile-hidden
'
:
this
.
mobileActivePanel
!==
view
})
},
sitename
()
{
return
this
.
$store
.
state
.
instance
.
name
},
chat
()
{
return
this
.
$store
.
state
.
chat
.
channel
.
state
===
'
joined
'
},
suggestionsEnabled
()
{
return
this
.
$store
.
state
.
instance
.
suggestionsEnabled
},
...
...
This diff is collapsed.
Click to expand it.
src/components/side_drawer/side_drawer.js
+
1
−
0
View file @
747e4090
import
UserCardContent
from
'
../user_card_content/user_card_content.vue
'
import
{
unseenNotificationsFromStore
}
from
'
../../services/notification_utils/notification_utils
'
// TODO: separate touch gesture stuff into their own utils if more components want them
const
deltaCoord
=
(
oldCoord
,
newCoord
)
=>
[
newCoord
[
0
]
-
oldCoord
[
0
],
newCoord
[
1
]
-
oldCoord
[
1
]]
const
touchEventCoord
=
e
=>
([
e
.
touches
[
0
].
screenX
,
e
.
touches
[
0
].
screenY
])
...
...
This diff is collapsed.
Click to expand it.
src/components/side_drawer/side_drawer.vue
+
22
−
21
View file @
747e4090
<
template
>
<div
class=
"side-drawer-container"
:class=
"
{ 'side-drawer-container-closed': closed, 'side-drawer-container-open': !closed }">
<div
class=
"side-drawer-container"
:class=
"
{ 'side-drawer-container-closed': closed, 'side-drawer-container-open': !closed }"
>
<div
class=
"side-drawer"
:class=
"
{'side-drawer-closed': closed}"
@touchstart="touchStart"
...
...
@@ -30,9 +32,8 @@
{{
$t
(
"
nav.dms
"
)
}}
<
/router-link
>
<
/li
>
<
li
>
<
div
class
=
"
divider
"
><
/div
>
<
/li
>
<
/ul
>
<
ul
>
<
li
v
-
if
=
"
currentUser
"
@
click
=
"
toggleDrawer
"
>
<
router
-
link
:
to
=
"
{ name: 'friends'
}
"
>
{{
$t
(
"
nav.timeline
"
)
}}
...
...
@@ -58,9 +59,8 @@
{{
$t
(
"
nav.chat
"
)
}}
<
/router-link
>
<
/li
>
<
li
>
<
div
class
=
"
divider
"
><
/div
>
<
/li
>
<
/ul
>
<
ul
>
<
li
@
click
=
"
toggleDrawer
"
>
<
router
-
link
:
to
=
"
{ name: 'user-search'
}
"
>
{{
$t
(
"
nav.user_search
"
)
}}
...
...
@@ -78,7 +78,10 @@
<
/li
>
<
/ul
>
<
/div
>
<
div
class
=
"
side-drawer-click-outside
"
@
click
.
stop
.
prevent
=
"
toggleDrawer
"
:
class
=
"
{'side-drawer-click-outside-closed': closed
}
"
><
/div
>
<
div
class
=
"
side-drawer-click-outside
"
@
click
.
stop
.
prevent
=
"
toggleDrawer
"
:
class
=
"
{'side-drawer-click-outside-closed': closed
}
"
><
/div
>
<
/div
>
<
/template
>
...
...
@@ -114,8 +117,8 @@
}
.
side
-
drawer
{
overflow
-
x
:
hidden
;
/* Disable horizontal scroll */
transition
:
0.5
s
;
/* 0.5 second transition effect to slide in the sidenav */
overflow
-
x
:
hidden
;
transition
:
0.5
s
;
transition
-
timing
-
function
:
cubic
-
bezier
(
0
,
1
,
0.5
,
1
);
margin
:
0
0
0
-
100
px
;
padding
:
0
0
1
em
100
px
;
...
...
@@ -159,18 +162,20 @@
list
-
style
:
none
;
margin
:
0
;
padding
:
0
;
border
-
bottom
:
1
px
solid
;
border
-
color
:
$fallback
--
border
;
border
-
color
:
var
(
--
border
,
$fallback
--
border
);
margin
:
0.2
em
0
;
}
.
side
-
drawer
ul
:
last
-
child
{
border
:
0
;
}
.
side
-
drawer
li
{
padding
:
0
;
.
divider
{
border
-
top
:
1
px
solid
;
border
-
color
:
$fallback
--
border
;
border
-
color
:
var
(
--
border
,
$fallback
--
border
);
margin
:
0.2
em
0
;
}
a
{
display
:
block
;
padding
:
0.5
em
0.85
em
;
...
...
@@ -181,8 +186,4 @@
}
}
}
.
side
-
drawer
li
:
last
-
child
{
border
:
none
;
}
<
/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