ch4o5/locomotive-boilerplate
Template
1
0
Fork 0
mirror of https://github.com/locomotivemtl/locomotive-boilerplate.git synced 2026-01-15 00:55:08 +08:00
Code Issues Projects Releases Wiki Activity
739 Commits 24 Branches 0 Tags
master
Commit Graph

739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Bégay
ea32114277 Merge pull request #24 from stephenbe/master 
New clearfix syntax and add mixin
 2015-05-28 10:04:29 -04:00
Stephen Bégay
9c390c0673 New clearfix syntax and add mixin reference : https://github.com/locomotivemtl/locomotive-boilerplate/issues/23 2015-05-26 21:58:02 -04:00
Stephen Bégay
c9280f9f70 Merge pull request #22 from stephenbe/master 
add current url in controller
 2015-05-26 21:51:11 -04:00
Stephen Bégay
d2b785fab7 Merge branch 'master' of https://github.com/locomotivemtl/locomotive-boilerplate 
Conflicts:
	www/modules/boilerplate/code/boilerplate.template.controller.php
 2015-05-26 21:50:39 -04:00
Stephen Bégay
5ad4f5220f remove extra star 2015-05-26 21:29:48 -04:00
stephenbe
592af9db0d add current url controller 2015-04-21 16:29:58 -04:00
Mathieu Ducharme
247c24ce9f Merge pull request #21 from AntoineBoulanger/master 
Change favicon links and images
 2015-04-21 10:32:38 -04:00
Antoine Boulanger
503ce1cacb Change favicon links and images & change .html name 2015-04-21 10:16:47 -04:00
Stephen Bégay
41246a7145 Merge pull request #20 from AntoineBoulanger/master 
Add BrowserSync to Grunt and README
 2015-04-21 09:58:02 -04:00
Antoine Boulanger
50fc1926f8 Add Grunt and BrowserSync task in README. 2015-04-20 09:53:11 -04:00
Antoine Boulanger
2b65c4a356 Add BrowserSync Grunt plugin and sync task 2015-04-20 09:41:41 -04:00
Stephen Bégay
a2745bbf47 Charcoal_Object_Loader 
was \Charcoal\Object_Loader
 2015-04-14 15:10:28 -04:00
Stephen Bégay
e2f7456f0d ignore base/fonts.scss in the csscomb task 2015-04-14 13:38:15 -04:00
Mathieu Ducharme
7ab3a19c99 Merge pull request #19 from dominiclord/master 
Restructuring of scripts to mimic Charcoal's autoload concept. @todo Move the `init()` call in caller file, not included file.
 2015-04-10 13:24:17 -04:00
dlord
2feb0e772b Restructuring of scripts to mimic Charcoal's autoload concept 2015-04-09 16:45:55 -04:00
Mathieu Ducharme
7cee438caf Merge pull request #18 from stephenbe/master 
External grunt tasks
 2015-04-03 17:26:20 -04:00
Stephen Bégay
f2c2ab37e7 add jsonlint and phplint external 2015-04-03 17:01:28 -04:00
Stephen Bégay
47cf83f00f Load external grunt tasks with a single function 2015-04-03 15:26:13 -04:00
Stephen Bégay
44356da29a remove various unused tasks 2015-04-03 14:15:32 -04:00
Stephen Bégay
83dbd29a7a External grunt tasks 
- all the grunt tasks are now external
- changed package.json name from project-x to boilerplate
- remove various grunt tasks that weren't being used
-- jshint
-- phplint
-- imagemin (we now use kraken)
- add load-grunt-tasks
- fixed a few indent issues with various grunt tasks
 2015-04-03 14:10:51 -04:00
Stephen Bégay
79c1e27a4c add removeTitle and removeDesc in the gruntfile 
I am removing `title` and `desc` from the compiled svg because we use svg inline so we have the chance to use the title attribute then.
 2015-03-27 16:01:56 -04:00
Stephen Bégay
0b7d23b73f Fixed the svgmin in the gruntfile 2015-03-27 15:53:13 -04:00
Stephen Bégay
74da5a3e34 fixed cssmin that wasn't working in the gruntfile 2015-03-27 15:17:00 -04:00
Mathieu Ducharme
100352f548 Merge pull request #17 from AntoineBoulanger/master 
Custom form elements base. Moved to generics instead of base.
 2015-03-24 13:12:16 -04:00
Antoine Boulanger
c70df1f2c8 Add form section in README 2015-03-24 13:05:05 -04:00
Antoine Boulanger
4395a8508d New form boilerplate 2015-03-24 12:56:56 -04:00
Stephen Bégay
23554f2052 Merge pull request #16 from AntoineBoulanger/master 
Grid update: mixins
 2015-03-24 12:39:11 -04:00
Antoine Boulanger
c07834c3f8 Update grid README 2015-03-23 12:56:15 -04:00
Antoine Boulanger
2c5cba9de5 Update grid in mixins 2015-03-23 12:42:54 -04:00
Antoine Boulanger
8874bbe372 Fix ignore nodes_modules 2015-03-20 16:48:15 -04:00
Mathieu Ducharme
a71648b0ea Merge pull request #15 from stephenbe/master 
Add static basic email
 2015-03-20 14:41:49 -04:00
Mathieu Ducharme
8d1cfda139 Fix class name 2015-03-20 11:01:04 -04:00
stephenbe
db51b591f7 add static basic email 2015-03-19 11:04:38 -04:00
stephenbe
2d9d77a2de Remove the three dots in the readme 2015-03-17 12:14:04 -04:00
Bene
8d3e7b7f9e Merge pull request #14 from BeneRoch/master 
Update README.md
 2015-03-16 10:58:41 -04:00
Bene
184bc6de45 Update README.md 2015-03-16 10:53:36 -04:00
Mathieu Ducharme
3021743cc5 Delete clone.sh 2015-03-16 10:12:55 -04:00
Mathieu Ducharme
da9338ffc5 Merge pull request #13 from mducharme/master 
Change project-x to www, Add PHP scripts, charcoal-legacy as dependency.
 2015-03-16 10:11:13 -04:00
Mathieu Ducharme
0aeffd804e Merge branch 'locomotivemtl-master' 2015-03-16 10:07:57 -04:00
Mathieu Ducharme
b11283fb91 Fix merge conflicts 2015-03-16 10:07:25 -04:00
Stephen Bégay
da4b88f1e4 Merge pull request #8 from AntoineBoulanger/master 
Remove jacket and add ie9 class
 2015-03-16 10:03:25 -04:00
Mathieu Ducharme
cf625693ab Boilerplate setup now in PHP 2015-03-16 09:56:38 -04:00
Mathieu Ducharme
e1d2b8c074 project-x was moved to www 2015-03-13 17:50:29 -04:00
Mathieu Ducharme
467c715470 Add charcoal-legacy as dependency 2015-03-13 17:48:42 -04:00
Mathieu Ducharme
078382ef3e Move project-x to www 2015-03-13 17:48:15 -04:00
Mathieu Ducharme
e4e037fc2e Minor config fixes 2015-03-13 17:47:51 -04:00
Stephen Bégay
6c31021771 using the asset.styles to load the main.css 2015-03-13 17:17:51 -04:00
Stephen Bégay
82ce0338c5 Merge pull request #12 from stephenbe/patch-1 
add a default config file
 2015-03-13 14:17:59 -04:00
Mathieu Ducharme
24fe575128 Merge pull request #11 from mducharme/master 
Add a composer dependency on CLImate. Add a new script to setup database...
 2015-03-13 14:16:17 -04:00
Stephen Bégay
df47091b31 add a default config file 2015-03-13 14:15:21 -04:00