From 137846e154ece1a1ee226bd95d4d97356886b4a8 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 11 Dec 2017 22:01:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=D1=81=D1=8F=20=D0=BE=D1=82=20=D0=BB=D0=B8=D1=88?= =?UTF-8?q?=D0=BD=D0=B8=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Необходимые скрипты и стили берем из CDN --- .../kinosearch/webapp/SpringMvcConfig.java | 3 - .../kinosearch/webapp/header.inc.ftl | 6 +- .../resources/kinosearch/webapp/player.ftl | 2 +- .../webapp/static/css/bootstrap.min.css | 5 - .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 ------------------ .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../webapp/static/js/bootstrap.min.js | 7 - .../webapp/static/js/jquery-2.1.4.min.js | 4 - .../webapp/static/js/js.cookie-2.1.0.min.js | 2 - 12 files changed, 4 insertions(+), 313 deletions(-) delete mode 100644 src/main/resources/kinosearch/webapp/static/css/bootstrap.min.css delete mode 100644 src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.eot delete mode 100644 src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.svg delete mode 100644 src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.ttf delete mode 100644 src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.woff delete mode 100644 src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 src/main/resources/kinosearch/webapp/static/js/bootstrap.min.js delete mode 100644 src/main/resources/kinosearch/webapp/static/js/jquery-2.1.4.min.js delete mode 100644 src/main/resources/kinosearch/webapp/static/js/js.cookie-2.1.0.min.js diff --git a/src/main/java/kinosearch/webapp/SpringMvcConfig.java b/src/main/java/kinosearch/webapp/SpringMvcConfig.java index 7d3bcb9..ee4c9dd 100644 --- a/src/main/java/kinosearch/webapp/SpringMvcConfig.java +++ b/src/main/java/kinosearch/webapp/SpringMvcConfig.java @@ -18,9 +18,6 @@ public class SpringMvcConfig extends WebMvcConfigurerAdapter { /* Styles */ registry.addResourceHandler("/css/**") .addResourceLocations(staticPath+"css/"); - /* Fonts */ - registry.addResourceHandler("/fonts/**") - .addResourceLocations(staticPath+"fonts/"); /* JavaScript */ registry.addResourceHandler("/js/**") .addResourceLocations(staticPath+"js/"); diff --git a/src/main/resources/kinosearch/webapp/header.inc.ftl b/src/main/resources/kinosearch/webapp/header.inc.ftl index 9232b96..8d7e9c2 100644 --- a/src/main/resources/kinosearch/webapp/header.inc.ftl +++ b/src/main/resources/kinosearch/webapp/header.inc.ftl @@ -8,11 +8,11 @@ KinoSearch :: ${rutext} - + - - + +
diff --git a/src/main/resources/kinosearch/webapp/player.ftl b/src/main/resources/kinosearch/webapp/player.ftl index d3b13b3..d6ba356 100644 --- a/src/main/resources/kinosearch/webapp/player.ftl +++ b/src/main/resources/kinosearch/webapp/player.ftl @@ -1,6 +1,6 @@ [#ftl] [#include "/header.inc.ftl"] - +