update article page alignment

praekeltfoundation · Apr 10, 2018 · abd1c31 · abd1c31
1 parent bb1708d
commit abd1c31
Show file tree

Hide file tree

Showing 7 changed files with 13,849 additions and 5,153 deletions.
diff --git a/nurseconnect/static/dist/css/styles.css b/nurseconnect/static/dist/css/styles.css
diff --git a/nurseconnect/static/dist/css/styles.enhanced.css b/nurseconnect/static/dist/css/styles.enhanced.css
diff --git a/nurseconnect/static/src/sass/components.enhanced/ui/_organism-paper.scss b/nurseconnect/static/src/sass/components.enhanced/ui/_organism-paper.scss
@@ -100,20 +100,19 @@
         }
 
         figure {
+            margin: scale(beta) 0;
             width: 100%;
-            margin: scale(beta) auto;
-            padding: 0 scale(gamma);
             img {
                 width: 100%;
                 height: auto;
             }
         }
         figcaption {
-            padding: 0 scale(gamma);
+            padding: scale(alpha) scale(gamma) 0 0;
             font-family: serif;
             font-size: scale(beta);
             font-weight: 600;
-            text-align: center;
+            text-align: left;
         }
         &-list {
             clear: both;

diff --git a/nurseconnect/static/src/sass/components/ui/_organism-paper.scss b/nurseconnect/static/src/sass/components/ui/_organism-paper.scss
@@ -89,17 +89,16 @@
             padding: 0 0 0 1em;
         }
         figure {
+            margin: scale(alpha) 0;
             width: 100%;
-            margin: scale(alpha) auto;
-            padding: 0 scale(alpha);
             img {
-                max-width: 100%;
                 height: auto;
+                max-width: 100%;
                 margin: 0 auto;
             }
         }
         figcaption {
-            padding: 0 scale(alpha);
+            padding: scale(alpha) scale(alpha) 0 0;
             font-family: serif;
             font-weight: 600;
             text-align: center;

diff --git a/nurseconnect/templates/core/article_page.html b/nurseconnect/templates/core/article_page.html
@@ -78,10 +78,10 @@ <h1 class="Paper-headline">{{ self.title }}</h1>
                         <h2>{{ block.value }}</h2>
                     {% elif block.block_type == "image" %}
                         {% if block.value %}
-                            <figure>
-                                {% image block.value width-320 %}
-                                <figcaption>{{ block.value.title }}</figcaption>
-                            </figure>
+                        <figure>
+                            {% image block.value width-320 %}
+                            <figcaption>{{ block.value.title }}</figcaption>
+                        </figure>
                         {% endif %}
                     {% elif block.block_type == "numbered_list" %}
                         {% if block.value %}