Merge branch 'master' into change-FixedHeaderFooterResponsiveLayout-s…

…napshot
LawrenceZHLee · Jan 25, 2018 · 039bd73 · 039bd73
2 parents 9e7ca26 + 8205303
commit 039bd73
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 26 deletions.
diff --git a/blocks/PriceCard/package.json b/blocks/PriceCard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@icedesign/price-card-block",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "",
   "files": [
     "src/",

diff --git a/blocks/PriceCard/src/PriceCard.jsx b/blocks/PriceCard/src/PriceCard.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import './PrIceContainer.scss';
+import './PriceCard.scss';
 
 const data = [
   {
@@ -22,8 +22,8 @@ const data = [
   },
 ];
 
-export default class PrIceContainer extends Component {
-  static displayName = 'PrIceContainer';
+export default class PriceCard extends Component {
+  static displayName = 'PriceCard';
 
   static defaultProps = {};
 
@@ -34,7 +34,7 @@ export default class PrIceContainer extends Component {
 
   render() {
     return (
-      <div className="price-card" style={styles.prIceContainer}>
+      <div className="price-card" style={styles.priceCard}>
         <div style={styles.container}>
           <div style={styles.items}>
             {data.map((item, index) => {
@@ -129,5 +129,5 @@ const styles = {
     borderRadius: '12px',
     color: '#fff',
   },
-  prIceContainer: {},
+  priceCard: {},
 };
diff --git a/blocks/PriceCard/src/index.js b/blocks/PriceCard/src/index.js
@@ -1,3 +1,3 @@
-import PrIceContainer from './PrIceContainer';
+import PriceCard from './PriceCard';
 
-export default PrIceContainer;
+export default PriceCard;
diff --git a/layouts/FixedHeaderFooterResponsiveLayout/package.json b/layouts/FixedHeaderFooterResponsiveLayout/package.json
@@ -1,9 +1,13 @@
 {
   "name": "@icedesign/fixed-header-footer-responsive-layout",
-  "version": "0.1.10",
-  "description":
-    "固定的顶部导航 + 底部栏 + 自适应宽度内容区的布局，通常用于项目介绍页或首页。",
-  "files": ["src/", "lib/", "demo/", "mock/"],
+  "version": "0.1.12",
+  "description": "固定的顶部导航 + 底部栏 + 自适应宽度内容区的布局, 通常用于项目介绍页, 首页。",
+  "files": [
+    "src/",
+    "lib/",
+    "demo/",
+    "mock/"
+  ],
   "author": {
     "name": "ICE Team",
     "email": "[email protected]"

diff --git a/layouts/FixedHeaderFooterResponsiveLayout/src/__components_Header__.jsx b/layouts/FixedHeaderFooterResponsiveLayout/src/__components_Header__.jsx
@@ -57,7 +57,7 @@ export default ({ width }) => {
             <IceImg
               height={40}
               width={40}
-              src="https://gw.alicdn.com/tfs/TB1t1kDmm_I8KJjy0FoXXaFnVXa-160-160.jpg"
+              src="https://gw.alicdn.com/tfs/TB13ENCnwDD8KJjy0FdXXcjvXXa-192-192.png"
               style={{ marginRight: '12px', borderRadius: 8 }}
             />
             <span className="ice-admin-layout-header-username">淘小宝</span>

diff --git a/layouts/HeaderAsideFooterLayout/package.json b/layouts/HeaderAsideFooterLayout/package.json
@@ -1,9 +1,13 @@
 {
   "name": "@icedesign/header-aside-footer-layout",
-  "version": "0.1.10",
-  "description":
-    "固定宽度的内容区域，顶栏 + 侧栏 + 底栏，通常用于中后台站点正文内容。",
-  "files": ["src/", "lib/", "demo/", "mock/"],
+  "version": "0.1.12",
+  "description": "固定宽度的内容区域, 顶栏 + 侧栏 + 底栏, 通常用于中后台站点正文内容",
+  "files": [
+    "src/",
+    "lib/",
+    "demo/",
+    "mock/"
+  ],
   "author": {
     "name": "ICE Team",
     "email": "[email protected]"

diff --git a/layouts/HeaderAsideFooterLayout/src/__components_Header__.jsx b/layouts/HeaderAsideFooterLayout/src/__components_Header__.jsx
@@ -57,7 +57,7 @@ export default ({ width }) => {
             <IceImg
               height={40}
               width={40}
-              src="https://gw.alicdn.com/tfs/TB1t1kDmm_I8KJjy0FoXXaFnVXa-160-160.jpg"
+              src="https://gw.alicdn.com/tfs/TB13ENCnwDD8KJjy0FdXXcjvXXa-192-192.png"
               style={{ marginRight: '12px', borderRadius: 8 }}
             />
             <span className="ice-admin-layout-header-username">淘小宝</span>

diff --git a/layouts/HeaderAsideFooterResponsiveLayout/package.json b/layouts/HeaderAsideFooterResponsiveLayout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@icedesign/header-aside-footer-responsive-layout",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "顶部导航 + 边栏 + 底栏 + 响应式内容区的布局, 通常用于站点正文。",
   "files": [
     "lib/",

diff --git a/layouts/HeaderAsideFooterResponsiveLayout/src/__components_Header__.jsx b/layouts/HeaderAsideFooterResponsiveLayout/src/__components_Header__.jsx
@@ -57,7 +57,7 @@ export default ({ width }) => {
             <IceImg
               height={40}
               width={40}
-              src="https://gw.alicdn.com/tfs/TB1t1kDmm_I8KJjy0FoXXaFnVXa-160-160.jpg"
+              src="https://gw.alicdn.com/tfs/TB13ENCnwDD8KJjy0FdXXcjvXXa-192-192.png"
               style={{ marginRight: '12px', borderRadius: 8 }}
             />
             <span className="ice-admin-layout-header-username">淘小宝</span>

diff --git a/layouts/HeaderFooterLayout/package.json b/layouts/HeaderFooterLayout/package.json
@@ -1,9 +1,13 @@
 {
   "name": "@icedesign/header-footer-layout",
-  "version": "0.1.10",
-  "description":
-    "基础布局，头部导航 + 底部栏 + 固定宽度内容区，通常用于站点首页或者通用辅助页面。",
-  "files": ["src/", "lib/", "demo/", "mock/"],
+  "version": "0.1.12",
+  "description": "基础布局, 头部导航 + 底部栏 + 固定宽度内容区, 通常用于站点首页或者通用辅助页面。",
+  "files": [
+    "src/",
+    "lib/",
+    "demo/",
+    "mock/"
+  ],
   "author": {
     "name": "ICE Team",
     "email": "[email protected]"

diff --git a/layouts/HeaderFooterLayout/src/__components_Header__.jsx b/layouts/HeaderFooterLayout/src/__components_Header__.jsx
@@ -57,7 +57,7 @@ export default ({ width }) => {
             <IceImg
               height={40}
               width={40}
-              src="https://gw.alicdn.com/tfs/TB1t1kDmm_I8KJjy0FoXXaFnVXa-160-160.jpg"
+              src="https://gw.alicdn.com/tfs/TB13ENCnwDD8KJjy0FdXXcjvXXa-192-192.png"
               style={{ marginRight: '12px', borderRadius: 8 }}
             />
             <span className="ice-admin-layout-header-username">淘小宝</span>

diff --git a/scaffords/ice-design-pro/package.json b/scaffords/ice-design-pro/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@icedesign/scafford-pro",
   "title": "ICE 项目脚手架 Pro",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "dependencies": {
     "@antv/data-set": "^0.8.5",
     "@icedesign/base": "^0.1.0",