From d4cdb9ca6b09444d5f970cfd0e8bc3c81f287b62 Mon Sep 17 00:00:00 2001
From: baiyaaaaa <bigpet1991@gmail.com>
Date: Tue, 27 Sep 2016 23:02:46 +0800
Subject: [PATCH] fixed row flex align bug

---
 CHANGELOG.md                       | 1 +
 examples/docs/layout.md            | 3 +--
 packages/theme-default/src/row.css | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cae1b8d2c..31daa3bd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - 修复 vue-popper 引入 popper 路径错误
 - 修复 DatePicker 初始值是合法时间类型但无法设置成功的问题
 - 修复 Pagination 的图标没有正确切换样式, #163
+- 修复 Row 组件 align 属性不生效的问题
 
 #### 非兼容性更新
 - Menu 组件的 `unique-opend` 属性修正为 `unique-opened`
diff --git a/examples/docs/layout.md b/examples/docs/layout.md
index 5942cb0f4..9affb3fd1 100644
--- a/examples/docs/layout.md
+++ b/examples/docs/layout.md
@@ -7,7 +7,6 @@
       }
     }
     .el-col {
-      height: 36px;
       border-radius: 4px;
     }
     .bg-purple-dark {
@@ -20,8 +19,8 @@
       background: #e5e9f2;
     }
     .grid-content {
-      height: 100%;
       border-radius: 4px;
+      min-height: 36px;
     }
     .row-bg {
       padding: 10px 0;
diff --git a/packages/theme-default/src/row.css b/packages/theme-default/src/row.css
index 0dc738651..062ab1116 100644
--- a/packages/theme-default/src/row.css
+++ b/packages/theme-default/src/row.css
@@ -26,6 +26,13 @@
       @when justify-space-around {
         justify-content: space-around;
       }
+
+      @when align-middle {
+        align-items: center;
+      }
+      @when align-bottom {
+        align-items: flex-end;
+      }
     }
 
   }