uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull select2 via npm instead of bower. Fix some bootstrap resource links that I managed to screw up lately.

Browse Source
This commit is contained in:
László Monda
2016-03-22 22:43:03 +01:00
parent 9f87567cf6
commit adbf5a568d
7 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bower_components/select2/dist/css/select2.min.css
Vendored
-1
View File
File diff suppressed because one or more lines are too long
bower_components/select2/dist/js/select2.min.js
Vendored
-2
View File
File diff suppressed because one or more lines are too long
index.html
+1 -1
View File
@@ -5,7 +5,7 @@
<title>Ultimate Hacking Keyboard Configurator</title>
<link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="bower_components/select2/dist/css/select2.min.css" rel="stylesheet">
<link href="node_modules/select2/dist/css/select2.min.css" rel="stylesheet">
<link href="css/app.css" rel="stylesheet">
<link href="css/macro.css" rel="stylesheet">
<script>
macro.html
+1 -1
View File
@@ -3,7 +3,7 @@
<head>
<link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="bower_components/select2/dist/css/select2.min.css" rel="stylesheet">
<link href="node_modules/select2/dist/css/select2.min.css" rel="stylesheet">
<link href="css/macro.css" rel="stylesheet">
<meta charset="utf-8">
<title>Ultimate Hacking Keyboard - Agent mockups</title>
package.json
+2 -1
View File
@@ -17,6 +17,7 @@
},
"dependencies": {
"bootstrap": "^3.3.6",
"jquery": "^2.2.2"
"jquery": "^2.2.2",
"select2": "^4.0.2"
}
}
popup.html
+4 -4
View File
@@ -2,8 +2,8 @@
<html>
<head>
<link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="bower_components/node_modules/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="bower_components/select2/dist/css/select2.min.css" rel="stylesheet">
<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="node_modules/select2/dist/css/select2.min.css" rel="stylesheet">
<link href="style.css" rel="stylesheet">
<meta charset="utf-8">
<title>Ultimate Hacking Keyboard - Agent mockups</title>
@@ -46,8 +46,8 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<script src="node_modules/jquery/dist/jquery.min.js"></script>
<script src="bower_components/handlebars/handlebars.js"></script>
<script src="bower_components/node_modules/dist/js/bootstrap.min.js"></script>
<script src="bower_components/select2/dist/js/select2.min.js"></script>
<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="node_modules/select2/dist/js/select2.min.js"></script>
<script src="script.js"></script>
<!--
popup__iframe.html
+4 -4
View File
@@ -2,8 +2,8 @@
<html>
<head>
<link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="bower_components/node_modules/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="bower_components/select2/dist/css/select2.min.css" rel="stylesheet">
<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="node_modules/select2/dist/css/select2.min.css" rel="stylesheet">
<link href="style.css" rel="stylesheet">
<meta charset="utf-8">
<title>Ultimate Hacking Keyboard - Agent mockups</title>
@@ -30,8 +30,8 @@
<script src="node_modules/jquery/dist/jquery.min.js"></script>
<script src="bower_components/handlebars/handlebars.js"></script>
<script src="bower_components/node_modules/dist/js/bootstrap.min.js"></script>
<script src="bower_components/select2/dist/js/select2.min.js"></script>
<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="node_modules/select2/dist/js/select2.min.js"></script>
<script src="script.js"></script>
<!--