github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9428 from Leopoldthecoder/dialog/style 

Dialog: update paddings
pull/8693/merge
Hi-Linlin 2018-01-24 18:08:02 +08:00 committed by GitHub
parent bd47ee7d6e 81a7ef7634
commit b4590d6b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/bin/build-entry.js
View File

@ -46,7 +46,7 @@ const install = function(Vue, opts = {}) {
/* istanbul ignore if */ /* istanbul ignore if */
if (typeof window !== 'undefined' && window.Vue) { if (typeof window !== 'undefined' && window.Vue) {
install(window.Vue); install(window.Vue);
}; }
module.exports = { module.exports = {
version: '{{version}}', version: '{{version}}',

2
packages/theme-chalk/src/common/var.scss
View File

@ -471,7 +471,7 @@ $--dialog-close-hover-color: $--color-primary !default;
$--dialog-title-font-size: $--font-size-large !default; $--dialog-title-font-size: $--font-size-large !default;
$--dialog-font-size: 14px !default; $--dialog-font-size: 14px !default;
$--dialog-line-height: $--font-line-height-primary !default; $--dialog-line-height: $--font-line-height-primary !default;
$--dialog-padding-primary: 15px !default; $--dialog-padding-primary: 20px !default;
/* Table /* Table
-------------------------- */ -------------------------- */

8
packages/theme-chalk/src/dialog.scss
View File

@ -3,7 +3,6 @@
@import "common/var"; @import "common/var";
@import "common/popup"; @import "common/popup";
@include b(dialog) { @include b(dialog) {
position: relative; position: relative;
margin: 0 auto 50px; margin: 0 auto 50px;
@ -82,18 +81,13 @@
@include m(center) { @include m(center) {
text-align: center; text-align: center;
@include e(header) {
padding-top: 30px;
}
@include e(body) { @include e(body) {
text-align: initial; text-align: initial;
padding: 25px ($--dialog-padding-primary + 12px) 30px; padding: 25px ($--dialog-padding-primary + 5px) 30px;
} }
@include e(footer) { @include e(footer) {
text-align: inherit; text-align: inherit;
padding-bottom: 30px;
} }
} }
} }

2
src/index.js
View File

@ -168,7 +168,7 @@ const install = function(Vue, opts = {}) {
/* istanbul ignore if */ /* istanbul ignore if */
if (typeof window !== 'undefined' && window.Vue) { if (typeof window !== 'undefined' && window.Vue) {
install(window.Vue); install(window.Vue);
}; }
module.exports = { module.exports = {
version: '2.0.11', version: '2.0.11',