Skip to content

Commit 84593f9

Browse files
authored
Merge pull request #18 from ant-design/v1.1
V1.1
2 parents f92ff8f + 152659c commit 84593f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1017
-424
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "landing",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"title": "Landing Pages",
55
"description": "site of Landing Pages",
66
"homepage": "http://landing.ant.design/",
@@ -14,11 +14,11 @@
1414
"autoresponsive-react": "^1.1.31",
1515
"enquire-js": "^0.2.1",
1616
"leancloud-storage": "^3.5.0",
17-
"raw-loader": "^0.5.1",
17+
"raw-loader": "^1.0.0",
1818
"rc-animate": "^2.4.4",
1919
"rc-banner-anim": "^2.1.0",
2020
"rc-drawer": "^1.5.0",
21-
"rc-editor-list": "~1.1.0",
21+
"rc-editor-list": "~1.3.0",
2222
"rc-queue-anim": "^1.6.0",
2323
"rc-scroll-anim": "^2.5.0",
2424
"rc-texty": "^0.2.0",
@@ -63,7 +63,7 @@
6363
"eslint-loader": "^2.1.1",
6464
"eslint-tinker": "^0.5.0",
6565
"extract-text-webpack-plugin": "^3.0.2",
66-
"file-saver": "^1.3.3",
66+
"file-saver": "^2.0.0",
6767
"jszip": "^3.1.5",
6868
"medium-editor": "^5.23.3",
6969
"pre-commit": "1.x",
@@ -72,7 +72,7 @@
7272
"react-color": "^2.13.8",
7373
"react-dom": "^16.0.0",
7474
"react-intl": "^2.3.0",
75-
"react-redux": "^5.0.6",
75+
"react-redux": "^6.0.0",
7676
"redux": "^4.0.1",
7777
"redux-logger": "^3.0.6",
7878
"redux-thunk": "^2.2.0",

