7b08152a12
fixing merge conflict in gulpfile
2016-01-18 14:25:55 +01:00
45de7c3c48
Merge branch 'master' into testing
...
# Conflicts:
# css/theme.css
# css/theme.min.css
2016-01-08 10:46:47 +01:00
835da8b37a
recompile all assets after update into css/js
2016-01-04 14:38:20 +01:00
009543d68c
adding woff2 font type support for gulp copy-assets task
2016-01-04 14:35:52 +01:00
f8a6361cd4
Merge branch 'master' into testing
...
Conflicts:
gulpfile.js
2015-09-17 13:26:04 +02:00
ed86498737
again some resorting
2015-09-15 17:03:25 +02:00
80d768b1ac
resorting assets from dependencies
2015-09-15 16:59:29 +02:00
8ab9757ef8
resorting sass dependencies
2015-09-15 15:51:19 +02:00
c929ea39c5
Adding bower base path in gulp file
2015-08-21 15:35:15 +02:00
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
c97a54c55a
adding copycats task
2015-08-12 09:34:41 +02:00
b3c2dfa60a
minify css
...
initial minifiy css files
2015-08-12 09:10:10 +02:00
207879eb1b
adding basic gulp tasks
2015-08-12 09:06:27 +02:00
8bdc16979f
Gulp for Grunt
...
Adding Bower and Gulp and removing Grunt
2015-08-12 08:13:10 +02:00
koenemann
Holger Könemann