Merge branch 'release/v1.2.0'

jeroenoomsNL · Jan 20, 2016 · b98b2c4 · b98b2c4
2 parents e3f02af + dfc3420
commit b98b2c4
Show file tree

Hide file tree

Showing 9 changed files with 865 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,11 +1,11 @@
 {
   "name": "initialize-css",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "homepage": "http://jeroenoomsnl.github.io/initialize-css/",
   "authors": [
     "Jeroen Ooms (@jeroenooms)"
   ],
-  "description": "Initialize.css is a complete and customizable collection of CSS best practices based on Normalize.css and HTML5 Boilerplate. Available in CSS and configurable SASS (SCSS) format.",
+  "description": "Initialize.css is a complete and customizable collection of CSS best practices based on Normalize.css and HTML5 Boilerplate. Available in CSS and configurable SASS (SCSS) and LESS format.",
   "main": "dist/_initialize.scss",
   "moduleType": [],
   "keywords": [

diff --git a/dist/_initialize.scss b/dist/_initialize.scss
@@ -1,5 +1,5 @@
 /*
- * Initialize.css is a complete and customizable collection of CSS best practices based on Normalize.css and HTML5 Boilerplate.
+ * Initialize.css (v1.2.0) is a complete and customizable collection of CSS best practices based on Normalize.css and HTML5 Boilerplate.
  * http://jeroenoomsnl.github.io/initialize-css
  *
  * HTML5 Boilerplate: https://github.com/h5bp/html5-boilerplate

diff --git a/dist/initialize.css b/dist/initialize.css
@@ -1,5 +1,5 @@
 /*
- * Initialize.css is a complete and customizable collection of CSS best practices based on Normalize.css and HTML5 Boilerplate.
+ * Initialize.css (v1.2.0) is a complete and customizable collection of CSS best practices based on Normalize.css and HTML5 Boilerplate.
  * http://jeroenoomsnl.github.io/initialize-css
  *
  * HTML5 Boilerplate: https://github.com/h5bp/html5-boilerplate