Fix text feature alignment #4

getgrav · Jul 25, 2018 · 1128b7e · 1128b7e
1 parent 26e86a6
commit 1128b7e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
     * Added blueprint option for `continue_link` [#45](https://github.com/getgrav/grav-theme-quark/issues/45)
     * Added blueprint option for Feature `class` [#14](https://github.com/getgrav/grav-theme-quark/issues/14)
     * Fixed `Duplicate ID` issues with modular sections.  Might break CSS on first load, need to refresh to pick up new CSS [#24](https://github.com/getgrav/grav-theme-quark/issues/24)
+    * Fixed Text feature alignment issue [#7](https://github.com/getgrav/grav-theme-quark/issues/4)
 
 # v1.0.3
 ## 05/11/2018

diff --git a/css-compiled/theme.css b/css-compiled/theme.css
diff --git a/css-compiled/theme.min.css b/css-compiled/theme.min.css
diff --git a/scss/theme/_onepage.scss b/scss/theme/_onepage.scss
@@ -115,4 +115,8 @@
 .modular-text {
   padding-top: 4rem;
   padding-bottom: 4rem;
+
+  .columns.left {
+    flex-direction: row-reverse;
+  }
 }
diff --git a/templates/modular/text.html.twig b/templates/modular/text.html.twig
@@ -3,13 +3,13 @@
 
 <section class="section modular-text {{ page.header.class}} bg-gray">
     <section class="container {{ grid_size }}">
-        <div class="columns">
+        <div class="columns {{ page.header.image_align|default('align-right') }}">
             <div class="column col-6 col-md-12">
                 {{ content }}
             </div>
             <div class="column col-6 col-md-12">
                 {% if image %}
-                    {{ image.html('','','align-'~page.header.image_align) }}
+                    {{ image.html }}
                 {% endif %}
             </div>
         </div>