Moved css into a lib folder for external code
This commit is contained in:
parent
b80991280a
commit
2ee0e775be
18 changed files with 16 additions and 16 deletions
6
hal-core/resources/web/css/bootstrap.min.css
vendored
6
hal-core/resources/web/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -263,8 +263,8 @@ th {
|
|||
@font-face {
|
||||
font-family: 'Glyphicons Halflings';
|
||||
|
||||
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');
|
||||
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 {
|
||||
position: relative;
|
||||
6
hal-core/resources/web/css/lib/bootstrap.min.css
vendored
Normal file
6
hal-core/resources/web/css/lib/bootstrap.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -9,9 +9,9 @@
|
|||
<title>HAL</title>
|
||||
|
||||
<!-- Bootstrap core CSS -->
|
||||
<link href="css/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="css/bootstrap-switch.min.css" rel="stylesheet">
|
||||
<link href="css/c3.min.css" rel="stylesheet">
|
||||
<link href="css/lib/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="css/lib/bootstrap-switch.min.css" rel="stylesheet">
|
||||
<link href="css/lib/c3.min.css" rel="stylesheet">
|
||||
<link href="css/hal.css" rel="stylesheet">
|
||||
|
||||
<script src="js/lib/jquery-1.11.3.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<link href="css/jquery.filer.css" rel="stylesheet">
|
||||
<link href="css/svg.select.min.css" rel="stylesheet">
|
||||
<link href="css/lib/jquery.filer.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/svg.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<title>HAL is initializing...</title>
|
||||
|
||||
<!-- 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">
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import java.util.Map;
|
|||
public class StartupWebPage implements HttpPage {
|
||||
private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/startup.tmpl";
|
||||
private static final List<String> ACCEPTED_FILE_LIST = Arrays.asList(
|
||||
"/css/bootstrap.min.css",
|
||||
"/css/lib/bootstrap.min.css",
|
||||
"/css/hal.css",
|
||||
"/fonts/glyphicons-halflings-regular.ttf",
|
||||
"/fonts/glyphicons-halflings-regular.woff",
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@
|
|||
</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/videojs-http-streaming.min.js"></script>
|
||||
Loading…
Add table
Add a link
Reference in a new issue