From 665a1c1f854ca4cb8174052a6d5381e32e131a21 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sun, 1 Jul 2018 03:26:55 +0300 Subject: [PATCH] Assets hierarchy refactored. --- public/{ => assets/bootstrap}/css/bootstrap.min.css | 0 public/{ => assets/bootstrap}/js/bootstrap.min.js | 0 public/{ => assets/jquery}/js/jquery-3.3.1.slim.min.js | 0 public/{ => assets/magnetico-web}/css/style.css | 0 public/{ => assets/popper}/js/popper.min.js | 0 templates/base.html.twig | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename public/{ => assets/bootstrap}/css/bootstrap.min.css (100%) rename public/{ => assets/bootstrap}/js/bootstrap.min.js (100%) rename public/{ => assets/jquery}/js/jquery-3.3.1.slim.min.js (100%) rename public/{ => assets/magnetico-web}/css/style.css (100%) rename public/{ => assets/popper}/js/popper.min.js (100%) diff --git a/public/css/bootstrap.min.css b/public/assets/bootstrap/css/bootstrap.min.css similarity index 100% rename from public/css/bootstrap.min.css rename to public/assets/bootstrap/css/bootstrap.min.css diff --git a/public/js/bootstrap.min.js b/public/assets/bootstrap/js/bootstrap.min.js similarity index 100% rename from public/js/bootstrap.min.js rename to public/assets/bootstrap/js/bootstrap.min.js diff --git a/public/js/jquery-3.3.1.slim.min.js b/public/assets/jquery/js/jquery-3.3.1.slim.min.js similarity index 100% rename from public/js/jquery-3.3.1.slim.min.js rename to public/assets/jquery/js/jquery-3.3.1.slim.min.js diff --git a/public/css/style.css b/public/assets/magnetico-web/css/style.css similarity index 100% rename from public/css/style.css rename to public/assets/magnetico-web/css/style.css diff --git a/public/js/popper.min.js b/public/assets/popper/js/popper.min.js similarity index 100% rename from public/js/popper.min.js rename to public/assets/popper/js/popper.min.js diff --git a/templates/base.html.twig b/templates/base.html.twig index 274c18c..8ef028c 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -12,11 +12,11 @@ {% block css %} - + - + {% endblock %} @@ -57,9 +57,9 @@ {% block javascript %} - - - + + + {% endblock %}