Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
diasporg
diaspora
Commits
3f700c39
Unverified
Commit
3f700c39
authored
Dec 05, 2018
by
flaburgan
Committed by
Benjamin Neff
Jan 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix photos galley when too many thumbnails by adding a scroll-x
fixes #7942 closes #7943
parent
c8a1f308
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
Changelog.md
Changelog.md
+1
-0
app/assets/javascripts/app/views/gallery_view.js
app/assets/javascripts/app/views/gallery_view.js
+1
-1
app/assets/stylesheets/gallery.scss
app/assets/stylesheets/gallery.scss
+4
-2
No files found.
Changelog.md
View file @
3f700c39
...
...
@@ -6,6 +6,7 @@
## Bug fixes
*
Do not autofollow back a user you are ignoring
[
#7913
](
https://github.com/diaspora/diaspora/pull/7913
)
*
Fix photos gallery when too many thumbnails are shown
[
#7943
](
https://github.com/diaspora/diaspora/pull/7943
)
## Features
*
Suppoert ignore users on mobile
[
#7884
](
https://github.com/diaspora/diaspora/pull/7884
)
...
...
app/assets/javascripts/app/views/gallery_view.js
View file @
3f700c39
...
...
@@ -41,7 +41,7 @@ app.views.Gallery = app.views.Base.extend({
if
(
image
.
naturalHeight
>
window
.
innerHeight
&&
image
.
naturalHeight
>
image
.
naturalWidth
*
2
)
{
image
.
classList
.
add
(
"
too-tall
"
);
}
else
{
var
margins
=
95
;
// Margins are 80px for thumbnails height and 15px for top image margin
var
margins
=
110
;
// Margins are 80px for thumbnails height and 15px for top image margin + scroll-x height
image
.
style
=
"
max-height:
"
+
(
window
.
innerHeight
-
margins
)
+
"
px
"
;
}
}
...
...
app/assets/stylesheets/gallery.scss
View file @
3f700c39
...
...
@@ -50,15 +50,17 @@ $margin: 15px;
.indicator
{
bottom
:
0
;
overflow-x
:
auto
;
white-space
:
nowrap
;
li
{
border
:
0
;
border-radius
:
$thumbnail-size
/
2
;
height
:
$thumbnail-size
;
margin
:
6px
;
margin-bottom
:
$margin
;
margin
:
$margin
6px
;
vertical-align
:
middle
;
width
:
$thumbnail-size
;
background-size
:
cover
;
&
.active
,
&
:hover
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment