Commit Graph

31 Commits

Author SHA1 Message Date
Holger Könemann 1aab2d84cb Solving merging conflicts between bs4 branch and master 2016-04-26 14:09:19 +02:00
Holger Könemann 47d33ec0c4 Merge branch 'master' into Bootstrap4
# Conflicts:
#	sass/theme.scss
2016-04-26 14:05:22 +02:00
Diego Versiani bd0f667532 Added support to browser-sync. 2016-04-15 18:06:10 -03:00
Holger Könemann 65012ff20e Add bs4 assets for Bootstrap4 branch 2016-04-06 13:24:59 +02:00
Holger Könemann d62632d693 successfully switching back and forth 2016-04-06 13:24:07 +02:00
Holger Könemann edad647856 trying BS4 2016-04-06 13:20:46 +02:00
Holger Könemann 5d6e139c7e Extracting jQuery from theme.min.js
Just one JS file caused some trouble. Theme loads the WP jQuery file as
extra file again
2016-04-06 10:17:43 +02:00
Holger Könemann d6c8bc4284 Preparations for BS4 update
adding Bootstrap4 alpha as dependency and prepare the gulpfile.js and
/sass/theme.scss for switching to BS4
2016-04-06 09:54:31 +02:00
Holger Könemann 2861f7501b resorting dev assets 2016-03-20 10:40:38 +01:00
Holger Könemann 36894c0f65 adding a "gulp script" task 2016-03-20 10:33:18 +01:00
Holger Könemann 0906c5b73e sunday mornin coffee 2016-03-20 09:49:34 +01:00
koenemann b6d780dfe2 Adding owl slider into gulpfile tasks
thx @Thomas-A-Reinert
2016-02-22 14:01:26 +01:00
koenemann 4ce85e40d1 adding missing alignright styling 2016-02-15 14:16:39 +01:00
koenemann 87e4b18123 Replacing gulp-minify-css with cssnano 2016-02-15 13:30:16 +01:00
koenemann 69cb9e8355 Adding some gulp instructions/comments 2016-01-18 14:57:52 +01:00
koenemann b09d24edba adding all js file to copy-assets gulp task 2016-01-18 14:50:32 +01:00
koenemann 546c5a611a cleanup gulpfile.js 2016-01-18 14:36:23 +01:00
koenemann 7b08152a12 fixing merge conflict in gulpfile 2016-01-18 14:25:55 +01:00
koenemann 45de7c3c48 Merge branch 'master' into testing
# Conflicts:
#	css/theme.css
#	css/theme.min.css
2016-01-08 10:46:47 +01:00
koenemann 835da8b37a recompile all assets after update into css/js 2016-01-04 14:38:20 +01:00
koenemann 009543d68c adding woff2 font type support for gulp copy-assets task 2016-01-04 14:35:52 +01:00
koenemann f8a6361cd4 Merge branch 'master' into testing
Conflicts:
	gulpfile.js
2015-09-17 13:26:04 +02:00
Holger Könemann ed86498737 again some resorting 2015-09-15 17:03:25 +02:00
Holger Könemann 80d768b1ac resorting assets from dependencies 2015-09-15 16:59:29 +02:00
koenemann 8ab9757ef8 resorting sass dependencies 2015-09-15 15:51:19 +02:00
koenemann c929ea39c5 Adding bower base path in gulp file 2015-08-21 15:35:15 +02:00
Holger Könemann ba9c9104f5 Removing underscores SASS
Because the underscores styling is overwritten by Bootstrap and some
UnderStrap basic stylings there is no need to compile the underscores
SASS code into the themes css file. Underscores JS files are still in
use.
2015-08-20 19:14:59 +02:00
Holger Könemann c97a54c55a adding copycats task 2015-08-12 09:34:41 +02:00
Holger Könemann b3c2dfa60a minify css
initial minifiy css files
2015-08-12 09:10:10 +02:00
Holger Könemann 207879eb1b adding basic gulp tasks 2015-08-12 09:06:27 +02:00
Holger Könemann 8bdc16979f Gulp for Grunt
Adding Bower and Gulp and removing Grunt
2015-08-12 08:13:10 +02:00