Permalink
Browse files

assets refactored into web/assets instead of app/resources because of

problems with relative paths and assetic
  • Loading branch information...
inmarelibero committed Nov 9, 2012
1 parent 64d6b9d commit dc4c497e9784786940d31e74c98ae19155523a81
Showing with 7 additions and 262 deletions.
  1. +7 −7 app/config/assetic.yml
  2. BIN {app/Resources → web/assets}/FontAwesome/FontAwesome-Vectors.pdf
  3. BIN {app/Resources → web/assets}/FontAwesome/FontAwesome.ttf
  4. 0 {app/Resources → web/assets}/FontAwesome/css/font-awesome-ie7.css
  5. 0 {app/Resources → web/assets}/FontAwesome/css/font-awesome.css
  6. BIN {app/Resources → web/assets}/FontAwesome/font/fontawesome-webfont.eot
  7. 0 {app/Resources → web/assets}/FontAwesome/font/fontawesome-webfont.svg
  8. BIN {app/Resources → web/assets}/FontAwesome/font/fontawesome-webfont.ttf
  9. BIN {app/Resources → web/assets}/FontAwesome/font/fontawesome-webfont.woff
  10. 0 {app/Resources → web/assets}/FontAwesome/less/font-awesome-ie7.less
  11. 0 {app/Resources → web/assets}/FontAwesome/less/font-awesome.less
  12. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-affix.js
  13. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-alert.js
  14. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-button.js
  15. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-carousel.js
  16. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-collapse.js
  17. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-dropdown.js
  18. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-modal.js
  19. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-popover.js
  20. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-scrollspy.js
  21. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-tab.js
  22. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-tooltip.js
  23. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-transition.js
  24. 0 {app/Resources → web/assets}/bootstrap/js/bootstrap-typeahead.js
  25. 0 {app/Resources → web/assets}/bootstrap/less/accordion.less
  26. 0 {app/Resources → web/assets}/bootstrap/less/alerts.less
  27. 0 {app/Resources → web/assets}/bootstrap/less/bootstrap.less
  28. 0 {app/Resources → web/assets}/bootstrap/less/breadcrumbs.less
  29. 0 {app/Resources → web/assets}/bootstrap/less/button-groups.less
  30. 0 {app/Resources → web/assets}/bootstrap/less/buttons.less
  31. 0 {app/Resources → web/assets}/bootstrap/less/carousel.less
  32. 0 {app/Resources → web/assets}/bootstrap/less/close.less
  33. 0 {app/Resources → web/assets}/bootstrap/less/code.less
  34. 0 {app/Resources → web/assets}/bootstrap/less/component-animations.less
  35. 0 {app/Resources → web/assets}/bootstrap/less/dropdowns.less
  36. 0 {app/Resources → web/assets}/bootstrap/less/forms.less
  37. 0 {app/Resources → web/assets}/bootstrap/less/grid.less
  38. 0 {app/Resources → web/assets}/bootstrap/less/hero-unit.less
  39. 0 {app/Resources → web/assets}/bootstrap/less/labels-badges.less
  40. 0 {app/Resources → web/assets}/bootstrap/less/layouts.less
  41. 0 {app/Resources → web/assets}/bootstrap/less/mixins.less
  42. 0 {app/Resources → web/assets}/bootstrap/less/modals.less
  43. 0 {app/Resources → web/assets}/bootstrap/less/navbar.less
  44. 0 {app/Resources → web/assets}/bootstrap/less/navs.less
  45. 0 {app/Resources → web/assets}/bootstrap/less/pager.less
  46. 0 {app/Resources → web/assets}/bootstrap/less/pagination.less
  47. 0 {app/Resources → web/assets}/bootstrap/less/popovers.less
  48. 0 {app/Resources → web/assets}/bootstrap/less/progress-bars.less
  49. 0 {app/Resources → web/assets}/bootstrap/less/reset.less
  50. 0 {app/Resources → web/assets}/bootstrap/less/responsive-1200px-min.less
  51. 0 {app/Resources → web/assets}/bootstrap/less/responsive-767px-max.less
  52. 0 {app/Resources → web/assets}/bootstrap/less/responsive-768px-979px.less
  53. 0 {app/Resources → web/assets}/bootstrap/less/responsive-navbar.less
  54. 0 {app/Resources → web/assets}/bootstrap/less/responsive-utilities.less
  55. 0 {app/Resources → web/assets}/bootstrap/less/responsive.less
  56. 0 {app/Resources → web/assets}/bootstrap/less/scaffolding.less
  57. 0 {app/Resources → web/assets}/bootstrap/less/sprites.less
  58. 0 {app/Resources → web/assets}/bootstrap/less/tables.less
  59. 0 {app/Resources → web/assets}/bootstrap/less/tests/css-tests.css
  60. 0 {app/Resources → web/assets}/bootstrap/less/tests/css-tests.html
  61. 0 {app/Resources → web/assets}/bootstrap/less/tests/forms.html
  62. 0 {app/Resources → web/assets}/bootstrap/less/tests/navbar.html
  63. 0 {app/Resources → web/assets}/bootstrap/less/thumbnails.less
  64. 0 {app/Resources → web/assets}/bootstrap/less/tooltip.less
  65. 0 {app/Resources → web/assets}/bootstrap/less/type.less
  66. 0 {app/Resources → web/assets}/bootstrap/less/utilities.less
  67. 0 {app/Resources → web/assets}/bootstrap/less/variables.less
  68. 0 {app/Resources → web/assets}/bootstrap/less/wells.less
  69. 0 {app/Resources/js → web/assets/jquery}/jquery-1.8.2.js
  70. BIN web/font/fontawesome-webfont.eot
  71. +0 −255 web/font/fontawesome-webfont.svg
  72. BIN web/font/fontawesome-webfont.ttf
  73. BIN web/font/fontawesome-webfont.woff
  74. BIN web/img/glyphicons-halflings-white.png
  75. BIN web/img/glyphicons-halflings.png
