templates/fluid: Tweak image sizes

Tested on various common resolutions with standard browser and system toolbars.

2 files changed, 11 insertions, 11 deletions

diff --git a/templates/fluid/fluid.xml b/templates/fluid/fluid.xml
index ff4baee..ad6cb89 100644
--- a/templates/fluid/fluid.xml
+++ b/templates/fluid/fluid.xml
@@ -3,15 +3,15 @@
 
   <image_sizes>
     <size name="original">
-      <landscape w="1423" h="800" />
-      <portrait w="1000" h="1000" />
+      <landscape w="1504" h="846" />
+      <portrait w="872" h="872" />
       <quality value="95" />
       <fallback size="preview" />
       <threshold no_resize="25" availability="155" quality="5" />
     </size>
 
     <size name="preview" tagname="preview">
-      <landscape w="1067" h="600" />
+      <landscape w="1210" h="680" />
       <portrait w="800" h="800" />
       <quality value="95" />
       <threshold no_resize="10" availability="10" quality="5" />
@@ -19,12 +19,12 @@
 
     <size name="thumbnail" type="thumbnail" style="fixed">
       <crop w="495" h="330" />
-      <quality value="70" />
+      <quality value="80" />
     </size>
 
     <size name="hires">
-      <landscape w="1897" h="1067" />
-      <portrait w="1200" h="1200" />
+      <landscape w="2070" h="1164" />
+      <portrait w="1190" h="1190" />
       <quality value="95" />
       <fallback size="original" />
       <threshold no_resize="20" availability="20" quality="5" />
diff --git a/templates/fluid/template_album.html b/templates/fluid/template_album.html
index dbfb8d5..6f08b81 100644
--- a/templates/fluid/template_album.html
+++ b/templates/fluid/template_album.html
@@ -10,13 +10,13 @@
         <script type="text/javascript">var NUM_PHOTOS = $(TOTAL_ITEMS);</script>
 	<script type="text/javascript" src="$(TEMPLATES_PATH)scripts.js">onLoad();</script>
 	<style>