site/bisheng.common.config.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,20 @@ const pluginAntdConfig = {
1616
function alertTheme(rules) {
1717
rules.forEach((rule) => {
1818
if (Array.isArray(rule.use) && (rule.use.indexOf('less-loader') >= 0
19-
|| rule.use.some(c => c.loader === 'less-loader'))) {
19+
|| rule.use.some(c => c.loader && (c.loader.indexOf('less-loader') >= 0 || c.loader === 'less-loader')))) {
2020
rule.use = rule.use.map((item) => {
21-
if (item === 'less-loader' || item.loader === 'less-loader') {
21+
if (item.loader && item.loader.indexOf('less-loader') >= 0) {
22+
item.options = {
23+
sourceMap: true,
24+
javascriptEnabled: true,
25+
modifyVars: {
26+
'@primary-color': '#2F54EB',
27+
'@text-color': '#314659',
28+
},
29+
};
30+
return item;
31+
}
32+
if (item === 'less-loader') {
2233
return {
2334
loader: 'less-loader',
2435
options: {
@@ -31,6 +42,7 @@ function alertTheme(rules) {
3142
};
3243
}
3344
if (typeof item === 'object') {
45+
item.options = item.options || {};
3446
item.options.sourceMap = true;
3547
}
3648
return item;
@@ -40,7 +52,7 @@ function alertTheme(rules) {
4052
}
4153
function alertBabelConfig(rules) {
4254
rules.forEach((rule) => {
43-
if (rule.loader && rule.loader === 'babel-loader') {
55+
if (rule.loader && rule.loader.indexOf('babel-loader') >= 0) {
4456
if (rule.options.plugins.indexOf(replaceLib) === -1) {
4557
rule.options.plugins.push(replaceLib);
4658
}

site/edit-module/default.template.config.js

Lines changed: 19 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -25,218 +25,73 @@ export default {
2525
'Footer2_0',
2626
],
2727
config: {
28-
Banner3_0: {
29-
dataSource: {
30-
textWrapper: {
31-
children: [
32-
{
33-
name: 'nameEn',
34-
className: 'banner3-name-en jntzoi4tesu-editor_css',
35-
children: 'Seeking Experience & Engineering Conference',
36-
},
37-
{
38-
name: 'slogan',
39-
className: 'banner3-slogan',
40-
children: '首届蚂蚁金服体验科技大会',
41-
texty: true,
42-
},
43-
{
44-
name: 'name',
45-
className: 'banner3-name',
46-
children: '探索极致用户体验与最佳工程实践探索',
47-
},
48-
{
49-
name: 'button',
50-
className: 'banner3-button',
51-
children: '立即报名',
52-
},
53-
{
54-
name: 'time',
55-
className: 'banner3-time',
56-
children: '2018.01.06 / 中国·杭州',
57-
},
58-
],
59-
},
60-
},
61-
},
6228
Nav2_0: {
6329
dataSource: {
64-
menuLink: {
30+
Menu: {
6531
children: [
6632
{
6733
name: 'Banner3_0',
6834
to: 'Banner3_0',
69-
children: '<p>首屏</p>',
70-
className: 'menu-item active jnu03ta970t-editor_css',
71-
delete: true,
35+
children: '首页',
36+
className: 'active menu-item',
7237
},
7338
{
7439
name: 'Content8_0',
7540
to: 'Content8_0',
76-
children: '<p>特邀嘉宾</p>',
77-
className: 'menu-item active-editor_css',
41+
children: '特邀嘉宾',
42+
className: 'menu-item',
7843
},
7944
{
8045
name: 'Content9_0',
8146
to: 'Content9_0',
82-
children: '<p>会议日程</p>',
47+
children: '会议日程',
8348
className: 'menu-item',
8449
},
8550
{
8651
name: 'Content10_0',
8752
to: 'Content10_0',
88-
children: '<p>地址</p>',
53+
children: '大会地址',
8954
className: 'menu-item',
9055
},
9156
{
9257
name: 'Content11_0',
9358
to: 'Content11_0',
94-
children: 'Content11_0',
59+
children: '展台展示',
9560
className: 'menu-item',
96-
delete: true,
9761
},
9862
{
9963
name: 'Content12_0',
10064
to: 'Content12_0',
101-
children: '<p>赞助商</p>',
65+
children: '特别鸣谢',
10266
className: 'menu-item',
10367
},
10468
],
10569
},
10670
wrapper: {
107-
className:
108-
'header2 home-page-wrapper header2 home-page-wrapper jnu03e5hwa6-editor_css',
71+
className: 'header2 home-page-wrapper jrhtw9ph4a-editor_css',
10972
},
11073
logo: {
11174
children:
11275
'https://gw.alipayobjects.com/os/s/prod/seeconf/9b458a789d9a000312899b42a7542b9c.svg',
11376
},
114-
page: {
115-
className: 'home-page home-page home-page jnu03sdxtga-editor_css',
116-
},
117-
},
118-
},
119-
Content8_0: {
120-
dataSource: {
121-
page: {
122-
className:
123-
'home-page content8 home-page content8 jnu21j2rjc-editor_css',
124-
},
12577
},
12678
},
12779
},
12880
style: [
12981
{
130-
className: '.banner3 > .banner3-text-wrapper > .jntzoi4tesu-editor_css',
131-
css: {
132-
default: ' color: #ffffff;',
133-
hover: '',
134-
active: '',
135-
focus: '',
136-
},
137-
mobileCss: { default: '', active: '', focus: '' },
138-
id: 'Banner3_0-textWrapper&children&array_name=nameEn',
139-
},
140-
{
141-
className: '.home-page > .header2-menu > .jntztinctro-editor_css',
142-
css: {
143-
default: ' text-decoration: overline;',
144-
hover: '',
145-
active: '',
146-
focus: '',
147-
},
148-
mobileCss: { default: '', active: '', focus: '' },
149-
id: 'Nav2_0-menuLink&children&array_name=Content10_0',
150-
},
151-
{
152-
className: '.home-page > .header2-menu > .jntzuvh7k9n-editor_css',
153-
css: {
154-
default: ' text-decoration: line-through;',
155-
hover: '',
156-
active: '',
157-
focus: '',
158-
},
159-
mobileCss: { default: '', active: '', focus: '' },
160-
id: 'Nav2_0-menuLink&children&array_name=Content11_0',
161-
},
162-
{
163-
className: '.home-page > .header2-menu > .jntzxmqtpmn-editor_css',
164-
css: {
165-
default: ' text-decoration: overline;',
166-
hover: '',
167-
active: '',
168-
focus: '',
169-
},
170-
mobileCss: { default: '', active: '', focus: '' },
171-
id: 'Nav2_0-menuLink&children&array_name=Content12_0',
82+
cssString:
83+
'div > .templates-wrapper > .jrhtw9ph4a-editor_css {\n position: absolute;\n background-color: rgba(0, 21, 41, 0);\n box-shadow: none;\n}',
84+
id: 'div_templates-wrapper_jrhtw9ph4a-editor_css',
17285
},
17386
{
174-
className: 'div > .templates-wrapper > .jnu03e5hwa6-editor_css',
175-
css: {
176-
default:
177-
' position: absolute;\n background-color: rgba(0, 0, 0, 0);\n box-shadow: none;',
178-
hover: '',
179-
active: '',
180-
focus: '',
181-
},
182-
mobileCss: { default: '', active: '', focus: '' },
183-
id: 'Nav2_0-wrapper',
87+
cssString:
88+
'.home-page > .header2-menu > .active {\n color: #ffffff;\n}',
89+
id: 'home-page_header2-menu_active',
18490
},
18591
{
186-
className: '.home-page > .header2-menu > .jnu03ta970t-editor_css',
187-
css: {
188-
default: ' color: #ffffff;',
189-
hover: '',
190-
active: '',
191-
focus: '',
192-
},
193-
mobileCss: { default: '', active: '', focus: '' },
194-
id: 'Nav2_0-menuLink&children&array_name=Banner3_0',
195-
},
196-
{
197-
className: '.templates-wrapper > .header2 > .jnu03sdxtga-editor_css',
198-
css: {
199-
default: ' max-width: 100%;\n padding: 0 2.5%;',
200-
hover: '',
201-
active: '',
202-
focus: '',
203-
},
204-
mobileCss: { default: '', active: '', focus: '' },
205-
id: 'Nav2_0-page',
206-
},
207-
{
208-
className: '.home-page > .header2-menu > .menu-item',
209-
css: {
210-
default: '',
211-
hover: ' color: #ffffff;\n border-bottom-width: 0;',
212-
active: '',
213-
focus: '',
214-
},
215-
mobileCss: { default: '', active: '', focus: '' },
216-
id: 'Nav2_0-menuLink&children&array_name=Content9_0',
217-
},
218-
{
219-
className: '.home-page > .header2-menu > .active-editor_css',
220-
css: {
221-
default: ' border-bottom-width: 0;',
222-
hover: '',
223-
active: '',
224-
focus: '',
225-
},
226-
mobileCss: { default: '', active: '', focus: '' },
227-
id: 'Nav2_0-menuLink&children&array_name=Content8_0',
228-
},
229-
{
230-
className:
231-
'.templates-wrapper > .home-page-wrapper > .jnu21j2rjc-editor_css',
232-
css: {
233-
default: ' margin: -120px auto auto ;',
234-
hover: '',
235-
active: '',
236-
focus: '',
237-
},
238-
mobileCss: { default: '', active: '', focus: '' },
239-
id: 'Content8_0-page',
92+
cssString:
93+
'.home-page > .header2-menu > .menu-item:hover {\n color: #e0e7ff;\n border-bottom-color: #ffffff;\n}',
94+
id: 'home-page_header2-menu_menu-item',
24095
},
24196
],
24297
other: {},

0 commit comments

Comments
 (0)