aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOzoneGrif2020-02-02 21:25:17 +0100
committerGitHub2020-02-02 21:25:17 +0100
commitb68f037392f393f1d6781fdbd4f28ee4ddc79807 (patch)
tree10fffbaa494540cc7883ce3291de22ab89ded2c2
parent31d16f6fb20eb4935fc75e83bc565070ba7e5656 (diff)
parent85f0cf2403fecfbca0d14f6fc4ebdb6aaa199b54 (diff)
downloadldgallery-b68f037392f393f1d6781fdbd4f28ee4ddc79807.tar.gz
Merge pull request #82 from pacien/feature-gallery-thumbnail-size-tweak
Feature gallery thumbnail size tweak
-rw-r--r--compiler/src/Config.hs2
-rw-r--r--example/gallery.yaml2
-rw-r--r--ldgallery.1.md2
-rw-r--r--viewer/src/assets/scss/global.scss4
4 files changed, 5 insertions, 5 deletions
diff --git a/compiler/src/Config.hs b/compiler/src/Config.hs
index d670aae..4c9aa40 100644
--- a/compiler/src/Config.hs
+++ b/compiler/src/Config.hs
@@ -51,7 +51,7 @@ instance FromJSON CompilerConfig where
51 <*> v .:? "includedFiles" .!= ["*"] 51 <*> v .:? "includedFiles" .!= ["*"]
52 <*> v .:? "excludedFiles" .!= [] 52 <*> v .:? "excludedFiles" .!= []
53 <*> v .:? "tagsFromDirectories" .!= 0 53 <*> v .:? "tagsFromDirectories" .!= 0
54 <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 400) 54 <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 300)
55 <*> v .:? "pictureMaxResolution" 55 <*> v .:? "pictureMaxResolution"
56 56
57 57
diff --git a/example/gallery.yaml b/example/gallery.yaml
index dfb6265..ea23d8a 100644
--- a/example/gallery.yaml
+++ b/example/gallery.yaml
@@ -14,7 +14,7 @@ compiler:
14 14
15 thumbnailMaxResolution: 15 thumbnailMaxResolution:
16 width: 400 # default 16 width: 400 # default
17 height: 400 # default 17 height: 300 # default
18 18
19 pictureMaxResolution: 19 pictureMaxResolution:
20 width: 1024 20 width: 1024
diff --git a/ldgallery.1.md b/ldgallery.1.md
index 8784fb2..5612cbf 100644
--- a/ldgallery.1.md
+++ b/ldgallery.1.md
@@ -115,7 +115,7 @@ compiler.thumbnailMaxResolution.width
115: Maximum width in pixels of the item thumbnails, 400 by default. 115: Maximum width in pixels of the item thumbnails, 400 by default.
116 116
117compiler.thumbnailMaxResolution.height 117compiler.thumbnailMaxResolution.height
118: Maximum height in pixels of the item thumbnails, 400 by default. 118: Maximum height in pixels of the item thumbnails, 300 by default.
119 119
120compiler.pictureMaxResolution.width 120compiler.pictureMaxResolution.width
121: Maximum width in pixels of the picture items, unlimited by default. 121: Maximum width in pixels of the picture items, unlimited by default.
diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 1a5761e..4acaf13 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -85,9 +85,9 @@
85 display: flex; 85 display: flex;
86 flex-wrap: wrap; 86 flex-wrap: wrap;
87 align-items: center; 87 align-items: center;
88 justify-content: space-between; 88 justify-content: space-evenly;
89 & > div { 89 & > div {
90 margin: 1px; 90 margin: 2px;
91 } 91 }
92} 92}
93img { 93img {