added text/css and text/javascript

domstor-project · Oct 25, 2017 · b2783c8 · b2783c8
1 parent 884c8e4
commit b2783c8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/app/Resources/SonataAdminBundle/views/layout.html.twig b/app/Resources/SonataAdminBundle/views/layout.html.twig
@@ -2,17 +2,15 @@
 
 {% block stylesheets %}
     {{ parent() }}
-    {% stylesheets filter='cssrewrite'
+    {% stylesheets filter='cssrewrite,?scssphp' output="css/admin.css"
         'bundles/sonataformatter/markitup/skins/sonata/style.css'
         'bundles/sonataformatter/markitup/sets/markdown/style.css'
         'bundles/sonataformatter/markitup/sets/html/style.css'
         'bundles/sonataformatter/markitup/sets/textile/style.css'
+        'bundles/app/sass/admin.scss'
     %}
     <link rel="stylesheet" href="{{ asset_url }}" type="text/css" media="all" />
     {% endstylesheets %}
-    {% stylesheets 'bundles/app/sass/admin.scss' filter="scssphp" output="css/admin.css" %}
-        <link  rel="stylesheet" href="{{ asset_url }}" />
-    {% endstylesheets %}
 {% endblock %}
 
 {% block javascripts %}

diff --git a/src/AppBundle/Resources/views/Home/index.html.twig b/src/AppBundle/Resources/views/Home/index.html.twig
@@ -2,26 +2,24 @@
 
 {% block stylesheets %}
     {{ parent() }}
-    {% stylesheets filter='cssrewrite,?scssphp'
+    {% stylesheets filter="cssrewrite,?scssphp" output="css/index.css"
         "https://cdnjs.cloudflare.com/ajax/libs/owl-carousel/1.3.3/owl.carousel.min.css"
         "https://cdnjs.cloudflare.com/ajax/libs/owl-carousel/1.3.3/owl.theme.min.css"
         "https://cdnjs.cloudflare.com/ajax/libs/bxslider/4.2.12/jquery.bxslider.min.css"
+        'bundles/app/sass/index.scss'
     %}
-        <link rel="stylesheet" href="{{ asset_url }}" />
-    {% endstylesheets %}
-    {% stylesheets 'bundles/app/sass/index.scss' filter="cssrewrite,?scssphp" output="css/index.css" %}
-        <link  rel="stylesheet" href="{{ asset_url }}" />
+    <link type="text/css" rel="stylesheet" href="{{ asset_url }}" />
     {% endstylesheets %}
 {% endblock %}
 
 {% block javascripts %}
     {{ parent() }}
     {% javascripts filter="?jsqueeze" output="js/minified/home.js"
-            'https://cdnjs.cloudflare.com/ajax/libs/owl-carousel/1.3.3/owl.carousel.min.js'
-            'https://cdnjs.cloudflare.com/ajax/libs/bxslider/4.2.12/jquery.bxslider.min.js'
-            '@AppBundle/Resources/public/js/my.jcarousel.js'
-        %}
-        <script src="{{ asset_url }}"></script>
+        'https://cdnjs.cloudflare.com/ajax/libs/owl-carousel/1.3.3/owl.carousel.min.js'
+        'https://cdnjs.cloudflare.com/ajax/libs/bxslider/4.2.12/jquery.bxslider.min.js'
+        '@AppBundle/Resources/public/js/my.jcarousel.js'
+    %}
+    <script type="text/javascript" src="{{ asset_url }}"></script>
     {% endjavascripts %}
 {% endblock %}
 

diff --git a/src/AppBundle/Resources/views/internal_pages.html.twig b/src/AppBundle/Resources/views/internal_pages.html.twig
@@ -2,23 +2,21 @@
 
 {% block stylesheets %}
     {{ parent() }}
-    {% stylesheets filter='cssrewrite,?scssphp'
+    {% stylesheets filter="cssrewrite,?scssphp" output="css/inner_page.css"
         "https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.css"
+        'bundles/app/sass/inner_page.scss'
     %}
-        <link rel="stylesheet" href="{{ asset_url }}" />
-    {% endstylesheets %}
-    {% stylesheets 'bundles/app/sass/inner_page.scss' filter="cssrewrite,?scssphp" output="css/inner_page.css" %}
-        <link rel="stylesheet" href="{{ asset_url }}" />
+    <link type="text/css" rel="stylesheet" href="{{ asset_url }}" />
     {% endstylesheets %}
 {% endblock %}
 
 {% block javascripts %}
     {{ parent() }}
     {% javascripts filter="?jsqueeze" output="js/minified/internal_pages.js"
-            'https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.js'
-            '@AppBundle/Resources/public/js/fancy.js'
-        %}
-        <script src="{{ asset_url }}"></script>
+        'https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.js'
+        '@AppBundle/Resources/public/js/fancy.js'
+    %}
+    <script type="text/javascript" src="{{ asset_url }}"></script>
     {% endjavascripts %}
 {% endblock %}
 

diff --git a/src/AppBundle/Resources/views/layout.html.twig b/src/AppBundle/Resources/views/layout.html.twig
@@ -7,7 +7,7 @@
         "http://fonts.googleapis.com/css?family=Roboto+Slab|Roboto:400,500,700&subset=latin,cyrillic"
         "bundles/app/css/style.css"
     %}
-        <link rel="stylesheet" href="{{ asset_url }}" />
+        <link type="text/css" rel="stylesheet" href="{{ asset_url }}" />
     {% endstylesheets %}
 {% endblock %}
 
@@ -22,11 +22,11 @@
         <script src="{{ asset_url }}"></script>
         {% endjavascripts %}
     <!--[if lt IE 9]>
-        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+        <script type="text/javascript" src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+        <script type="text/javascript" src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
-        <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
-        <script src="{{ path('fos_js_routing_js', {'callback': 'fos.Router.setData'}) }}"></script>
+        <script type="text/javascript" src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
+        <script type="text/javascript" src="{{ path('fos_js_routing_js', {'callback': 'fos.Router.setData'}) }}"></script>
     {% block content_js %}{% endblock %}
 {% endblock %}