Skip to content

Commit

Permalink
fix: 去掉rem
Browse files Browse the repository at this point in the history
  • Loading branch information
BoyuZhou committed Jan 5, 2018
1 parent 253e163 commit 3b19303
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 67 deletions.
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -65,6 +65,8 @@ import "./node_modules/bee-notification/build/Notification.css"
|onClose|关闭时触发的钩子函数|function|-|
|closable|是否可手动关闭|boolean|true|
|color|显示颜色|success/info/danger/warning/dark|-|
|className|类名|string|-|
|style|样式|object|-|

#### Notification

Expand All @@ -80,6 +82,8 @@ import "./node_modules/bee-notification/build/Notification.css"
|onExit|隐藏开始时的钩子函数|function|-|
|onExiting|隐藏进行时的钩子函数|function|-|
|onExited|隐藏结束时的钩子函数|function|-|
|className|类名|string|-|
|style|样式|object|-|

#### 开发调试

Expand Down
4 changes: 2 additions & 2 deletions build/Notification.css
Expand Up @@ -3,7 +3,7 @@
/* Navlayout */
.u-notification {
position: fixed;
z-index: 1000;
z-index: 1560;
width: 300px;
margin-right: 15px; }
.u-notification-topRight {
Expand All @@ -16,7 +16,7 @@
position: relative;
padding: 15px;
border-radius: 4px;
box-shadow: 0 0.3rem 0.4rem 0 rgba(0, 0, 0, 0.14), 0 0.3rem 0.3rem -0.2rem rgba(0, 0, 0, 0.2), 0 0.1rem 0.8rem 0 rgba(0, 0, 0, 0.12);
box-shadow: 0 3px 4px 0 rgba(0, 0, 0, 0.14), 0 3px 3px -2px rgba(0, 0, 0, 0.2), 0 1px 8px 0 rgba(0, 0, 0, 0.12);
background: rgb(66,66,66);
line-height: 1.5;
margin-bottom: 15px;
Expand Down
4 changes: 4 additions & 0 deletions docs/api.md
Expand Up @@ -14,6 +14,8 @@ Notification通知不同于操作类型的信息反馈,是一种主动推送
|onClose|关闭时触发的钩子函数|function|-|
|closable|是否可手动关闭|boolean|true|
|color|显示颜色|success/info/danger/warning/dark|-|
|className|类名|string|-|
|style|样式|object|-|

#### Notification

Expand All @@ -29,3 +31,5 @@ Notification通知不同于操作类型的信息反馈,是一种主动推送
|onExit|隐藏开始时的钩子函数|function|-|
|onExiting|隐藏进行时的钩子函数|function|-|
|onExited|隐藏结束时的钩子函数|function|-|
|className|类名|string|-|
|style|样式|object|-|
112 changes: 58 additions & 54 deletions package.json
@@ -1,55 +1,59 @@
{
"name": "bee-notification",
"version": "1.0.0",
"description": "Notification ui component for react",
"keywords": [
"react",
"react-component",
"bee-notification",
"iuap-design",
"tinper-bee",
"Notification"
],
"engines": {
"node": ">=4.0.0"
},
"homepage": "https://github.com/tinper-beebee-notification.git",
"author": "Yonyou FED",
"repository": "http://github.com/tinper-bee/bee-notification",
"bugs": "https://github.com/tinper-beebee-notification.git/issues",
"license": "MIT",
"main": "./build/index.js",
"config": {
"port": 3000
},
"scripts": {
"dev": "bee-tools run start",
"build": "bee-tools run build",
"lint": "bee-tools run lint",
"test": "bee-tools run test",
"chrome": "bee-tools run chrome",
"coveralls": "bee-tools run coverage",
"browsers": "bee-tools run browsers",
"pub": "bee-tools run pub"
},
"dependencies": {
"bee-animate": "latest",
"bee-button": "latest",
"classnames": "^2.2.5",
"tinper-bee-core": "latest"
},
"peerDependencies": {
"react": "^15.3.0 || ^16.0",
"react-dom": "^15.3.0 || ^16.0",
"prop-types": "15.6.0"
},
"devDependencies": {
"bee-layout": "latest",
"bee-panel": "latest",
"chai": "^3.5.0",
"console-polyfill": "~0.2.1",
"enzyme": "^2.4.1",
"es5-shim": "~4.1.10",
"react-addons-test-utils": "15.3.2"
}
}
"name": "bee-notification",
"version": "1.0.0",
"description": "Notification ui component for react",
"keywords": [
"react",
"react-component",
"bee-notification",
"iuap-design",
"tinper-bee",
"Notification"
],
"engines": {
"node": ">=4.0.0"
},
"homepage": "https://github.com/tinper-beebee-notification.git",
"author": "Yonyou FED",
"repository": "http://github.com/tinper-bee/bee-notification",
"bugs": "https://github.com/tinper-beebee-notification.git/issues",
"license": "MIT",
"main": "./build/index.js",
"config": {
"port": 3000,
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
},
"scripts": {
"dev": "bee-tools run start",
"build": "bee-tools run build",
"lint": "bee-tools run lint",
"test": "bee-tools run test",
"chrome": "bee-tools run chrome",
"coveralls": "bee-tools run coverage",
"browsers": "bee-tools run browsers",
"pub": "bee-tools run pub"
},
"dependencies": {
"bee-animate": "latest",
"bee-button": "latest",
"classnames": "^2.2.5",
"tinper-bee-core": "^0.4.1"
},
"peerDependencies": {
"react": "^15.3.0 || ^16.0",
"react-dom": "^15.3.0 || ^16.0",
"prop-types": "15.6.0"
},
"devDependencies": {
"bee-layout": "latest",
"bee-panel": "latest",
"chai": "^3.5.0",
"console-polyfill": "~0.2.1",
"cz-conventional-changelog": "^2.1.0",
"enzyme": "^2.4.1",
"es5-shim": "~4.1.10",
"react-addons-test-utils": "15.3.2"
}
}
1 change: 0 additions & 1 deletion src/Notification.js
Expand Up @@ -5,7 +5,6 @@ import Animate from 'bee-animate';
import createChainedFunction from 'tinper-bee-core/lib/createChainedFunction';
import classnames from 'classnames';
import Notice from './Notice';
import elementType from 'tinper-bee-core/lib/elementType';

let seed = 0;
const now = Date.now();
Expand Down
10 changes: 0 additions & 10 deletions src/Notification.scss
@@ -1,16 +1,6 @@
@import "../node_modules/tinper-bee-core/scss/minxin-variables";
@import "../node_modules/tinper-bee-core/scss/minxin-mixins";

$zIndex-notification: 1000;
$notification-top: 30px;
$notification-bottom: 30px;
$notification-right: 30px;
$notification-width: 300px;
$notification-text-margin-right: 15px;
$default-border-radius: 4px;
$notice-padding: 15px;
$notice-background: $gray-darkest;
$notice-bottom: 15px;

.u-notification{
position: fixed;
Expand Down

0 comments on commit 3b19303

Please sign in to comment.