Commit Graph

226 Commits

Author SHA1 Message Date
Jesus Herman
082cea29f3 merge 2015-12-04 17:52:31 +01:00
Jesus Herman
ef31c17776 merge 2015-12-04 17:47:41 +01:00
legnaleama
8cf5fe7eef Merge pull request #12 from legnaleama/liveReload
Live reload
2015-12-04 17:44:21 +01:00
Angel Ordax
2e75d1c7af livereload 2015-12-04 17:40:33 +01:00
Angel Ordax
1da3c3e9fa live reload = navbar = conflicts 2015-12-04 17:38:32 +01:00
Angel Ordax
75dafbe466 rebase 2015-12-04 17:33:52 +01:00
Jesus Herman
98ce08244f added browser sync to dev dependencies package 2015-12-04 17:33:20 +01:00
Marvin
2462a40a2d Merge pull request #10 from jezuhke/master 2015-12-04 17:26:37 +01:00
Angel Ordax
db16164626 livereload internal folders 2015-12-04 17:25:52 +01:00
Angel Ordax
b1337fdfca reload works, navbar too 2015-12-04 17:17:49 +01:00
Jesus Herman
1683373bc4 Merge branch 'master' of github.com:Devex/BootstrapPageGenerator 2015-12-04 17:17:44 +01:00
Jesus Herman
f62158f7c8 responsive sizes class 2015-12-04 17:16:39 +01:00
Marvin
c4916bf786 Merge pull request #9 from yaneq/list-styles 2015-12-04 17:14:12 +01:00
Jesus Herman
e4011aec1e Merge branch 'master' of github.com:Devex/BootstrapPageGenerator 2015-12-04 17:13:21 +01:00
Jesus Herman
34b1f2c9c3 modal works but height is off 2015-12-04 17:13:12 +01:00
Marvin
682744c449 Merge pull request #8 from legnaleama/boobstrap 2015-12-04 16:57:05 +01:00
Jesus Herman
49d05e4355 Merge branch 'master' of github.com:Devex/BootstrapPageGenerator 2015-12-04 16:54:45 +01:00
Marvin
275209299e Merge pull request #7 from yaneq/emphasized 2015-12-04 16:42:58 +01:00
Jesus Herman
9730b63b1f sidebar content padding & compiling issue 2015-12-04 16:39:20 +01:00
Jan Koeppen
f8669fd827 styles for lists 2015-12-04 16:30:02 +01:00
Marvin
67f3b49a7f Merge pull request #6 from jezuhke/master 2015-12-04 16:27:19 +01:00
Jesus Herman
eaf2631357 sidebar and content separated 2015-12-04 16:20:30 +01:00
Angel Ordax
fb9fa9efcc autoreload server 2015-12-04 16:17:25 +01:00
Jan Koeppen
d3c271b3c3 title styles 2015-12-04 16:11:52 +01:00
Jesus Herman
0136c7164c scss structure 2015-12-04 16:10:35 +01:00
Marvin
9fc867a0f8 Merge pull request #5 from jezuhke/master 2015-12-04 15:57:30 +01:00
Jesús Herman Marina
f2fc87da02 Merge pull request #4 from Devex/master
gulp
2015-12-04 15:52:24 +01:00
Jesus Herman
554df1ddd3 gulp watch for sass partials 2015-12-04 15:51:42 +01:00
legnaleama
252e34cbdf Merge pull request #4 from legnaleama/test-branch
Test branch
2015-12-04 15:45:16 +01:00
Angel Ordax
1357a43ddd test indent 2spaces 2015-12-04 15:43:58 +01:00
Angel Ordax
322cbce273 hello world 2015-12-04 15:38:31 +01:00
Angel Ordax
994555d777 please work 2015-12-04 15:34:12 +01:00
Jesus Herman
94e7f9e5e9 Merge branch 'master' of github.com:Devex/BootstrapPageGenerator 2015-12-04 15:27:45 +01:00
Jan Koeppen
b59ad09550 Merge pull request #2 from yaneq/reindent
reindent index.html
2015-12-04 15:27:13 +01:00
Jan Koeppen
1479d65cb7 reindent index.html 2015-12-04 15:26:04 +01:00
Jesús Herman Marina
dc3729e284 Merge pull request #3 from Devex/master
testing pr again
2015-12-04 15:23:17 +01:00
Jesus Herman
db61328e23 testing pr again 2015-12-04 15:22:23 +01:00
Jesús Herman Marina
5776cfed4e Merge pull request #2 from Devex/master
testing PR
2015-12-04 15:13:31 +01:00
Jesus Herman
900deefb03 changed title testing PR 2015-12-04 15:12:32 +01:00
Jesus Herman
846faf1d42 merge 2015-12-04 15:09:29 +01:00
Jan Koeppen
09a95fb991 Merge pull request #1 from yaneq/insert-toolbox-css
use our toolbox css
2015-12-04 15:06:34 +01:00
Angel Ordax
aebbd97933 test push 2 2015-12-04 15:04:42 +01:00
Jesus Herman
dda648b43d merge 2015-12-04 15:04:17 +01:00
Jesus Herman
ce1b0fa8ac loading toolbox 2015-12-04 14:57:08 +01:00
Angel Ordax
848164d708 test push 2015-12-04 14:52:29 +01:00
Jan Koeppen
44441b8037 use our toolbox css 2015-12-04 14:08:51 +01:00
Francesco Malagrino
2b18ace6d1 Update README.md 2015-05-14 13:16:29 +01:00
Francesco Malagrino
385b641a7a Update README.md 2015-05-14 13:16:10 +01:00
Francesco Malagrino
90e7ddbdf9 Update README.md 2015-05-14 13:14:08 +01:00
Francesco Malagrino
76f6e3bdf0 Update pick-a-color-1.2.0.min.css 2015-05-14 12:25:17 +01:00