Skip to content

Commit

Permalink
Merge branch '2.8'
Browse files Browse the repository at this point in the history
* 2.8: (67 commits)
  Update data_collector.rst
  Updated types articles
  Improve invalid user provider exception message
  Check user provider type
  Use configured user provider instead of injection
  Reviewed form type options includes
  Update authentication.rst
  Update authentication.rst
  Remove Serial Comma
  Update validation.rst
  Improve Choice Validation Constraint Example
  Clarify `query_builder` closure return type
  Remove indentations for all-whitespace lines.
  Fix incorrect instructions regarding linking to the "full panel", improve roll-over data example.
  Flesh out twig-template for custom data-collector
  Simply moving new section down a little lower - I believe some of the other options are a bit more common (totally subjective)
  describe the allow_extra_fields form option
  another fix!
  Fixing things thanks to Wouter
  Tweaks to the new using commands in a controller article
  ...
  • Loading branch information
weaverryan committed May 23, 2015
2 parents c2b92e1 + 7e910b2 commit 2d64dd5
Show file tree
Hide file tree
Showing 106 changed files with 1,428 additions and 1,582 deletions.
13 changes: 6 additions & 7 deletions best_practices/web-assets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ much more concise:
.. note::

Keep in mind that ``web/`` is a public directory and that anything stored
here will be publicly accessible. For that reason, you should put your
compiled web assets here, but not their source files (e.g. SASS files).
here will be publicly accessible, including all the original asset files
(e.g. Sass, LESS and CoffeScript files).

Using Assetic
-------------
Expand All @@ -51,16 +51,15 @@ tools like GruntJS.

:doc:`Assetic </cookbook/assetic/asset_management>` is an asset manager capable
of compiling assets developed with a lot of different frontend technologies
like LESS, Sass and CoffeeScript.
Combining all your assets with Assetic is a matter of wrapping all the assets
with a single Twig tag:
like LESS, Sass and CoffeeScript. Combining all your assets with Assetic is a
matter of wrapping all the assets with a single Twig tag:

.. code-block:: html+jinja

{% stylesheets
'css/bootstrap.min.css'
'css/main.css'
filter='cssrewrite' output='css/compiled/all.css' %}
filter='cssrewrite' output='css/compiled/app.css' %}
<link rel="stylesheet" href="{{ asset_url }}" />
{% endstylesheets %}

Expand All @@ -69,7 +68,7 @@ with a single Twig tag:
{% javascripts
'js/jquery.min.js'
'js/bootstrap.min.js'
output='js/compiled/all.js' %}
output='js/compiled/app.js' %}
<script src="{{ asset_url }}"></script>
{% endjavascripts %}

Expand Down
1 change: 0 additions & 1 deletion book/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ The Book
translation
service_container
performance
internals

.. include:: /book/map.rst.inc
Loading

0 comments on commit 2d64dd5

Please sign in to comment.