Merge branch 'develop' into topic/button-dropdown-73

* develop: docs(usage): updates usage section, use https when installing docs(compass-usage): add compass usage tip, add minor updates docs(releasing): add release instructions chore(release): 0.2.2-alpha release chore(build): build npm dev dist fix(sass-versions-compatibility): #82 use the placehodler syntax with dc-cf, remove normalize.css dep, use existing selectors docs(demo): remove grid link since we removed also the grid chore(release): 0.2.1-alpha release, BC was introduced fix(grid): remove the grid #80 chore(release): 0.2.0-alpha release chore(build): build npm dev dist feat(dropdown): Add dropdown dropup button molecule chore(build): build npm dev dist chore(build): build npm dev dist feat(divider): Create a simple section divider feat(forms): Create input groups
zalando · Jan 15, 2016 · 07bca8f · 07bca8f
2 parents e60748b + 71bc412
commit 07bca8f
Show file tree

Hide file tree

Showing 37 changed files with 1,338 additions and 1,882 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,35 @@
+<a name="0.2.2-alpha"></a>
+## [0.2.2-alpha](https://github.com/zalando/dress-code/compare/0.2.1-alpha...v0.2.2-alpha) (2016-01-08)
+
+
+### Bug Fixes
+
+* **sass-versions-compatibility:** #82 use the placeholder syntax with dc-cf, remove normalize.css dep... ([fea826a](https://github.com/zalando/dress-code/commit/fea826a))
+
+
+
+<a name="0.2.1-alpha"></a>
+## [0.2.1-alpha](https://github.com/zalando/dress-code/compare/0.2.0-alpha...v0.2.1-alpha) (2016-01-07)
+
+
+### BREAKING CHANGES
+
+* grid: grid was removed #80 ([7f5dcf9](https://github.com/zalando/dress-code/commit/7f5dcf9))
+
+
+
+<a name="0.2.0-alpha"></a>
+# [0.2.0-alpha](https://github.com/zalando/dress-code/compare/0.1.1-alpha...v0.2.0-alpha) (2016-01-07)
+
+### Features
+
+* **divider:** Create a simple section divider ([7fc3870](https://github.com/zalando/dress-code/commit/7fc3870))
+* **dropdown:** Add dropdown dropup button molecule ([a9d22d5](https://github.com/zalando/dress-code/commit/a9d22d5))
+* **forms:** Create input groups ([668a712](https://github.com/zalando/dress-code/commit/668a712))
+* **toasts:** Add toast molecule ([f5ad3d9](https://github.com/zalando/dress-code/commit/f5ad3d9))
+* **loading-bar:** Add loading bar atom ([pull request #69](https://github.com/zalando/dress-code/pull/69))
+
+
 <a name="0.1.1-alpha"></a>
 ## [0.1.1-alpha](https://github.com/zalando/dress-code/compare/0.1.0-alpha...v0.1.1-alpha) (2015-12-30)
 

diff --git a/README.md b/README.md
@@ -12,29 +12,41 @@ The Dress Code UI toolkit is a highly-modular design system for rapid web page d
 
 ## Getting Started
 
-#### Requirements
+### Requirements
 
 * [modernizer](https://modernizr.com/) included in the ```<head>``` of your web page.
 
-#### Install
+### Install
+
+#### with Bower
+
+```
+$ bower install https://github.com/zalando/dress-code-bower.git --save
+```
+
+#### with Npm
 
-with **Bower**:
+Add the dress-code as a dependency in your package.json
 
 ```
-$ bower install git@github.com:zalando/dress-code-bower.git
+{
+  "dependencies": {
+    "dress-code": "git+https://github.com/zalando/dress-code.git"
+  }  
+}
 ```
 
-with **Npm**:
+and run
 
 ```
-$ npm install git+ssh://git@github.com:zalando/dress-code.git
+npm install
 ```
 
-> At the moment we don't support ```npm@3``` and ```node@5.x```
+> **At the moment we don't support ```npm@3``` and ```node@5.x```**
 
-#### Usage
+### Usage
 
-with **Bower**
+#### with Bower
 
 - Using the pre-compiled version:
 
@@ -47,16 +59,25 @@ Include this in your ```<head>```:
 - Compiling sass:
 
 ```
-@import "bower_components/dress-code/sass/toolkit.scss" 
+@import "bower_components/dress-code/sass/toolkit" 
 ```
 
 if you wanna use just mixins and variables...
 
 ```
-@import "bower_components/dress-code/sass/_import.scss" 
+@import "bower_components/dress-code/sass/import" 
 ```
 
-with **Npm**
+> Note for those using compass. Add this to yours config.rb file: 
+```
+add_import_path "bower_components"
+```
+Then you can import the dress-code like so: 
+```
+@import "dress-code/sass/toolkit";
+```
+
+#### with Npm (<3.x)
 
 - Using the pre-compiled version:
 
@@ -69,13 +90,13 @@ Include this in your ```<head>```:
 - Compiling sass:
 
 ```
-@import "node_modules/dress-code/dist/sass/toolkit.scss" 
+@import "node_modules/dress-code/dist/sass/toolkit" 
 ```
 
 if you wanna use just mixins and variables...
 
 ```
-@import "node_modules/dress-code/dist/sass/_import.scss" 
+@import "node_modules/dress-code/dist/sass/import" 
 ```
 
 
@@ -86,7 +107,7 @@ Developers interested in contributing should read the following guidelines:
 - [Contributing Guidelines](docs/guides/CONTRIBUTING.md)
 - [Coding Guidelines](docs/guides/CODING.md)
 - [ChangeLog](CHANGELOG.md)
-
+- [Releasing](docs/guides/RELEASING.md)
 
 ### Install
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "dress-code",
-  "version": "0.1.1-alpha",
+  "version": "0.2.2-alpha",
   "homepage": "https://zalando.github.io/dress-code",
   "description": "The Dress Code is the official style guide/UI toolkit for all Brand Solutions products.",
   "main": "sass/toolkit.scss",
@@ -19,7 +19,6 @@
   ],
   "dependencies": {
     "compass-breakpoint": "breakpoint-sass#~2.6.1",
-    "normalize-css": "normalize.css#~3.0.3",
     "susy": "~2.2.6",
     "modernizer": "~2.8.2"
   }