View
@@ -14,21 +14,21 @@ assetic:
assets:
lesses:
inputs:
- - %kernel.root_dir%/Resources/bootstrap/less/bootstrap.less
+ - %kernel.root_dir%/../web/assets/bootstrap/less/bootstrap.less
- @BricksSiteBundle/Resources/less/*.less
- @BricksUserBundle/Resources/less/*.less
filters: lessphp
stylesheets:
inputs:
- @lesses
- - %kernel.root_dir%/Resources/FontAwesome/css/font-awesome.css
+ - %kernel.root_dir%/../web/assets/FontAwesome/css/font-awesome.css
filters: ?yui_css
javascripts:
inputs:
- - %kernel.root_dir%/Resources/js/jquery-1.8.2.js
- - %kernel.root_dir%/Resources/bootstrap/js/bootstrap-transition.js
- - %kernel.root_dir%/Resources/bootstrap/js/bootstrap-dropdown.js
- - %kernel.root_dir%/Resources/bootstrap/js/bootstrap-tab.js
- - %kernel.root_dir%/Resources/bootstrap/js/bootstrap-alert.js
+ - %kernel.root_dir%/../web/assets/jquery/jquery-1.8.2.js
+ - %kernel.root_dir%/../web/assets/bootstrap/js/bootstrap-transition.js
+ - %kernel.root_dir%/../web/assets/bootstrap/js/bootstrap-dropdown.js
+ - %kernel.root_dir%/../web/assets/bootstrap/js/bootstrap-tab.js
+ - %kernel.root_dir%/../web/assets/bootstrap/js/bootstrap-alert.js
- @BricksSiteBundle/Resources/js/*/*.js
filters: ?yui_css
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit dc4c497

Please sign in to comment.