Martchus
/
repoindex
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

included jquery

This commit is contained in:
Martchus 2016-02-28 01:40:53 +01:00
parent 1cffbcb468
commit 8d672465dc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -59,6 +59,7 @@ set(GUI_SRC_FILES
gui/webpage.cpp
)
set(WEB_FILES
web/3rdparty/jquery-1.11.2/jquery.min.js
web/3rdparty/bootstrap/css/bootstrap-theme.min.css
web/3rdparty/bootstrap/css/bootstrap.min.css
web/3rdparty/bootstrap/fonts/glyphicons-halflings-regular.eot

4
web/3rdparty/jquery-1.11.2/jquery.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
web/index.html
View File

@ -17,10 +17,6 @@
<link href="3rdparty/bootstrap_dropdowns_enhancement/css/dropdowns-enhancement.min.css" rel="stylesheet">
<link href="css/dashboard.css" rel="stylesheet">
<link href="css/core.css" rel="stylesheet">
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
<body>
<div class="container-fluid">
@ -245,7 +241,7 @@
</div>
</div>
<!-- Bootstrap core JavaScript -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="3rdparty/jquery-1.11.2/jquery.min.js"></script>
<script src="3rdparty/bootstrap/js/bootstrap.min.js"></script>
<script src="3rdparty/bootstrap_dropdowns_enhancement/js/dropdowns-enhancement.js"></script>
<script src="js/proto.js"></script>