-@media screen and (min-width: 1600px) {<!-- $(BEGIN_IMG_LIST) -->
+@media screen and (min-width: 1700px) {<!-- $(BEGIN_IMG_LIST) -->
 <!-- $(BEGIN_LIST_PICTURE_ALL_SIZES) --><!-- $(ifdef(HAVE_IMG_SIZE_ORIGINAL)) -->
   div.photo#photo-$(ITEM_INDEX) img {  width: $(IMG_SIZE_W__ORIGINAL)px;  height: $(IMG_SIZE_H__ORIGINAL)px;  }<!-- $(endif(HAVE_IMG_SIZE_ORIGINAL)) --><!-- $(END_LIST_PICTURE_ALL_SIZES) -->
 <!-- $(END_IMG_LIST) -->
 }
 
-@media screen and (min-width: 2100px) {<!-- $(BEGIN_IMG_LIST) -->
+@media screen and (min-width: 2300px) {<!-- $(BEGIN_IMG_LIST) -->
 <!-- $(BEGIN_LIST_PICTURE_ALL_SIZES) --><!-- $(ifdef(HAVE_IMG_SIZE_HIRES)) -->
   div.photo#photo-$(ITEM_INDEX) img {  width: $(IMG_SIZE_W__HIRES)px;  height: $(IMG_SIZE_H__HIRES)px;  }<!-- $(endif(HAVE_IMG_SIZE_HIRES)) --><!-- $(END_LIST_PICTURE_ALL_SIZES) -->
 <!-- $(END_IMG_LIST) -->
@@ -61,9 +61,9 @@
       <div class="photo" id="photo-$(ITEM_INDEX)">
         <div class="position_marker" id="i$(ITEM_INDEX)"></div>
         <picture>
-          <!-- $(ifdef(HAVE_IMG_SIZE_HIRES)) --><source media="(min-width: 2100px)" srcset="$(IMG_SRC__HIRES)$(ifdef(HAVE_IMG_SIZE_HIRES_HIDPI_1.5X)), $(IMG_SRC__HIRES_HIDPI_1.5X) 1.5x$(endif(HAVE_IMG_SIZE_HIRES_HIDPI_1.5X))$(ifdef(HAVE_IMG_SIZE_HIRES_HIDPI_2X)), $(IMG_SRC__HIRES_HIDPI_2X) 2x$(endif(HAVE_IMG_SIZE_HIRES_HIDPI_2X))"><!-- $(endif(HAVE_IMG_SIZE_HIRES)) -->
-          <!-- $(ifdef(HAVE_IMG_SIZE_ORIGINAL)) --><source media="(min-width: 1600px)" srcset="$(IMG_SRC__ORIGINAL)$(ifdef(HAVE_IMG_SIZE_ORIGINAL_HIDPI_1.5X)), $(IMG_SRC__ORIGINAL_HIDPI_1.5X) 1.5x$(endif(HAVE_IMG_SIZE_ORIGINAL_HIDPI_1.5X))$(ifdef(HAVE_IMG_SIZE_ORIGINAL_HIDPI_2X)), $(IMG_SRC__ORIGINAL_HIDPI_2X) 2x$(endif(HAVE_IMG_SIZE_ORIGINAL_HIDPI_2X))"><!-- $(endif(HAVE_IMG_SIZE_ORIGINAL)) -->
-          <source media="(max-width: 1600px)" srcset="$(IMG_SRC)$(ifdef(HAVE_IMG_SIZE_PREVIEW_HIDPI_1.5X)), $(IMG_SRC__PREVIEW_HIDPI_1.5X) 1.5x$(endif(HAVE_IMG_SIZE_PREVIEW_HIDPI_1.5X))$(ifdef(HAVE_IMG_SIZE_PREVIEW_HIDPI_2X)), $(IMG_SRC__PREVIEW_HIDPI_2X) 2x$(endif(HAVE_IMG_SIZE_PREVIEW_HIDPI_2X))">
+          <!-- $(ifdef(HAVE_IMG_SIZE_HIRES)) --><source media="(min-width: 2300px)" srcset="$(IMG_SRC__HIRES)$(ifdef(HAVE_IMG_SIZE_HIRES_HIDPI_1.5X)), $(IMG_SRC__HIRES_HIDPI_1.5X) 1.5x$(endif(HAVE_IMG_SIZE_HIRES_HIDPI_1.5X))$(ifdef(HAVE_IMG_SIZE_HIRES_HIDPI_2X)), $(IMG_SRC__HIRES_HIDPI_2X) 2x$(endif(HAVE_IMG_SIZE_HIRES_HIDPI_2X))"><!-- $(endif(HAVE_IMG_SIZE_HIRES)) -->
+          <!-- $(ifdef(HAVE_IMG_SIZE_ORIGINAL)) --><source media="(min-width: 1700px)" srcset="$(IMG_SRC__ORIGINAL)$(ifdef(HAVE_IMG_SIZE_ORIGINAL_HIDPI_1.5X)), $(IMG_SRC__ORIGINAL_HIDPI_1.5X) 1.5x$(endif(HAVE_IMG_SIZE_ORIGINAL_HIDPI_1.5X))$(ifdef(HAVE_IMG_SIZE_ORIGINAL_HIDPI_2X)), $(IMG_SRC__ORIGINAL_HIDPI_2X) 2x$(endif(HAVE_IMG_SIZE_ORIGINAL_HIDPI_2X))"><!-- $(endif(HAVE_IMG_SIZE_ORIGINAL)) -->
+          <source media="(max-width: 1699px)" srcset="$(IMG_SRC)$(ifdef(HAVE_IMG_SIZE_PREVIEW_HIDPI_1.5X)), $(IMG_SRC__PREVIEW_HIDPI_1.5X) 1.5x$(endif(HAVE_IMG_SIZE_PREVIEW_HIDPI_1.5X))$(ifdef(HAVE_IMG_SIZE_PREVIEW_HIDPI_2X)), $(IMG_SRC__PREVIEW_HIDPI_2X) 2x$(endif(HAVE_IMG_SIZE_PREVIEW_HIDPI_2X))">
           <img src="$(IMG_SRC)" width="$(IMG_SIZE_W)" height="$(IMG_SIZE_H)" alt="" id="$(value(BORDER_STYLE))"/>
         </picture>
         <div class="photo-content">