Skip to content

Commit 2d64dd5

Browse files
committed
Merge branch '2.8'
* 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 ...
2 parents c2b92e1 + 7e910b2 commit 2d64dd5

File tree

106 files changed

+1428
-1582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1428
-1582
lines changed

best_practices/web-assets.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ much more concise:
2929
.. note::
3030

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

3535
Using Assetic
3636
-------------
@@ -51,16 +51,15 @@ tools like GruntJS.
5151

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

5857
.. code-block:: html+jinja
5958

6059
{% stylesheets
6160
'css/bootstrap.min.css'
6261
'css/main.css'
63-
filter='cssrewrite' output='css/compiled/all.css' %}
62+
filter='cssrewrite' output='css/compiled/app.css' %}
6463
<link rel="stylesheet" href="{{ asset_url }}" />
6564
{% endstylesheets %}
6665

@@ -69,7 +68,7 @@ with a single Twig tag:
6968
{% javascripts
7069
'js/jquery.min.js'
7170
'js/bootstrap.min.js'
72-
output='js/compiled/all.js' %}
71+
output='js/compiled/app.js' %}
7372
<script src="{{ asset_url }}"></script>
7473
{% endjavascripts %}
7574

book/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ The Book
2121
translation
2222
service_container
2323
performance
24-
internals
2524

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

0 commit comments

Comments
 (0)