Merge pull request #305 from nostalgic-css/develop

Release!!
nostalgic-css · Feb 27, 2019 · 82d8369 · 82d8369
2 parents b34f70c + 4a2a145
commit 82d8369
Show file tree

Hide file tree

Showing 40 changed files with 1,279 additions and 2,210 deletions.
diff --git a/.github/README-zh-CN.md b/.github/README-zh-CN.md
@@ -44,7 +44,7 @@ yarn add nes.css
 
 NES.css 只提供组件. 你需要定义你自己的布局.
 
-默认字体[Press Start 2P](https://fonts.google.com/specimen/Press+Start+2P?selection.family=Press+Start+2P) 只支持英文字符. 当你把这个框架与其他非英语的语言一起使用的时候, 请使用另外的字体. 请根据这个关于Google Fonts的 [说明](https://developers.google.com/fonts/docs/getting_started) 了解如何把它引入项目, 或者按照如下方式简单引人:
+默认字体[Press Start 2P](https://fonts.google.com/specimen/Press+Start+2P?selection.family=Press+Start+2P) 只支持英文字符. 当你把这个框架与其他非英语的语言一起使用的时候, 请使用另外的字体. 请根据这个关于Google Fonts的 [说明](https://developers.google.com/fonts/docs/getting_started) 了解如何把它引入项目, 或者按照如下方式简单引入:
 
 ```html
 <head>

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ node_modules
 .vscode
 css
 storybook-static
+.DS_Store
diff --git a/.storybook/config.js b/.storybook/config.js
@@ -9,7 +9,7 @@ import { withBackgrounds } from '@storybook/addon-backgrounds';
 import '../scss/nes.scss'; // eslint-disable-line import/no-unresolved
 
 // automatically import all files ending in *.stories.js
-const req = require.context('../docs', true, /.stories.js$/);
+const req = require.context('../story', true, /.stories.js$/);
 function loadStories() {
   req.keys().forEach(filename => req(filename));
 }

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ NES.css is a **NES-style(8bit-like)** CSS Framework.
 
 ### Styles
 
-NES.css is available via either npm (preferred) or Yarn, or a CDN.
+NES.css is available via either npm (preferred), Yarn, or a CDN.
 
 #### via package manager
 
@@ -76,7 +76,7 @@ NES.css only requires CSS and doesn't depend on any JavaScript.
 
 ## Browser Support
 
-NES.css is compatible with the newest version of the following browsers.
+NES.css is compatible with the newest version of the following browsers:
 * Chrome
 * Firefox
 * Safari