From a309ff47685486be5f8ba0db872b222974672d40 Mon Sep 17 00:00:00 2001
From: Marco Mastrodonato <m.mastrodonato@gmail.com>
Date: Thu, 20 Jun 2019 15:20:20 +0200
Subject: [PATCH] Added columns and column support

Now each column component inside columns is shown correctly. Previously it was put at the bottom thus breaking the layout.
---
 CHANGELOG.md                                             | 6 ++++++
 .../stylesheets/active_material/components/columns.scss  | 3 +++
 .../stylesheets/active_material/components/grid.scss     | 9 +++++++++
 lib/active_material/version.rb                           | 2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/stylesheets/active_material/components/columns.scss
 create mode 100644 app/assets/stylesheets/active_material/components/grid.scss

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5b783f..90f70ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.4.2
+
+- Added columns and column support:
+  Now each column component inside columns is shown correctly. Previously it was put at the bottom
+  thus breaking the layout.
+
 ## 1.4.1
 
 - Add `!default` flag to `$am-theme-error-400` color
diff --git a/app/assets/stylesheets/active_material/components/columns.scss b/app/assets/stylesheets/active_material/components/columns.scss
new file mode 100644
index 0000000..8bf6d09
--- /dev/null
+++ b/app/assets/stylesheets/active_material/components/columns.scss
@@ -0,0 +1,3 @@
+.columns {
+  margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/active_material/components/grid.scss b/app/assets/stylesheets/active_material/components/grid.scss
new file mode 100644
index 0000000..f805124
--- /dev/null
+++ b/app/assets/stylesheets/active_material/components/grid.scss
@@ -0,0 +1,9 @@
+// -------------------------------------- Index as Grid
+table.index_grid td { border: none; background: none; padding: 0 20px 20px 0; margin: 0;}
+
+// -------------------------------------- Columns
+.columns {
+  clear: both;
+  padding: 0;
+  .column { float: left; }
+}
\ No newline at end of file
diff --git a/lib/active_material/version.rb b/lib/active_material/version.rb
index 5a2c013..de02f08 100644
--- a/lib/active_material/version.rb
+++ b/lib/active_material/version.rb
@@ -1,3 +1,3 @@
 module ActiveMaterial
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end