diff --git a/war/package.json b/war/package.json index bd3ecd1cfc2d0ebd3d87fea5646be13285b4e9eb..6f354e272ead8c3dbf59283e1f60ed7010d1d11a 100644 --- a/war/package.json +++ b/war/package.json @@ -30,6 +30,7 @@ }, "dependencies": { "bootstrap-detached": "^3.3.5-v1", + "file-loader": "^5.0.2", "jenkins-js-modules": "^1.5.0", "jquery": "2.1.4", "jquery-detached": "^2.1.4-v2", diff --git a/war/pom.xml b/war/pom.xml index 934be6cf4df2517910eb74b841a63647b76ccff2..4d5a7e052954629aee5cdc3806ec109b6638fb2b 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -652,7 +652,7 @@ THE SOFTWARE. gulp - jshint bundle + bundle diff --git a/war/src/main/webapp/css/font-awesome/css/LICENSE.txt b/war/src/main/less/font-awesome/css/LICENSE.txt similarity index 100% rename from war/src/main/webapp/css/font-awesome/css/LICENSE.txt rename to war/src/main/less/font-awesome/css/LICENSE.txt diff --git a/war/src/main/webapp/css/font-awesome/css/font-awesome.css b/war/src/main/less/font-awesome/css/font-awesome.css similarity index 100% rename from war/src/main/webapp/css/font-awesome/css/font-awesome.css rename to war/src/main/less/font-awesome/css/font-awesome.css diff --git a/war/src/main/webapp/css/font-awesome/css/font-awesome.min.css b/war/src/main/less/font-awesome/css/font-awesome.min.css similarity index 100% rename from war/src/main/webapp/css/font-awesome/css/font-awesome.min.css rename to war/src/main/less/font-awesome/css/font-awesome.min.css diff --git a/war/src/main/webapp/css/font-awesome/fonts/FontAwesome.otf b/war/src/main/less/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from war/src/main/webapp/css/font-awesome/fonts/FontAwesome.otf rename to war/src/main/less/font-awesome/fonts/FontAwesome.otf diff --git a/war/src/main/webapp/css/font-awesome/fonts/LICENSE.txt b/war/src/main/less/font-awesome/fonts/LICENSE.txt similarity index 100% rename from war/src/main/webapp/css/font-awesome/fonts/LICENSE.txt rename to war/src/main/less/font-awesome/fonts/LICENSE.txt diff --git a/war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.eot b/war/src/main/less/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.eot rename to war/src/main/less/font-awesome/fonts/fontawesome-webfont.eot diff --git a/war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.svg b/war/src/main/less/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.svg rename to war/src/main/less/font-awesome/fonts/fontawesome-webfont.svg diff --git a/war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.ttf b/war/src/main/less/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.ttf rename to war/src/main/less/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.woff b/war/src/main/less/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.woff rename to war/src/main/less/font-awesome/fonts/fontawesome-webfont.woff diff --git a/war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.woff2 b/war/src/main/less/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.woff2 rename to war/src/main/less/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/war/src/main/webapp/css/google-fonts/roboto/LICENSE.txt b/war/src/main/less/google-fonts/roboto/LICENSE.txt similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/LICENSE.txt rename to war/src/main/less/google-fonts/roboto/LICENSE.txt diff --git a/war/src/main/webapp/css/google-fonts/roboto/css/roboto.css b/war/src/main/less/google-fonts/roboto/css/roboto.css similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/css/roboto.css rename to war/src/main/less/google-fonts/roboto/css/roboto.css diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.eot b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.eot similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.eot rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.eot diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.svg b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.svg similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.svg rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.svg diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.ttf b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.ttf similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.ttf rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.ttf diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff2 b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff2 similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff2 rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff2 diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.eot b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.eot similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.eot rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.eot diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.svg b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.svg similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.svg rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.svg diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.ttf b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.ttf similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.ttf rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.ttf diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff2 b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff2 similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff2 rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff2 diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.eot b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.eot similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.eot rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.eot diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.svg b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.svg similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.svg rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.svg diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.ttf b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.ttf similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.ttf rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.ttf diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff2 b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff2 similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff2 rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff2 diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.eot b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.eot similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.eot rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.eot diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.svg b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.svg similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.svg rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.svg diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.ttf b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.ttf similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.ttf rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.ttf diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff2 b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff2 similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff2 rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff2 diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.eot b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.eot similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.eot rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.eot diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.svg b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.svg similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.svg rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.svg diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.ttf b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.ttf similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.ttf rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.ttf diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff diff --git a/war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff2 b/war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff2 similarity index 100% rename from war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff2 rename to war/src/main/less/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff2 diff --git a/war/src/main/webapp/css/icomoon/css/icomoon.css b/war/src/main/less/icomoon/css/icomoon.css similarity index 100% rename from war/src/main/webapp/css/icomoon/css/icomoon.css rename to war/src/main/less/icomoon/css/icomoon.css diff --git a/war/src/main/webapp/css/icomoon/fonts/icomoon.eot b/war/src/main/less/icomoon/fonts/icomoon.eot similarity index 100% rename from war/src/main/webapp/css/icomoon/fonts/icomoon.eot rename to war/src/main/less/icomoon/fonts/icomoon.eot diff --git a/war/src/main/webapp/css/icomoon/fonts/icomoon.svg b/war/src/main/less/icomoon/fonts/icomoon.svg similarity index 100% rename from war/src/main/webapp/css/icomoon/fonts/icomoon.svg rename to war/src/main/less/icomoon/fonts/icomoon.svg diff --git a/war/src/main/webapp/css/icomoon/fonts/icomoon.ttf b/war/src/main/less/icomoon/fonts/icomoon.ttf similarity index 100% rename from war/src/main/webapp/css/icomoon/fonts/icomoon.ttf rename to war/src/main/less/icomoon/fonts/icomoon.ttf diff --git a/war/src/main/webapp/css/icomoon/fonts/icomoon.woff b/war/src/main/less/icomoon/fonts/icomoon.woff similarity index 100% rename from war/src/main/webapp/css/icomoon/fonts/icomoon.woff rename to war/src/main/less/icomoon/fonts/icomoon.woff diff --git a/war/src/main/less/pluginSetupWizard.less b/war/src/main/less/pluginSetupWizard.less index b4290524f3baa8aa7f4171b04e83609f388710e4..ad9e2330a02c725f5b4df419ecfd3efe7227a181 100644 --- a/war/src/main/less/pluginSetupWizard.less +++ b/war/src/main/less/pluginSetupWizard.less @@ -1,6 +1,6 @@ -@import (css) '../css/font-awesome/css/font-awesome.min.css'; -@import (css) '../css/icomoon/css/icomoon.css'; -@import (css) '../css/google-fonts/roboto/css/roboto.css'; +@import (css) './font-awesome/css/font-awesome.css'; +@import (css) './icomoon/css/icomoon.css'; +@import (css) './google-fonts/roboto/css/roboto.css'; .bootstrap-3 * { // simple reset @@ -52,14 +52,14 @@ animation-iteration-count: infinite; animation-timing-function: linear; } - + .no-spin() { -webkit-animation-name: none; -moz-animation-name: none; -ms-animation-name: none; animation-name: none; } - + .modal { padding: 20px 0; } @@ -80,7 +80,7 @@ box-sizing: border-box; padding: 4.2em 0 4.8em 0; } - + .jenkins-version { float: left; margin: .7em .5em; @@ -90,7 +90,7 @@ .container.error-container { padding: 4em 3em; max-width: 100%; - + h1 { color: #a94442; } @@ -351,7 +351,7 @@ .plugin { position: relative; - + &.selected label { background: #dff0d8; margin: 4px -7px; @@ -364,7 +364,7 @@ color: #777; } } - + label { font-weight: normal; padding: 7px 2px 7px 27px; @@ -411,11 +411,11 @@ } } } - + @badge-color: #555; @badge-background: #f8f8f8; @link-color: #337ab7; - + .website-link { position: relative; height: 15px; @@ -467,20 +467,20 @@ padding: 5px 13px; margin: 0 0; z-index: 100; - + .badge { margin-left: 7px; padding-left: 9px; background: @badge-background; color: @badge-color; box-shadow: 0 0 1px 0 rgba(0,0,0,.25); - + &:after { content: '\f0d9'; font: 15px FontAwesome; display: inline-block; - width: 13px; - height: 13px; + width: 13px; + height: 13px; margin: -4px -2px 0px 1px; vertical-align: middle; } @@ -488,7 +488,7 @@ &:hover, &.active, &:focus { text-decoration: none; outline: none; - + .badge { background: @badge-color; color: #fff; @@ -496,16 +496,16 @@ outline: none; } } - + &.selected .toggle-dependency-list { top: -1px; right: -1px; } - + .dep-list { padding: 10px 0 6px 0; display: none; - + > h3 { margin: 0 25px 4px 0; color: #555555; @@ -514,19 +514,19 @@ border-bottom: 1px solid rgba(255, 255, 255, 0.5); padding-bottom: 5px; } - + .badge { padding: 4px 8px; margin: 5px 3px 0 0; background: @badge-background; color: @badge-color; box-shadow: 0 0 1px 0 rgba(0,0,0,.25); - + &:after { content: '\f14c'; font: 11px FontAwesome; } - + &:hover, &:active, &:focus { color: #fff; background: @link-color; @@ -534,12 +534,12 @@ } } } - + &.show-dependencies { .toggle-dependency-list .badge:after { content: '\f0d7'; } - + .dep-list { display: block; } @@ -618,7 +618,7 @@ z-index: 5; top: 33.3%; width: 25%; - + .install-console-scroll { position: absolute; top: 6px; @@ -628,7 +628,7 @@ overflow:auto; font: 12px monospace; } - + @media screen and (max-width: 992px) { width: 100%; position: relative; @@ -657,7 +657,7 @@ content: ' ** '; } } - + .dependency-legend { color: #777; position: absolute; @@ -840,7 +840,7 @@ } } } - + .security-panel { &.security-panel, > iframe { position: absolute; @@ -855,7 +855,7 @@ margin: 0; } } - + .alert { font-size: initial; } diff --git a/war/webpack.config.js b/war/webpack.config.js index f5f8a9254a6619ad2c09567efb8a0622fc346395..3d2f88444f5d9f9eb55696c6dbb1adb98abf6dba 100644 --- a/war/webpack.config.js +++ b/war/webpack.config.js @@ -3,8 +3,14 @@ const MiniCSSExtractPlugin = require('mini-css-extract-plugin'); const FixStyleOnlyEntriesPlugin = require("webpack-fix-style-only-entries"); module.exports = { - mode: 'development', + // mode: 'development', entry: { + // "page-init": [path.join(__dirname, "src/main/js/page-init.js")], + "pluginSetupWizard": [ + // path.join(__dirname, "src/main/js/pluginSetupWizard.js"), + path.join(__dirname, "src/main/less/pluginSetupWizard.less"), + ], + // "upgradeWizard": [path.join(__dirname, "src/main/js/upgradeWizard.js")], "add-item": [ path.join(__dirname, "src/main/js/add-item.js"), path.join(__dirname, "src/main/js/add-item.less"), @@ -33,18 +39,30 @@ module.exports = { test: /\.(css|less)$/, loader: [MiniCSSExtractPlugin.loader, "css-loader", "less-loader"] }, + { + test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[ext]', + outputPath: 'fonts/' + } + } + ] + }, ] }, optimization: { - // splitChunks: { - // chunks: 'async', - // cacheGroups: { - // commons: { - // test: /[\\/]node_modules[\\/]/, - // name: 'vendors', - // chunks: 'all' - // } - // } - // } + splitChunks: { + // chunks: 'async', + // cacheGroups: { + // commons: { + // test: /[\\/]node_modules[\\/]/, + // name: 'vendors', + // chunks: 'all' + // } + // } + } } } diff --git a/war/yarn.lock b/war/yarn.lock index 5881bf0428d77cc5f5294118333cd2736b97425e..bdff1ed47c1cb2b890f9556067e701f60b6ea05f 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -1701,6 +1701,14 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== +file-loader@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.0.2.tgz#7f3d8b4ac85a5e8df61338cfec95d7405f971caa" + integrity sha512-QMiQ+WBkGLejKe81HU8SZ9PovsU/5uaLo0JdTCEXOYv7i7jfAjHZi1tcwp9tSASJPOmmHZtbdCervFmXMH/Dcg== + dependencies: + loader-utils "^1.2.3" + schema-utils "^2.5.0" + filename-regex@^2.0.0: version "2.0.1" resolved "https://repo.jenkins-ci.org/api/npm/npm/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" @@ -4737,6 +4745,14 @@ schema-utils@^2.0.0: ajv "^6.10.2" ajv-keywords "^3.4.1" +schema-utils@^2.5.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f" + integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg== + dependencies: + ajv "^6.10.2" + ajv-keywords "^3.4.1" + semver@^4.1.0: version "4.3.6" resolved "https://repo.jenkins-ci.org/api/npm/npm/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"