Commit graph

159 commits

Author SHA1 Message Date
Holger dbcde97bf5 Merge pull request #19 from imcodingideas/patch-1
Fixed spelling mistake in Readme.MD - thx @imcodingideas
2016-10-25 09:06:42 +02:00
Holger Könemann 6ad5a9bc99 0.1.5 release 2016-10-24 19:55:18 +02:00
Holger 306751e7d5 Merge pull request #22 from MikeFoden/patch-1
#20 Removed Bower References
2016-10-24 19:49:01 +02:00
Mike Foden 1e5ef93513 #20 Removed Bower References 2016-10-24 11:30:16 +11:00
Joseph Chambers a141e767c1 Fixed spelling mistake in Readme.MD 2016-10-22 23:54:45 -07:00
koenemann 4e9947db87 Updating browser-sync version 2016-10-11 16:41:38 +02:00
koenemann b49a314d96 Requires the latest 0.4.8 parent theme understrap package 2016-10-10 15:21:49 +02:00
koenemann 170da1bbac adding gulp dist task 2016-09-13 15:58:05 +02:00
koenemann 44b6fc905c Removing Bower in favor of npm, recompiling 2016-09-13 15:50:12 +02:00
Holger d8c4117767 Merge pull request #12 from tedgeving/patch-2
Update .gitignore
2016-08-30 19:23:40 +02:00
ted 7e702a5358 Update .gitignore
removed unnecessary directory paths
2016-08-30 10:31:42 -06:00
Holger 8a160a5616 Merge pull request #11 from tedgeving/patch-1
Update README.md
2016-08-30 17:49:29 +02:00
ted f4765ca4c4 Update README.md
Fixed typos.
2016-08-30 09:48:32 -06:00
koenemann 0ac91f99c3 Adding prod and dev task to gulpfile.js 2016-08-19 11:32:46 +02:00
koenemann 0710de0ea8 Updating UnderStrap dependency 2016-08-15 15:06:31 +02:00
Holger c62fbc6054 Merge pull request #7 from akkolad/patch-1
Update gulpfile.js
2016-08-01 16:00:40 +02:00
koenemann b0ce6eccec Merge remote-tracking branch 'origin/master'
# Conflicts:
#	css/child-theme.css
#	css/child-theme.min.css
2016-08-01 15:58:39 +02:00
koenemann ca57e941dd Update to BS4 / v 0.1.4 2016-08-01 15:57:06 +02:00
sébastien poilvert 7e7fec113c Update gulpfile.js
To enable the "live reload" for browser-sync
2016-08-01 15:52:29 +02:00
Holger Könemann 89b314aeff recompile css 2016-07-07 17:26:41 +02:00
koenemann d8156ca041 Version update 0.1.2 => 0.1.3 2016-06-24 08:14:46 +02:00
koenemann 3652f71632 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	css/child-theme.min.css
2016-06-24 08:13:29 +02:00
koenemann a0f344d36b Updating dependencies and recompile 2016-06-24 08:12:53 +02:00
Holger Könemann 44fee3311e Adding slider_settings.js to child theme too 2016-06-02 16:19:57 +02:00
Holger Könemann e13d62120b Load child theme variable sat first so that they overwrites anything else if necessary 2016-05-25 20:04:25 +02:00
Holger Könemann d4c525dde4 Resorting sass assets
Child theme now overwrites BS variables if they are already set in
parent theme
2016-05-20 16:44:52 +02:00
Holger Könemann f7965fb94f Adding infos to read about renaming the parent zip folder 2016-05-17 18:25:27 +02:00
koenemann 83323a5bc5 Adding Theter script for BS4 tooltip comp and recompile 2016-05-06 08:35:42 +02:00
Holger c43ec5df0d Merge pull request #3 from dvlopes/master
Added support to browser-sync
2016-05-04 14:31:38 +02:00
Diego Versiani e35b9a0aaf Merge pull request #2 from dvlopes/browser-sync
Added support to browser-sync.
2016-05-03 18:27:45 -03:00
Diego Versiani f1ffe337e6 Revert 535c9ef: Update .gitignore to ignore src folder. 2016-05-03 18:25:53 -03:00
Diego Versiani c4ca58cf09 Added support to browser-sync. 2016-05-03 18:05:25 -03:00
Diego Versiani 535c9ef4f0 Update .gitignore to ignore src folder. 2016-05-03 17:59:24 -03:00
Diego Versiani 77f2eaaa31 Merge pull request #1 from holger1411/master
Update master from original project.
2016-04-29 16:49:26 -03:00
koenemann ccd4da396a Resorting BS4 assets 2016-04-29 11:35:16 +02:00
koenemann d7b4539f5a Switch to BS4 and recompile 2016-04-29 09:04:49 +02:00
koenemann 880b28c570 recompile css 2016-04-25 14:31:54 +02:00
koenemann 35598dcd65 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	sass/child-theme.scss
2016-04-25 14:30:24 +02:00
koenemann 583acb69d8 adding own asset files into child themes sass folder
adding for any asset scss files in between understrap and original
sources. So you can exclude single scss files by commenting it out
without overwriting your changes during an update
2016-04-25 14:28:28 +02:00
Holger Könemann 65964854bc Child theme loads just own JS and CSS files
Child theme´s gulp file generates own child-theme.min.js and
child-theme.min.css files. Theme just loads this assets. Just the php
files are shared with parent theme from now on
2016-04-23 11:37:02 +02:00
Holger Könemann e0f56f30dc Deregister parent theme js files 2016-04-23 11:24:03 +02:00
Holger Könemann 09b9392f06 unregister missing parent themes css thx to @sandilands
The child theme loads it´s own css file and don´t need the parent
themes css. But it uses the parent themes inc/enqueue.php file which
register and enqueued the parent themes css file from the child themes
directory. Caused a 404 request. Fixed with this changes.
2016-04-23 11:21:18 +02:00
Holger 838223d7dd Merge pull request #1 from Lidbetter/patch-1
Fix gulp watch minify css. Thx to @Lidbetter
2016-04-20 10:10:43 +02:00
Robin Lidbetter eeff472b0a Fix gulp watch minify css
Changed minify css file path to the correct one for this child theme.
2016-04-19 11:18:03 -04:00
koenemann f78a8f2dd1 Adding Bootstrap4 as optional dependency to child theme, too 2016-04-08 09:14:54 +02:00
koenemann 589193103b incorporate understrap theme file only 2016-04-04 13:45:31 +02:00
Holger Könemann 67c0868160 revert to last version 2016-03-23 10:18:13 +01:00
Holger Könemann 68efaa9b50 streamline the dev process with parent again 2016-03-22 17:37:27 +01:00
Holger Könemann d1e6ac360e adjusting file structure so that is the same like in the parent theme 2016-03-20 14:29:05 +01:00
Holger Könemann 295b7e078d streamline npm/bower/sass workflow between parent and child theme 2016-03-20 14:18:22 +01:00