From af3e498b1c55f6987b112244e03203566d84e026 Mon Sep 17 00:00:00 2001 From: koenemann Date: Tue, 15 Sep 2015 14:57:58 +0200 Subject: [PATCH 1/4] Readme changes --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4a67cbf..efb2648 100644 --- a/README.md +++ b/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 From ff0dc514b9435710410cff551007aded3b5ef820 Mon Sep 17 00:00:00 2001 From: koenemann Date: Tue, 15 Sep 2015 15:02:59 +0200 Subject: [PATCH 2/4] updating bower version in package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 78fbeae..3e24bc6 100644 --- a/package.json +++ b/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", From 2cabcf7d34c9c8620647e8e4ff0010373de4b4a4 Mon Sep 17 00:00:00 2001 From: koenemann Date: Tue, 15 Sep 2015 15:30:54 +0200 Subject: [PATCH 3/4] register understrap as bower package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Run „bower install under strap —save“ to install understrap as dependency in another project. For example your child theme. --- bower.json | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 2ff4869..59a59f0 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,22 @@ { "name": "understrap", - "version": "0.3.2", + "version": "0.3.4", "homepage": "http://understrap.com", "authors": [ - "Holger Könemann " + "Holger Koenemann " ], + "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": [ "**/.*", @@ -18,5 +30,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" } + + From f22345f33ddb108f576b23d935311a9309fa45ac Mon Sep 17 00:00:00 2001 From: koenemann Date: Tue, 15 Sep 2015 15:37:01 +0200 Subject: [PATCH 4/4] fixing bower.json --- bower.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/bower.json b/bower.json index 59a59f0..13faae9 100644 --- a/bower.json +++ b/bower.json @@ -20,8 +20,6 @@ "license": "MIT", "ignore": [ "**/.*", - "node_modules", - "bower_components", "test", "tests" ],