fix typography

Author: jikkai

examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-flat-docs",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "Documentation for svelte-flat",
   "main": "src/index.js",
   "scripts": {
@@ -34,7 +34,7 @@
     "extract-text-webpack-plugin": "^2.0.0-beta.4",
     "file-loader": "^0.9.0",
     "html-loader": "^0.4.4",
-    "html-webpack-plugin": "^2.25.0",
+    "html-webpack-plugin": "^2.26.0",
     "markdown-loader": "^0.1.7",
     "postcss-cssnext": "^2.9.0",
     "postcss-import": "^9.0.0",
@@ -43,6 +43,6 @@
     "style-loader": "^0.13.1",
     "webpack": "^2.2.0-rc.3",
     "webpack-dev-middleware": "^1.9.0",
-    "webpack-hot-middleware": "^2.14.0"
+    "webpack-hot-middleware": "^2.15.0"
   }
 }

examples/src/router/Home/examples.md

@@ -22,22 +22,25 @@ import 'svelte-flat/lib/theme-default/button.css'
 ```
 
 ### 按需引入
-如果你使用babel的话，可以安装[`babel-plugin-component`](https://github.com/QingWei-Li/babel-plugin-component)插件自动按需引入组件。
+如果你使用babel的话，可以安装[`babel-plugin-svelteflat`](https://github.com/jikkai/babel-plugin-svelteflat)插件自动按需引入组件。
 
 #### 安装依赖
 ```bash
-yarn add babel-plugin-component --dev
+yarn add babel-plugin-svelteflat --dev
 ```
 
 #### 配置及使用
-在`.babelrc`中配置：
+在`.babelrc`中按下例配置，`typoCss`是一个可选项，默认为`true`，用于选择是否使用默认的`typo.css`重设浏览器样式。
 ```json
 {
   "plugins": [
-    ["component", [{
-      "libraryName": "svelte-flat",
-      "styleLibraryName": "theme-default"
-    }]]
+    ["svelteflat", [
+      { 
+        "libraryName": "svelte-flat",
+        "styleLibraryName": "theme-default", 
+        "typoCss": true
+      }
+    ]]
   ]
 }
 ```

examples/src/router/Typography/index.js

@@ -10,6 +10,8 @@ class TypographyRouter extends React.Component {
       <div className="examples-router examples-router-typography">
         <h2>Typography 排版</h2>
 
+        <p>基于<code>typo.css</code>的排版系统。</p>
+
         <section className="examples">
           <div>
             <label>Header 1</label>

examples/yarn.lock

@@ -930,9 +930,9 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.4.6:
-  version "3.4.6"
-  resolved "http://registry.npm.taobao.org/bluebird/download/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
+bluebird@^3.4.7:
+  version "3.4.7"
+  resolved "http://registry.npm.taobao.org/bluebird/download/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.6"
@@ -2316,7 +2316,7 @@ html-loader@^0.4.4:
     loader-utils "^0.2.15"
     object-assign "^4.1.0"
 
-html-minifier@^3.0.1, html-minifier@^3.1.0:
+html-minifier@^3.0.1, html-minifier@^3.2.3:
   version "3.2.3"
   resolved "http://registry.npm.taobao.org/html-minifier/download/html-minifier-3.2.3.tgz#d2ff536e24d95726c332493d8f77d84dbed85372"
   dependencies:
@@ -2329,14 +2329,14 @@ html-minifier@^3.0.1, html-minifier@^3.1.0:
     relateurl "0.2.x"
     uglify-js "2.7.x"
 
-html-webpack-plugin@^2.25.0:
-  version "2.25.0"
-  resolved "http://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-2.25.0.tgz#945c860c9bf413d725a09f773d09cfeca72e8f8a"
+html-webpack-plugin@^2.26.0:
+  version "2.26.0"
+  resolved "http://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-2.26.0.tgz#ba97c8a66f912b85df80d2aeea65966c8bd9249e"
   dependencies:
-    bluebird "^3.4.6"
-    html-minifier "^3.1.0"
+    bluebird "^3.4.7"
+    html-minifier "^3.2.3"
     loader-utils "^0.2.16"
-    lodash "^4.16.4"
+    lodash "^4.17.3"
     pretty-error "^2.0.2"
     toposort "^1.0.0"
 
@@ -2791,10 +2791,14 @@ lodash.uniq@^4.3.0:
   version "4.5.0"
   resolved "http://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.2"
   resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
 
+lodash@^4.17.3:
+  version "4.17.4"
+  resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "http://registry.npm.taobao.org/longest/download/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -4670,9 +4674,9 @@ webpack-dev-middleware@^1.9.0:
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
 
-webpack-hot-middleware@^2.14.0:
-  version "2.14.0"
-  resolved "http://registry.npm.taobao.org/webpack-hot-middleware/download/webpack-hot-middleware-2.14.0.tgz#64bb8cf056ba84c699d148840ae77e54179abb6d"
+webpack-hot-middleware@^2.15.0:
+  version "2.15.0"
+  resolved "http://registry.npm.taobao.org/webpack-hot-middleware/download/webpack-hot-middleware-2.15.0.tgz#71995af7c0025f109df482f86f1e10379526d026"
   dependencies:
     ansi-html "0.0.6"
     html-entities "^1.2.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-flat",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Flat UI Components with SvelteJS",
   "main": "lib/index.js",
   "author": "Jikkai Xiao <[email protected]>",

packages/theme-default/src/base.css

@@ -8,13 +8,10 @@ main {
 
 /* 修改typo.css的默认字体 */
 body, button, input, select, textarea {
-  font-weight: 400;
-  font-family: Helvetica Neue, Helvetica, Arial, Han Heiti, sans-serif;
+  font-weight: inherit;
 }
 
 h1, h2, h3, h4, h5, h6 {
-  font-family: PingFang SC, Verdana, Helvetica Neue, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans-serif;
-  font-weight: bold;
   color: inherit;
 }
 
@@ -26,16 +23,6 @@ h1, h2, h3, h4, h5, h6 {
   line-height: 1.1;
 }
 
-h1, h2, h3 {
-  margin-top: 20px;
-  margin-bottom: 10px;
-}
-
-h4, h5, h6 {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
 h1 {
   font-size: 36px;
 }