Skip to content

Commit

Permalink
Merge pull request #495 from DaoCloud/release/1.0.1
Browse files Browse the repository at this point in the history
Release/1.0.1
  • Loading branch information
CIN authored May 2, 2018
2 parents cc550ed + 5a8dca0 commit ad343b4
Show file tree
Hide file tree
Showing 10 changed files with 356 additions and 336 deletions.
17 changes: 17 additions & 0 deletions changelogs/v1.0.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<a name="1.0.1"></a>
# 1.0.1 (2018-05-02)


## Bug Fixes

- **alert:** 2.3.0 版本下 id 选择器失效
([753b6831](https://github.com/DaoCloud/dao-style-vue/commit/753b68316d165a8d51fd19decf720463e8fbddcd))
- **vertical-align:** 修复全局 icon 和 text 的 vertical align 问题
([adc9cfab](https://github.com/DaoCloud/dao-style-vue/commit/adc9cfab96ef28ec83a3545607663ac013267da5))


## Performance Improvements

- **popover:** v-show -> v-if
([658a98f4](https://github.com/DaoCloud/dao-style-vue/commit/658a98f4971672f33730212c1124b2ff67572da2))

4 changes: 2 additions & 2 deletions dist/dao-style.min.js

Large diffs are not rendered by default.

641 changes: 320 additions & 321 deletions dist/styles/dao-style.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
],
"scripts": {
"start": "webpack-dev-server --hot --inline --progress --config build/webpack.dev.config.js",
"dev": "webpack --config build/webpack.dev.config.js",
"dist": "cross-env NODE_ENV=production webpack --config build/webpack.prod.config.js",
"lint": "eslint --fix --ext .js,.vue src",
"unit": "karma start test/unit/karma.conf.js --single-run",
Expand Down
6 changes: 2 additions & 4 deletions src/components/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,12 @@ svg.icon {
width: 16px;
height: 16px;

// 为了配合解决 dao-btn 在最新版 firefox 下面 svg 偏下的问题
vertical-align: top;
vertical-align: middle;

fill: currentColor;
& + .text {
display: inline-block;

// 为了解决 dao-btn 在最新版 firefox 下面 svg 偏下的问题
vertical-align: top;
vertical-align: middle;
}
}
8 changes: 8 additions & 0 deletions src/components/dao-button/dao-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@
pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
cursor: $cursor-disabled;
}
svg.icon {
// 为了配合解决 dao-btn 在最新版 firefox 下面 svg 偏下的问题
vertical-align: top;
& + .text {
// 为了解决 dao-btn 在最新版 firefox 下面 svg 偏下的问题
vertical-align: top;
}
}
}

a.dao-btn {
Expand Down
5 changes: 1 addition & 4 deletions src/components/dao-input/dao-input.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@
&.message-bottom {
flex-direction: column;
align-items: flex-start;
// 统一 vertical-align,解决没有垂直对齐的问题
vertical-align: top;
.dao-input-message {
margin: 6px 0 0;
}
Expand Down Expand Up @@ -397,8 +395,7 @@
word-break: break-all;
margin-left: 10px;
> span {
// 统一 vertical-align,解决没有垂直对齐的问题
vertical-align: top;
vertical-align: middle;
}
@at-root .no-message-icon & > .icon {
display: none;
Expand Down
6 changes: 3 additions & 3 deletions src/components/dao-message-box/dao-message.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<dao-dialog
id="dao-alert"
class="dao-alert"
@closed="onClosed"
:size="size"
:header="header"
Expand Down Expand Up @@ -134,8 +134,8 @@
};
</script>

<style scoped lang="scss">
#dao-alert{
<style lang="scss">
.dao-alert{
.dialog-body {
padding: 20px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/dao-popover/dao-popover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<path class="pt-popover-arrow-fill" d="M8.787 7.036c1.22-1.125 2.21-3.376 2.21-5.03V0v30-2.005c0-1.654-.983-3.9-2.21-5.03l-7.183-6.616c-.81-.746-.802-1.96 0-2.7l7.183-6.614z"></path>
</svg>
</div>
<div :class="[prefixCls + '-inner']">
<div :class="[prefixCls + '-inner']" v-if="realVisible">
<slot name="content">{{content}}</slot>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion version.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable */
// this version shows current version of project
var VERSION = '1.0.0';
var VERSION = '1.0.1';
module.exports = { VERSION: VERSION };
// ’make release‘ 依赖 console.log 把打印到标准输出, 不可删除
console.log(VERSION);

0 comments on commit ad343b4

Please sign in to comment.