Updated to version 1.6.0

* Fixed nested colours

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 73cde4aeda85918524980204c76162369c071429..c62f3210659966e30b039d7e129316adc7f1a87f 100644 (file)
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -6,13 +6,13 @@ networks:
         driver: overlay
 services:
     navigator:
         driver: overlay
 services:
     navigator:

-        image: cjpalmer/gallery-navigator:1.5.0
+        image: cjpalmer/gallery-navigator:1.6.0

         volumes:
         - gallery_data:/app/gallery
         networks:
         - backend
     server:
         volumes:
         - gallery_data:/app/gallery
         networks:
         - backend
     server:

-        image: cjpalmer/gallery-server:1.5.0
+        image: cjpalmer/gallery-server:1.6.0

         volumes:
         - gallery_data:/data/images
         depends_on:
         volumes:
         - gallery_data:/data/images
         depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
index 66109604f15645a513a70d7b91c5cdc287195e9d..56a649b850bc5e91cb9a8ffbb0a97af6471f9005 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     navigator:
         build: ./navigator
 services:
     navigator:
         build: ./navigator

-        image: cjpalmer/gallery-navigator:1.5.0
+        image: cjpalmer/gallery-navigator:1.6.0

         volumes:
         - ./navigator/app:/app # dev testing
         - gallery_data_dev:/app/gallery
         volumes:
         - ./navigator/app:/app # dev testing
         - gallery_data_dev:/app/gallery


@@ -10,7 +10,7 @@ services:
             FLASK_DEBUG: 1
     server:
         build: ./server
             FLASK_DEBUG: 1
     server:
         build: ./server

-        image: cjpalmer/gallery-server:1.5.0
+        image: cjpalmer/gallery-server:1.6.0

         volumes:
         - gallery_data_dev:/data/images
         ports:
         volumes:
         - gallery_data_dev:/data/images
         ports:

diff --git a/navigator/app/templates/gallery.html b/navigator/app/templates/gallery.html
index 916ebef7830a9fbd77ffbc984c99656e90bc521d..d9404e08740cef6c59452c118fa5bd1007dd087d 100644 (file)
--- a/navigator/app/templates/gallery.html
+++ b/navigator/app/templates/gallery.html
@@ -9,9 +9,11 @@
     <div class="titlecard second-color">
     <h1>{{ title }}</h1>
 
     <div class="titlecard second-color">
     <h1>{{ title }}</h1>
 

-    <ul class="card" id="navigation">
+    <ul class="card third-color" id="navigation">

     {% for gallery in galleries %}
     {% for gallery in galleries %}

-        <li class="link third-color"><a href="{{ gallery }}">{{ gallery }}</a></li>
+        <li class="link fourth-color">
+            <a href="{{ gallery }}">{{ gallery }}</a>
+        </li>

     {% endfor %}
     </ul>
     </div>
     {% endfor %}
     </ul>
     </div>

diff --git a/navigator/app/templates/pages.html b/navigator/app/templates/pages.html
index 27e02801aedc05e3212951ad5d48c24b5fab2717..9b4a70de45693406664ad0bc1fe48e0d101a61e2 100644 (file)
--- a/navigator/app/templates/pages.html
+++ b/navigator/app/templates/pages.html
@@ -9,16 +9,18 @@
     <div class="titlecard second-color">
 
     {% if header %}
     <div class="titlecard second-color">
 
     {% if header %}

-    <div class="card second-color">
+    <div class="card third-color">

     {% autoescape false %}
     {{ header }}
     {% endautoescape %}
     </div>
     {% endif %}
 
     {% autoescape false %}
     {{ header }}
     {% endautoescape %}
     </div>
     {% endif %}
 

-    <ul class="card second-color" id="navigation">
+    <ul class="card third-color" id="navigation">

     {% for page in pages %}
     {% for page in pages %}

-        <li class="link third-color"><a href="{{ gallery }}/{{ page.number }}">{{ page.number }}</a></li>
+        <li class="link fourth-color">
+            <a href="{{ gallery }}/{{ page.number }}">{{ page.number }}</a>
+        </li>

     {% endfor %}
     </ul>
     </div>
     {% endfor %}
     </ul>
     </div>