ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Moved css into a lib folder for external code

Browse source
This commit is contained in:
Ziver Koc 2023-01-10 03:08:17 +01:00
parent b80991280a
commit 2ee0e775be
18 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hal-core/resources/web/css/bootstrap.min.css vendored
View file

File diff suppressed because one or more lines are too long

0
hal-core/resources/web/css/bootstrap-switch.css → hal-core/resources/web/css/lib/bootstrap-switch.css vendored
View file

0
hal-core/resources/web/css/bootstrap-switch.min.css → hal-core/resources/web/css/lib/bootstrap-switch.min.css vendored
View file

0
hal-core/resources/web/css/bootstrap-theme.css → hal-core/resources/web/css/lib/bootstrap-theme.css vendored
View file

0
hal-core/resources/web/css/bootstrap-theme.min.css → hal-core/resources/web/css/lib/bootstrap-theme.min.css vendored
View file

4
hal-core/resources/web/css/bootstrap.css → hal-core/resources/web/css/lib/bootstrap.css vendored
View file

@ -263,8 +263,8 @@ th {
@font-face { @font-face {
font-family: 'Glyphicons Halflings'; font-family: 'Glyphicons Halflings';
src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../../fonts/glyphicons-halflings-regular.eot');
src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); src: url('../../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
} }
.glyphicon { .glyphicon {
position: relative; position: relative;

6
hal-core/resources/web/css/lib/bootstrap.min.css vendored Normal file
View file

File diff suppressed because one or more lines are too long

0
hal-core/resources/web/css/c3.css → hal-core/resources/web/css/lib/c3.css vendored
View file

0
hal-core/resources/web/css/c3.min.css → hal-core/resources/web/css/lib/c3.min.css vendored
View file

0
hal-core/resources/web/css/jquery.filer.css → hal-core/resources/web/css/lib/jquery.filer.css vendored
View file

0
hal-core/resources/web/css/svg.select.css → hal-core/resources/web/css/lib/svg.select.css vendored
View file

0
hal-core/resources/web/css/svg.select.min.css → hal-core/resources/web/css/lib/svg.select.min.css vendored
View file

6
hal-core/resources/web/main_index.tmpl
View file

@ -9,9 +9,9 @@
<title>HAL</title> <title>HAL</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet"> <link href="css/lib/bootstrap.min.css" rel="stylesheet">
<link href="css/bootstrap-switch.min.css" rel="stylesheet"> <link href="css/lib/bootstrap-switch.min.css" rel="stylesheet">
<link href="css/c3.min.css" rel="stylesheet"> <link href="css/lib/c3.min.css" rel="stylesheet">
<link href="css/hal.css" rel="stylesheet"> <link href="css/hal.css" rel="stylesheet">
<script src="js/lib/jquery-1.11.3.min.js"></script> <script src="js/lib/jquery-1.11.3.min.js"></script>

4
hal-core/resources/web/map.tmpl
View file

@ -42,8 +42,8 @@
</div> </div>
</div> </div>
<link href="css/jquery.filer.css" rel="stylesheet"> <link href="css/lib/jquery.filer.css" rel="stylesheet">
<link href="css/svg.select.min.css" rel="stylesheet"> <link href="css/lib/svg.select.min.css" rel="stylesheet">
<script src="js/lib/jquery.filer.min.js"></script> <script src="js/lib/jquery.filer.min.js"></script>
<script src="js/lib/svg.min.js"></script> <script src="js/lib/svg.min.js"></script>

2
hal-core/resources/web/startup.tmpl
View file

@ -5,7 +5,7 @@
<title>HAL is initializing...</title> <title>HAL is initializing...</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="/css/bootstrap.min.css" rel="stylesheet"> <link href="/css/lib/bootstrap.min.css" rel="stylesheet">
<link href="/css/hal.css" rel="stylesheet"> <link href="/css/hal.css" rel="stylesheet">
</head> </head>

2
hal-core/src/se/hal/page/StartupWebPage.java
View file

@ -18,7 +18,7 @@ import java.util.Map;
public class StartupWebPage implements HttpPage { public class StartupWebPage implements HttpPage {
private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/startup.tmpl"; private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/startup.tmpl";
private static final List<String> ACCEPTED_FILE_LIST = Arrays.asList( private static final List<String> ACCEPTED_FILE_LIST = Arrays.asList(
"/css/bootstrap.min.css", "/css/lib/bootstrap.min.css",
"/css/hal.css", "/css/hal.css",
"/fonts/glyphicons-halflings-regular.ttf", "/fonts/glyphicons-halflings-regular.ttf",
"/fonts/glyphicons-halflings-regular.woff", "/fonts/glyphicons-halflings-regular.woff",

2
plugins/hal-nvr/resources/web/camera_detail.tmpl
View file

@ -51,6 +51,6 @@
</div> </div>
</div> </div>
<link href="css/video-js.min.css" rel="stylesheet"> <link href="css/lib/video-js.min.css" rel="stylesheet">
<script src="js/lib/video.min.js"></script> <script src="js/lib/video.min.js"></script>
<script src="js/lib/videojs-http-streaming.min.js"></script> <script src="js/lib/videojs-http-streaming.min.js"></script>

0
plugins/hal-nvr/resources/web/css/video-js.min.css → plugins/hal-nvr/resources/web/css/lib/video-js.min.css vendored
View file