Permalink
Browse files

add bootstrapBundle

  • Loading branch information...
1 parent e13cf46 commit 215574477e7a93add55b62aed7ab4bf526f765c8 Florian Pondepeyre committed Mar 8, 2013
View
@@ -23,6 +23,7 @@ public function registerBundles()
new Gr\BackendBundle\GrBackendBundle(),
new Gr\ModelBundle\GrModelBundle(),
new FOS\UserBundle\FOSUserBundle(),
+ new Braincrafted\BootstrapBundle\BraincraftedBootstrapBundle(),
);
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
Binary file not shown.
@@ -1,13 +1,17 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="UTF-8" />
- <title>{% block title %}Welcome!{% endblock %}</title>
- {% block stylesheets %}{% endblock %}
- <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
- </head>
- <body>
- {% block body %}{% endblock %}
- {% block javascripts %}{% endblock %}
- </body>
+<head>
+ <meta charset="UTF-8" />
+ <title>{% block title %}Welcome!{% endblock %}</title>
+ <link rel="stylesheet" href="{{ asset('css/bootstrap.css') }}">
+ {% block stylesheets %}{% endblock %}
+ <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
+</head>
+<body>
+{% block body %}{% endblock %}
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+<script>window.jQuery || document.write('<script src="{{ asset('js/jquery.js') }}"><\/script>')</script>
+<script src="{{ asset('js/bootstrap.js') }}"></script>
+{% block javascripts %}{% endblock %}
+</body>
</html>
View
@@ -24,19 +24,51 @@ framework:
twig:
debug: %kernel.debug%
strict_variables: %kernel.debug%
+ form:
+ resources:
+ - "BraincraftedBootstrapBundle:Form:form_div_layout.html.twig"
# Assetic Configuration
assetic:
debug: %kernel.debug%
use_controller: false
bundles: [ ]
- #java: /usr/bin/java
filters:
+ less:
+ node: /usr/bin/node
+ node_paths: [/var/local/webroot/node/node_modules]
+ apply_to: "\.less$"
cssrewrite: ~
- #closure:
- # jar: %kernel.root_dir%/Resources/java/compiler.jar
- #yui_css:
- # jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar
+ assets:
+ bootstrap_css:
+ inputs:
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/less/bootstrap.less
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/less/responsive.less
+ filters:
+ - less
+ - cssrewrite
+ output: css/bootstrap.css
+ bootstrap_js:
+ inputs:
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-transition.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-alert.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-button.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-carousel.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-collapse.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-dropdown.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-modal.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-tooltip.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-popover.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-scrollspy.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-tab.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-typeahead.js
+ - %kernel.root_dir%/../vendor/twitter/bootstrap/js/bootstrap-affix.js
+ output: js/bootstrap.js
+ jquery:
+ inputs:
+ - %kernel.root_dir%/../vendor/jquery/jquery/jquery-1.9.1.js
+ output: js/jquery.js
+
# Doctrine Configuration
doctrine:
@@ -76,4 +108,4 @@ propel:
fos_user:
db_driver: propel # other valid values are 'mongodb', 'couchdb' and 'propel'
firewall_name: main
- user_class: FOS\UserBundle\Propel\User
+ user_class: FOS\UserBundle\Propel\User
View
@@ -20,7 +20,9 @@
"jms/di-extra-bundle": "1.3.*",
"propel/propel-bundle": "1.2.*@dev",
"friendsofsymfony/user-bundle": "*",
- "willdurand/propel-typehintable-behavior": "*"
+ "willdurand/propel-typehintable-behavior": "*",
+ "braincrafted/bootstrap-bundle": "dev-master",
+ "twitter/bootstrap": "2.3.*"
},
"scripts": {
"post-install-cmd": [
Oops, something went wrong.

0 comments on commit 2155744

Please sign in to comment.