fix: Modal组件footer内边距调整

aliqin · Mar 8, 2017 · 4090a7b · 4090a7b
1 parent a5c4dc7
commit 4090a7b
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 17 deletions.
diff --git a/dist/atui.js b/dist/atui.js
diff --git a/dist/atuiFilter.js b/dist/atuiFilter.js
diff --git a/dist/atuiWidget.js b/dist/atuiWidget.js
diff --git a/dist/greater-blue.css b/dist/greater-blue.css
diff --git a/dist/style.js b/dist/style.js
diff --git a/dist/tao-orange.css b/dist/tao-orange.css
diff --git a/dist/tmall-red.css b/dist/tmall-red.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "atui",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "components built with Vue.js",
   "main": "dist/atui.js",
   "repository": {

diff --git a/src/components/Tabs/demo/basic.md b/src/components/Tabs/demo/basic.md
@@ -28,7 +28,7 @@ title:
 new Vue({
   el: 'body',
   components: {
-    vTabs: atui.Tabset,
+    vTabs: atui.Tabs,
     vTab: atui.Tabset.Tab
   }
 })

diff --git a/src/index.js b/src/index.js
@@ -60,6 +60,9 @@ const { Tab } = Tabset
 
 const { TreeNode } = Tree
 
+// 兼容老的tabs
+const Tabs = Tabset
+
 const VueComponent = {
   Layout,
   Col,
@@ -97,6 +100,7 @@ const VueComponent = {
   Accordion,
   Popover,
   Tabset,
+  Tabs,
   Tab,
   Steps,
   Step,

diff --git a/src/styles/modals.less b/src/styles/modals.less
@@ -14,6 +14,7 @@
 @modal-content-border-color: rgba(0, 0, 0, .2);
 @modal-content-fallback-border-color: #999;
 @modal-backdrop-bg: #000;
+@modal-footer-padding: 10px 16px 10px 10px;
 @modal-header-border-color: #e5e5e5;
 @modal-footer-border-color: @modal-header-border-color;
 @modal-lg: 900px;
@@ -87,8 +88,7 @@
 }
 
 .@{prefix-cls-modal}-footer {
-    padding: @modal-inner-padding;
-    padding-top: 0;
+    padding: @modal-footer-padding;
     font-size: 0px; // 消除inline-block元素间默认的间隙
     text-align: right;
     &:extend(.clearfix all);