From 847e40eac003a135e9bae2d93e5e4ef368cc553f Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 7 Oct 2016 14:33:08 +0800 Subject: [PATCH] Adjust site layout --- components/form/index.en-US.md | 3 +-- components/form/index.zh-CN.md | 1 - docs/spec/introduce.en-US.md | 2 +- site/theme/en-US.js | 4 ++-- site/theme/static/header.less | 2 +- site/theme/static/responsive.less | 4 ++-- site/theme/template/Home/index.jsx | 4 ++-- site/theme/template/Layout/Footer.jsx | 24 ++++++++++++++++++------ site/theme/template/Layout/Header.jsx | 26 +++++++++++++------------- site/theme/zh-CN.js | 4 ++-- 10 files changed, 42 insertions(+), 32 deletions(-) diff --git a/components/form/index.en-US.md b/components/form/index.en-US.md index b6965ec8ca..af2b641be1 100644 --- a/components/form/index.en-US.md +++ b/components/form/index.en-US.md @@ -5,8 +5,7 @@ cols: 1 title: Form --- -Forms are used to collect, validate, and submit the user input. They contain one or more form items. -There are many types of form items including checkbox, radio, input, select, and more. +Form is used to collect, validate, and submit the user input, usually contains various form items including checkbox, radio, input, select, and etc. ## Form diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md index cd062e2118..a09646fe59 100644 --- a/components/form/index.zh-CN.md +++ b/components/form/index.zh-CN.md @@ -8,7 +8,6 @@ title: Form 具有数据收集、校验和提交功能的表单，包含复选框、单选框、输入框、下拉选择框等元素。 - ## 表单 我们为 `form` 提供了以下两种排列方式： diff --git a/docs/spec/introduce.en-US.md b/docs/spec/introduce.en-US.md index 10a7522886..6671723beb 100644 --- a/docs/spec/introduce.en-US.md +++ b/docs/spec/introduce.en-US.md @@ -26,7 +26,7 @@ Ant Design, created specially for middleware design, is committed to improving t [React](http://facebook.github.io/react/) is used to encapsulate a library of Ant Design components. Any other version of frameworks to implement is also welcome. -- [Ant Design of React](/docs/react/introduce)(official implementation) +- [Ant Design of React](/docs/react/introduce) (official implementation) -
vue-beauty
-
Ant Design of Angular 2.0
-
vue-antd
diff --git a/site/theme/en-US.js b/site/theme/en-US.js index d9d141cf14..63ef4fe0e2 100644 --- a/site/theme/en-US.js +++ b/site/theme/en-US.js @@ -16,7 +16,7 @@ module.exports = { 'app.component.examples': 'Examples', 'app.home.slogan': 'One Design Language for UI', 'app.home.introduce': 'Introduce', - 'app.home.start': 'Getting Started', + 'app.home.start': 'Get Started', 'app.home.best-practice': 'Best Practice', 'app.home.experience': 'Designed by experienced team, and showcase dozens of inspiring projects.', 'app.home.design-pattern': 'Design Pattern', @@ -33,7 +33,7 @@ module.exports = { 'app.footer.links': 'Links', 'app.footer.mobile': 'Mobile', 'app.footer.data-vis': 'Data Visualization', - 'app.footer.data-vis-spec': 'Specification of Data Visualization', + 'app.footer.data-vis-spec': 'Data Visualization Specification', 'app.footer.motion': 'Motion', 'app.footer.antd-library': 'Axure library of Ant Design', 'app.footer.material': 'Sitemap Template', diff --git a/site/theme/static/header.less b/site/theme/static/header.less index cd32d01319..f44df79bf3 100644 --- a/site/theme/static/header.less +++ b/site/theme/static/header.less @@ -63,7 +63,7 @@ box-shadow: none; } -#lang { +.lang { float: right; margin-top: 29px; margin-left: 12px; diff --git a/site/theme/static/responsive.less b/site/theme/static/responsive.less index acbf9542ef..d4d5dad2f3 100644 --- a/site/theme/static/responsive.less +++ b/site/theme/static/responsive.less @@ -53,10 +53,10 @@ text-align: center; } - #nav, #lang { + #nav, .lang { float: none; } - button#lang { + button.lang { display: block; margin: 29px auto 16px; color: #666; diff --git a/site/theme/template/Home/index.jsx b/site/theme/template/Home/index.jsx index 78a6c8ca2b..c1d0e5817c 100644 --- a/site/theme/template/Home/index.jsx +++ b/site/theme/template/Home/index.jsx @@ -44,7 +44,7 @@ function getStyle() { .home-nav-white #nav a { color: #666; } - .home-nav-white #lang { + .home-nav-white .lang:not(:hover) { color: #666; border-color: #666; } @@ -56,7 +56,7 @@ function getStyle() { background: #777; box-shadow: 0 7px 0 0 #777, 0 14px 0 0 #777; } - #lang, + .lang, #nav a { color: #eee; transition: color 0.5s cubic-bezier(0.455, 0.03, 0.515, 0.955); diff --git a/site/theme/template/Layout/Footer.jsx b/site/theme/template/Layout/Footer.jsx index dbaa591b00..1171a869c4 100644 --- a/site/theme/template/Layout/Footer.jsx +++ b/site/theme/template/Layout/Footer.jsx @@ -91,22 +91,34 @@ class Footer extends React.Component {

  • -
    Ant Design Mobile - +
    + Ant Design Mobile + -
    -
    G2 - +
    + G2 + -
    -
    AntV - +
    + AntV + -
    -
    Ant Motion - +
    + Ant Motion + -
    -
    AntD Library - +
    + AntD Library + -
    -
    Ant UX - +
    + Ant UX + -
    • diff --git a/site/theme/template/Layout/Header.jsx b/site/theme/template/Layout/Header.jsx index a578d3135c..31c88a9763 100644 --- a/site/theme/template/Layout/Header.jsx +++ b/site/theme/template/Layout/Header.jsx @@ -100,7 +100,7 @@ export default class Header extends React.Component { const menuMode = this.state.menuMode; const menu = [ - , @@ -109,14 +109,9 @@ export default class Header extends React.Component { - - - - - - - - + + + @@ -124,9 +119,14 @@ export default class Header extends React.Component { - - - + + + + + + + + @@ -137,7 +137,7 @@ export default class Header extends React.Component { , ]; - const searchPlaceholder = locale === 'zh-CN' ? '搜索组件...' : 'Search...'; + const searchPlaceholder = locale === 'zh-CN' ? '搜索组件...' : 'Search Components...'; return (