From 01176f61ac5406b3cbd4bf29f05c42f698c17d27 Mon Sep 17 00:00:00 2001 From: Varya Stepanova Date: Fri, 10 Mar 2017 12:04:58 +0200 Subject: [PATCH] Fixed grammar in docs --- DEVELOPMENT.md | 8 ++++---- README.md | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 8094d792..a06275e5 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -14,8 +14,8 @@ Install all npm dependencies npm install -The stylesheet of the style guide itself could be used as test data. -Start watching UI code changes in lib/app and build the app using the style guides stylesheets: +The style sheet of the style guide itself could be used as test data. +Start watching UI code changes in lib/app and build the app using the style guides style sheets: gulp dev @@ -29,7 +29,7 @@ Node module tests are ran with Mocha, UI related tests with Karma & PhantomJS. ### Coding convention -This project follows AirBNB-ish JavaScript coding convention (with a few changes). It is tuned to use [JSCS]() as a code +This project follows AirBNB JavaScript coding convention (with a few changes). It is tuned to use [JSCS]() as a code checker. The checking is injected into the testing process, so you can see in Travis respond to your pull-request if your files follow the convention. @@ -42,7 +42,7 @@ To be able to check during development, please ## How to release 1. Check that all the needed pull requests are merged -1. Make sure that your clone fetched all the tags which exist in the SC5 repo +1. Make sure that your clone fetched all the tags which exist in the SC5 repository 1. Rebase your `master` branch against SC5 1. Create `release/x.y.z` branch from `master` with the number of upcoming version and switch to it 1. Increment the package number in `package.json` diff --git a/README.md b/README.md index 11f81a95..e62c9f5e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ using KSS notation. It can be used as a command line utility, gulp task or Grunt - [Build options](#build-options) - [Documenting syntax](#documenting-syntax) - [Defining an Angular directive](#defining-an-angular-directive) - - [Ignore parts of the stylesheet from being processed](#ignore-parts-of-the-stylesheet-from-being-processed) + - [Ignore parts of the style sheet from being processed](#ignore-parts-of-the-stylesheet-from-being-processed) - [Wrapper markup](#wrapper-markup) - [Inserted markup](#inserted-markup) - [Pug (jade) markup](#pug-jade-markup) @@ -65,7 +65,7 @@ The gulp plugin contains two functions that requires different set of file strea `generate()`: All unprocessed styles containing the KSS markup and style variables. This will process the KSS markup and collects variable information. -`applyStyles()`: Preprocessed/compiled stylesheets. This will create necessary pseudo styles and create the actual stylesheet to be used in the styleguide. +`applyStyles()`: Pre-processed/compiled style sheets. This will create necessary pseudo styles and create the actual style sheet to be used in the styleguide. The following code shows complete example how to use styleguide with gulp-sass and with gulp watch. @@ -177,7 +177,7 @@ Styleguide command line tool requires two sets of source files: `--kss-source`: Unprocessed files containing the KSS markup and LESS/SASS variables -`--style-source` Preprocessed/compiled stylesheets to be used in the styleguide +`--style-source` Pre-processed/compiled style sheets to be used in the styleguide Example usage: @@ -304,7 +304,7 @@ Disable Shadow DOM encapsulation. When this option parameter is enabled, all sty **disableHtml5Mode** (boolean, optional, default: false) -Disable HTML5 URL mode. When this option parameter is enabled, style guide will use hashbang URLs instead of HTML5 history API. This is useful when hosting static style guides. +Disable HTML5 URL mode. When this option parameter is enabled, style guide will use hash bang URLs instead of HTML5 history API. This is useful when hosting static style guides. **basicAuth** (object, optional, default: null) @@ -328,7 +328,7 @@ Disable variable saving from web interface. Path to file that defines custom UI color overrides using PostCSS variables. See all possible variables [here](https://github.com/SC5/sc5-styleguide/blob/master/lib/app/css/_styleguide_variables.css). -Internal styles could be overriden by defining new styles inside the `styleguide_custom_styles` mixin. This mixin is added to the end of the application stylesheet. +Internal styles could be overridden by defining new styles inside the `styleguide_custom_styles` mixin. This mixin is added to the end of the application style sheet. You can define your own styles with @@ -337,7 +337,7 @@ You can define your own styles with /* Define your styles here */ } ``` -PostCSS configuration supports mixins, nesting, valiables, media queries. +PostCSS configuration supports mixins, nesting, variables, media queries. **parsers** (object, optional) @@ -353,7 +353,7 @@ parsers: { } ``` -Styleguide tries to guess which parser to use when parsing variable information from stylesheets. The object key defines the file extension to match and the value refers to the parser name. There are three parsers available: `scss`, `less` and `postcss`. +Styleguide tries to guess which parser to use when parsing variable information from style sheets. The object key defines the file extension to match and the value refers to the parser name. There are three parsers available: `scss`, `less` and `postcss`. For example, to parse all .css files using postcss parser, following configuration could be used: @@ -492,7 +492,7 @@ You can also write the same with comma-syntax // file: path/to/application-file.js, path/to/dependency-file.js, path/to/stylesheet.css ``` -### Ignore parts of the stylesheet from being processed +### Ignore parts of the style sheet from being processed You can ignore parts of the CSS or KSS from being processed using the following tags: @@ -735,7 +735,7 @@ extraHead: [ ] ``` -This way you can enrich the documented components with JavaScript. Keep in mind that you need to use `disableEncapsulation` parameter to make the components visible for the parent page JavaScript (otherwise they are encapsulated with shadowDOM). +This way you can enrich the documented components with JavaScript. Keep in mind that you need to use `disableEncapsulation` parameter to make the components visible for the parent page JavaScript (otherwise they are encapsulated with shadow DOM). ### onRendered event @@ -812,7 +812,7 @@ Point your browser to ### Articles, blog posts * [article] [Visual regression tests for SC5 StyleGuide](https://sc5.io/posts/visual-regression-testing/) -* [article] [Automating Style Guide-Driven Development @ SmashingMagazine](https://www.smashingmagazine.com/2015/03/automating-style-guide-driven-development/) +* [article] [Automating Style Guide-Driven Development @ Smashing Magazine](https://www.smashingmagazine.com/2015/03/automating-style-guide-driven-development/) * [blog post] [Styleguide the Smaller Things](http://varya.me/en/posts/sc5-styleguide-for-smallers/) * [article] [Advanced techniques for the SC5 styleguide generator](https://www.alleyinteractive.com/blog/advanced-techniques-for-the-sc5-styleguide-generator/) * [blog post] [Living SC5 Styleguide, the next level](http://varya.me/en/posts/sc5-style-guide-next-level/)