Merge branch 'master' into testing

README.md

@@ -6,9 +6,9 @@ Website: http://understrap.com
 Changelog
 =
             - **0.3.4 SEP. 9th 2015**
-                   - Adding basic Woocommerce support
+                   - Adding basic WooCommerce support
                    - Cleanup for submitting to wordpress.org
-                   - Removing _s SASS ... no need for basic styling with Bootstrap.
+                   - Removing _s SASS ... no need for basic styling. Thats Bootstrap´s job.
 
 
             - **0.3.1 AUG. 12th 2015**
@@ -49,12 +49,13 @@ At the moment UnderStrap is in a very early stage. But if you wan´t feel free t
 Basic Features
 =
 - Combines the _s WordPress Starter Theme PHP/JS files and Bootstrap´s HTML/CSS/JS
-- Comes with Bootstrap SASS source files and additional scss files. Nicely sorted and ready to add your own variables/customize the Bootstrap variables.
+- Comes with Bootstrap (3.3.5) SASS source files and additional scss files. Nicely sorted and ready to add your own variables/customize the Bootstrap variables.
 - Uses a single and minified CSS file for all the basic stuff
-- Font Awesome Icon Font integrated (V 4.2.0): http://fortawesome.github.io/Font-Awesome/
+- Font Awesome Icon Font integrated (V 4.4.0): http://fortawesome.github.io/Font-Awesome/
 - Comes with extra slider script - By owl.carousel (V 2.0.0-beta.2.4): http://www.owlcarousel.owlgraphic.com/
 - Simple RTL file
 - Jetpack ready
+- WooCommerce support
 - Child Theme ready (A basic starter Child Theme will be released in the future as a separate Repository)
 - Translation ready
 

bower.json

@@ -1,15 +1,25 @@
 {
   "name": "understrap",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "homepage": "http://understrap.com",
   "authors": [
-    "Holger Könemann <office@holgerkoenemann.de>"
+    "Holger Koenemann <office@holgerkoenemann.de>"
   ],
+  "description": "UnderStrap is a Bootstrap and underscores based WordPress theme framework.",
+  "moduleType": "globals",
+  "main": [
+    "sass/theme.scss"
+  ],
+    "keywords": [
+      "bootstrap",
+      "underscores",
+      "wordpress",
+      "_s",
+      "sass"
+    ],
   "license": "MIT",
   "ignore": [
     "**/.*",
-    "node_modules",
-    "bower_components",
     "test",
     "tests"
   ],
@@ -18,5 +28,10 @@
     "fontawesome": "~4.4.0",
     "_s": "https://github.com/Automattic/_s.git",
     "OwlCarousel2": "~2.0.0-beta.3"
-  }
+  },
+  "_source": "https://github.com/holger1411/understrap.git",
+  "_target": "~0.3.4",
+  "_originalSource": "understrap"
 }
+
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "understrap",
-  "version": "0.2.8",
+  "version": "0.3.4",
   "description": "Wordpress Theme framework",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/holger1411/understrap",
   "dependencies": {
-    "bower": "^1.4.1",
+    "bower": "^1.5.2",
     "gulp": "^3.9.0",
     "gulp-concat": "^2.6.0",
     "gulp-ignore": "^1.2.1",