Skip to content

Commit

Permalink
Merge pull request #18 from ant-design/v1.1
Browse files Browse the repository at this point in the history 
V1.1
  • Loading branch information
@jljsj33
jljsj33 authored Jan 30, 2019
2 parents f92ff8f + 152659c commit 84593f9
Show file tree
Hide file tree
Showing 61 changed files with 1,017 additions and 424 deletions.
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "landing",
"version": "1.0.0",
"version": "1.1.0",
"title": "Landing Pages",
"description": "site of Landing Pages",
"homepage": "http://landing.ant.design/",
Expand All @@ -14,11 +14,11 @@
"autoresponsive-react": "^1.1.31",
"enquire-js": "^0.2.1",
"leancloud-storage": "^3.5.0",
"raw-loader": "^0.5.1",
"raw-loader": "^1.0.0",
"rc-animate": "^2.4.4",
"rc-banner-anim": "^2.1.0",
"rc-drawer": "^1.5.0",
"rc-editor-list": "~1.1.0",
"rc-editor-list": "~1.3.0",
"rc-queue-anim": "^1.6.0",
"rc-scroll-anim": "^2.5.0",
"rc-texty": "^0.2.0",
Expand Down Expand Up @@ -63,7 +63,7 @@
"eslint-loader": "^2.1.1",
"eslint-tinker": "^0.5.0",
"extract-text-webpack-plugin": "^3.0.2",
"file-saver": "^1.3.3",
"file-saver": "^2.0.0",
"jszip": "^3.1.5",
"medium-editor": "^5.23.3",
"pre-commit": "1.x",
Expand All @@ -72,7 +72,7 @@
"react-color": "^2.13.8",
"react-dom": "^16.0.0",
"react-intl": "^2.3.0",
"react-redux": "^5.0.6",
"react-redux": "^6.0.0",
"redux": "^4.0.1",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.2.0",
Expand Down
18 changes: 15 additions & 3 deletions site/bisheng.common.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,20 @@ const pluginAntdConfig = {
function alertTheme(rules) {
rules.forEach((rule) => {
if (Array.isArray(rule.use) && (rule.use.indexOf('less-loader') >= 0
|| rule.use.some(c => c.loader === 'less-loader'))) {
|| rule.use.some(c => c.loader && (c.loader.indexOf('less-loader') >= 0 || c.loader === 'less-loader')))) {
rule.use = rule.use.map((item) => {
if (item === 'less-loader' || item.loader === 'less-loader') {
if (item.loader && item.loader.indexOf('less-loader') >= 0) {
item.options = {
sourceMap: true,
javascriptEnabled: true,
modifyVars: {
'@primary-color': '#2F54EB',
'@text-color': '#314659',
},
};
return item;
}
if (item === 'less-loader') {
return {
loader: 'less-loader',
options: {
Expand All @@ -31,6 +42,7 @@ function alertTheme(rules) {
};
}
if (typeof item === 'object') {
item.options = item.options || {};
item.options.sourceMap = true;
}
return item;
Expand All @@ -40,7 +52,7 @@ function alertTheme(rules) {
}
function alertBabelConfig(rules) {
rules.forEach((rule) => {
if (rule.loader && rule.loader === 'babel-loader') {
if (rule.loader && rule.loader.indexOf('babel-loader') >= 0) {
if (rule.options.plugins.indexOf(replaceLib) === -1) {
rule.options.plugins.push(replaceLib);
}
Expand Down
183 changes: 19 additions & 164 deletions site/edit-module/default.template.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,218 +25,73 @@ export default {
'Footer2_0',
],
config: {
Banner3_0: {
dataSource: {
textWrapper: {
children: [
{
name: 'nameEn',
className: 'banner3-name-en jntzoi4tesu-editor_css',
children: 'Seeking Experience & Engineering Conference',
},
{
name: 'slogan',
className: 'banner3-slogan',
children: '首届蚂蚁金服体验科技大会',
texty: true,
},
{
name: 'name',
className: 'banner3-name',
children: '探索极致用户体验与最佳工程实践探索',
},
{
name: 'button',
className: 'banner3-button',
children: '立即报名',
},
{
name: 'time',
className: 'banner3-time',
children: '2018.01.06 / 中国·杭州',
},
],
},
},
},
Nav2_0: {
dataSource: {
menuLink: {
Menu: {
children: [
{
name: 'Banner3_0',
to: 'Banner3_0',
children: '<p>首屏</p>',
className: 'menu-item active jnu03ta970t-editor_css',
delete: true,
children: '首页',
className: 'active menu-item',
},
{
name: 'Content8_0',
to: 'Content8_0',
children: '<p>特邀嘉宾</p>',
className: 'menu-item active-editor_css',
children: '特邀嘉宾',
className: 'menu-item',
},
{
name: 'Content9_0',
to: 'Content9_0',
children: '<p>会议日程</p>',
children: '会议日程',
className: 'menu-item',
},
{
name: 'Content10_0',
to: 'Content10_0',
children: '<p>地址</p>',
children: '大会地址',
className: 'menu-item',
},
{
name: 'Content11_0',
to: 'Content11_0',
children: 'Content11_0',
children: '展台展示',
className: 'menu-item',
delete: true,
},
{
name: 'Content12_0',
to: 'Content12_0',
children: '<p>赞助商</p>',
children: '特别鸣谢',
className: 'menu-item',
},
],
},
wrapper: {
className:
'header2 home-page-wrapper header2 home-page-wrapper jnu03e5hwa6-editor_css',
className: 'header2 home-page-wrapper jrhtw9ph4a-editor_css',
},
logo: {
children:
'https://gw.alipayobjects.com/os/s/prod/seeconf/9b458a789d9a000312899b42a7542b9c.svg',
},
page: {
className: 'home-page home-page home-page jnu03sdxtga-editor_css',
},
},
},
Content8_0: {
dataSource: {
page: {
className:
'home-page content8 home-page content8 jnu21j2rjc-editor_css',
},
},
},
},
style: [
{
className: '.banner3 > .banner3-text-wrapper > .jntzoi4tesu-editor_css',
css: {
default: ' color: #ffffff;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Banner3_0-textWrapper&children&array_name=nameEn',
},
{
className: '.home-page > .header2-menu > .jntztinctro-editor_css',
css: {
default: ' text-decoration: overline;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Nav2_0-menuLink&children&array_name=Content10_0',
},
{
className: '.home-page > .header2-menu > .jntzuvh7k9n-editor_css',
css: {
default: ' text-decoration: line-through;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Nav2_0-menuLink&children&array_name=Content11_0',
},
{
className: '.home-page > .header2-menu > .jntzxmqtpmn-editor_css',
css: {
default: ' text-decoration: overline;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Nav2_0-menuLink&children&array_name=Content12_0',
cssString:
'div > .templates-wrapper > .jrhtw9ph4a-editor_css {\n position: absolute;\n background-color: rgba(0, 21, 41, 0);\n box-shadow: none;\n}',
id: 'div_templates-wrapper_jrhtw9ph4a-editor_css',
},
{
className: 'div > .templates-wrapper > .jnu03e5hwa6-editor_css',
css: {
default:
' position: absolute;\n background-color: rgba(0, 0, 0, 0);\n box-shadow: none;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Nav2_0-wrapper',
cssString:
'.home-page > .header2-menu > .active {\n color: #ffffff;\n}',
id: 'home-page_header2-menu_active',
},
{
className: '.home-page > .header2-menu > .jnu03ta970t-editor_css',
css: {
default: ' color: #ffffff;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Nav2_0-menuLink&children&array_name=Banner3_0',
},
{
className: '.templates-wrapper > .header2 > .jnu03sdxtga-editor_css',
css: {
default: ' max-width: 100%;\n padding: 0 2.5%;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Nav2_0-page',
},
{
className: '.home-page > .header2-menu > .menu-item',
css: {
default: '',
hover: ' color: #ffffff;\n border-bottom-width: 0;',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Nav2_0-menuLink&children&array_name=Content9_0',
},
{
className: '.home-page > .header2-menu > .active-editor_css',
css: {
default: ' border-bottom-width: 0;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Nav2_0-menuLink&children&array_name=Content8_0',
},
{
className:
'.templates-wrapper > .home-page-wrapper > .jnu21j2rjc-editor_css',
css: {
default: ' margin: -120px auto auto ;',
hover: '',
active: '',
focus: '',
},
mobileCss: { default: '', active: '', focus: '' },
id: 'Content8_0-page',
cssString:
'.home-page > .header2-menu > .menu-item:hover {\n color: #e0e7ff;\n border-bottom-color: #ffffff;\n}',
id: 'home-page_header2-menu_menu-item',
},
],
other: {},
Expand Down
Loading

0 comments on commit 84593f9

Please sign in to comment.