Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
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
Matrix-Sasuke
pleroma-fe
Commits
4cc73cfe
Commit
4cc73cfe
authored
7 years ago
by
Shpuld Shpludson
Browse files
Options
Downloads
Patches
Plain Diff
Get rid of the js to scale sidepanel, add an additional div and a css class to fix the same issue.
parent
d7e4279c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/App.js
+0
-23
0 additions, 23 deletions
src/App.js
src/App.scss
+8
-4
8 additions, 4 deletions
src/App.scss
src/App.vue
+8
-6
8 additions, 6 deletions
src/App.vue
with
16 additions
and
33 deletions
src/App.js
+
0
−
23
View file @
4cc73cfe
...
...
@@ -23,18 +23,6 @@ export default {
style
()
{
return
{
'
background-image
'
:
`url(
${
this
.
background
}
)`
}
},
sitename
()
{
return
this
.
$store
.
state
.
config
.
name
}
},
created
()
{
// this is to detect user zooming mostly
window
.
addEventListener
(
'
resize
'
,
this
.
fixSidebarWidth
)
},
mounted
()
{
// for some reason, at least in dev mode, dom is not ready enough at this point
// in theory calling the function directly here should be enough, but it's not
setTimeout
(()
=>
{
this
.
fixSidebarWidth
()
},
500
)
},
destroyed
()
{
window
.
removeEventListener
(
'
resize
'
,
this
.
fixSidebarWidth
)
},
methods
:
{
activatePanel
(
panelName
)
{
this
.
mobileActivePanel
=
panelName
...
...
@@ -44,17 +32,6 @@ export default {
},
logout
()
{
this
.
$store
.
dispatch
(
'
logout
'
)
},
fixSidebarWidth
()
{
// firefox
let
barwidth
=
window
.
innerWidth
-
document
.
body
.
offsetWidth
if
(
document
.
body
.
offsetWidth
<=
0
)
{
// chromium
barwidth
=
window
.
innerWidth
-
document
.
body
.
scrollWidth
}
// adjust the sidebar size to fit the scrollbar width to keep the gap consistently sized
document
.
getElementById
(
'
sidebar-container
'
).
style
.
width
=
`
${
345
+
barwidth
}
px`
document
.
getElementById
(
'
sidebar-container
'
).
style
.
paddingRight
=
`
${
barwidth
}
px`
}
}
}
This diff is collapsed.
Click to expand it.
src/App.scss
+
8
−
4
View file @
4cc73cfe
...
...
@@ -190,7 +190,7 @@ nav {
flex-shrink
:
1
;
}
.sidebar
{
.sidebar
-bounds
{
flex
:
0
;
flex-basis
:
35%
;
}
...
...
@@ -221,21 +221,25 @@ nav {
body
{
overflow-y
:
scroll
;
}
.sidebar
{
.sidebar
-bounds
{
overflow
:
hidden
;
max-height
:
100vh
;
width
:
345px
;
position
:
fixed
;
margin-top
:
-10px
;
.sidebar-
contain
er
{
.sidebar-
scroll
er
{
height
:
96vh
;
width
:
365px
;
padding-top
:
10px
;
padding-right
:
2
0px
;
padding-right
:
5
0px
;
overflow-x
:
hidden
;
overflow-y
:
scroll
;
}
.sidebar
{
width
:
345px
;
}
}
.sidebar-flexer
{
max-height
:
96vh
;
...
...
This diff is collapsed.
Click to expand it.
src/App.vue
+
8
−
6
View file @
4cc73cfe
<
template
>
<div
id=
"app"
v-bind:style=
"style"
class=
"base02-background"
>
<nav
class=
'container base01-background base04'
@
click=
"scrollToTop()"
>
<nav
class=
'container base01-background base04'
@
click=
"scrollToTop()"
id=
"nav"
>
<div
class=
'inner-nav'
:style=
"logoStyle"
>
<div
class=
'item'
>
<router-link
:to=
"
{ name: 'root'}">
{{
sitename
}}
</router-link>
...
...
@@ -18,11 +18,13 @@
<button
@
click=
"activatePanel('timeline')"
class=
"base01-background base04"
>
Timeline
</button>
</div>
<div
class=
"sidebar-flexer"
:class=
"
{ 'mobile-hidden': mobileActivePanel != 'sidebar'}">
<div
class=
"sidebar"
:class=
"
{ 'mobile-hidden': mobileActivePanel != 'sidebar' }">
<div
class=
"sidebar-container"
id=
"sidebar-container"
>
<user-panel></user-panel>
<nav-panel></nav-panel>
<notifications
v-if=
"currentUser"
></notifications>
<div
class=
"sidebar-bounds"
>
<div
class=
"sidebar-scroller"
>
<div
class=
"sidebar"
>
<user-panel></user-panel>
<nav-panel></nav-panel>
<notifications
v-if=
"currentUser"
></notifications>
</div>
</div>
</div>
</div>
...
...
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