From 2e7b3df426fb50e18d5ddd70d35d82e8b41c5a1c Mon Sep 17 00:00:00 2001
From: Rijn <bxbian951122@gmail.com>
Date: Fri, 21 Jul 2017 11:26:48 -0500
Subject: [PATCH] Restrict no-animation config only affect one layer of children

---
 examples/routers/tabs.vue       |  9 ++++++++-
 src/styles/components/tabs.less |  2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/examples/routers/tabs.vue b/examples/routers/tabs.vue
index ea1f6be..421defb 100644
--- a/examples/routers/tabs.vue
+++ b/examples/routers/tabs.vue
@@ -1,5 +1,12 @@
 <template>
-    <Tabs value="name1" :animated="true">
+    <Tabs value="name1" :animated="false">
+        <Tab-pane label="test" name="test">
+            <Tabs type="card" v-bind:animated="true">
+                <Tab-pane label="标签2一">标签2一的内容</Tab-pane>
+                <Tab-pane label="标签2二">标签2二的内容</Tab-pane>
+                <Tab-pane label="标签2三">标签2三的内容</Tab-pane>
+            </Tabs>
+        </Tab-pane>
         <Tab-pane :label="label1" name="name1">
             <Table :columns="columns1" :data="data1"></Table>
         </Tab-pane>
diff --git a/src/styles/components/tabs.less b/src/styles/components/tabs.less
index 6aad844..fef5af4 100644
--- a/src/styles/components/tabs.less
+++ b/src/styles/components/tabs.less
@@ -198,7 +198,7 @@
 }
 
 .@{tabs-prefix-cls}-no-animation{
-    .@{tabs-prefix-cls}-content {
+    > .@{tabs-prefix-cls}-content {
         transform: none!important;
 
         > .@{tabs-prefix-cls}-tabpane-inactive {
--
libgit2 0.21.4