Update to Bootstrap 4 beta
This commit is contained in:
parent
7029248610
commit
d7b606987a
|
@ -1,6 +1,3 @@
|
||||||
body {
|
|
||||||
background: lightslategray;
|
|
||||||
}
|
|
||||||
.pf-bottom-control {
|
.pf-bottom-control {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 1em;
|
bottom: 1em;
|
||||||
|
|
|
@ -2,4 +2,5 @@
|
||||||
<link rel="stylesheet" href="/css/bootstrap/bootstrap.css">
|
<link rel="stylesheet" href="/css/bootstrap/bootstrap.css">
|
||||||
<link rel="stylesheet" href="/css/pathfinder.css">
|
<link rel="stylesheet" href="/css/pathfinder.css">
|
||||||
<script type="text/javascript" src="/js/jquery/jquery.js"></script>
|
<script type="text/javascript" src="/js/jquery/jquery.js"></script>
|
||||||
|
<script type="text/javascript" src="/js/popper.js/popper.js"></script>
|
||||||
<script type="text/javascript" src="/js/bootstrap/bootstrap.js"></script>
|
<script type="text/javascript" src="/js/bootstrap/bootstrap.js"></script>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse">
|
<nav class="navbar navbar-expand-sm navbar-dark bg-dark">
|
||||||
<a class="navbar-brand" href="#">Pathfinder</a>
|
<a class="navbar-brand" href="#">Pathfinder</a>
|
||||||
<div class="collapse navbar-collapse">
|
<div class="collapse navbar-collapse">
|
||||||
<ul class="navbar-nav mr-auto">
|
<ul class="navbar-nav mr-auto">
|
||||||
|
|
|
@ -15,15 +15,17 @@
|
||||||
"@types/node": "^8.0.19",
|
"@types/node": "^8.0.19",
|
||||||
"@types/opentype.js": "0.0.0",
|
"@types/opentype.js": "0.0.0",
|
||||||
"base64-js": "^1.2.1",
|
"base64-js": "^1.2.1",
|
||||||
"bootstrap": "^4.0.0-alpha.6",
|
"bootstrap": "^4.0.0-beta",
|
||||||
"extract-loader": "^1.0.1",
|
"extract-loader": "^1.0.1",
|
||||||
"file-loader": "^0.11.2",
|
"file-loader": "^0.11.2",
|
||||||
"gl-matrix": "^2.4.0",
|
"gl-matrix": "^2.4.0",
|
||||||
"html-loader": "^0.5.1",
|
"html-loader": "^0.5.1",
|
||||||
|
"jquery": "^3.2.1",
|
||||||
"lodash": "^4.17.4",
|
"lodash": "^4.17.4",
|
||||||
"opentype.js": "^0.7.3",
|
"opentype.js": "^0.7.3",
|
||||||
"parse-color": "^1.0.0",
|
"parse-color": "^1.0.0",
|
||||||
"path-data-polyfill.js": "^1.0.2",
|
"path-data-polyfill.js": "^1.0.2",
|
||||||
|
"popper.js": "^1.12.5",
|
||||||
"ts-loader": "^2.3.2",
|
"ts-loader": "^2.3.2",
|
||||||
"typescript": "^2.4.2",
|
"typescript": "^2.4.2",
|
||||||
"webpack": "^3.4.1"
|
"webpack": "^3.4.1"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
const ExtractTextPlugin = require('extract-text-webpack-plugin');
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
devtool: 'inline-source-map',
|
devtool: 'inline-source-map',
|
||||||
entry: {
|
entry: {
|
||||||
|
|
|
@ -45,6 +45,7 @@ static STATIC_CSS_BOOTSTRAP_PATH: &'static str = "../client/node_modules/bootstr
|
||||||
static STATIC_CSS_PATHFINDER_PATH: &'static str = "../client/css/pathfinder.css";
|
static STATIC_CSS_PATHFINDER_PATH: &'static str = "../client/css/pathfinder.css";
|
||||||
static STATIC_JS_BOOTSTRAP_PATH: &'static str = "../client/node_modules/bootstrap/dist/js";
|
static STATIC_JS_BOOTSTRAP_PATH: &'static str = "../client/node_modules/bootstrap/dist/js";
|
||||||
static STATIC_JS_JQUERY_PATH: &'static str = "../client/node_modules/jquery/dist";
|
static STATIC_JS_JQUERY_PATH: &'static str = "../client/node_modules/jquery/dist";
|
||||||
|
static STATIC_JS_POPPER_JS_PATH: &'static str = "../client/node_modules/popper.js/dist/umd";
|
||||||
static STATIC_JS_PATHFINDER_PATH: &'static str = "../client";
|
static STATIC_JS_PATHFINDER_PATH: &'static str = "../client";
|
||||||
static STATIC_GLSL_PATH: &'static str = "../../shaders";
|
static STATIC_GLSL_PATH: &'static str = "../../shaders";
|
||||||
|
|
||||||
|
@ -500,6 +501,10 @@ fn static_js_bootstrap(file: PathBuf) -> Option<NamedFile> {
|
||||||
fn static_js_jquery(file: PathBuf) -> Option<NamedFile> {
|
fn static_js_jquery(file: PathBuf) -> Option<NamedFile> {
|
||||||
NamedFile::open(Path::new(STATIC_JS_JQUERY_PATH).join(file)).ok()
|
NamedFile::open(Path::new(STATIC_JS_JQUERY_PATH).join(file)).ok()
|
||||||
}
|
}
|
||||||
|
#[get("/js/popper.js/<file..>")]
|
||||||
|
fn static_js_popper_js(file: PathBuf) -> Option<NamedFile> {
|
||||||
|
NamedFile::open(Path::new(STATIC_JS_POPPER_JS_PATH).join(file)).ok()
|
||||||
|
}
|
||||||
#[get("/js/pathfinder/<file..>")]
|
#[get("/js/pathfinder/<file..>")]
|
||||||
fn static_js_pathfinder(file: PathBuf) -> Option<NamedFile> {
|
fn static_js_pathfinder(file: PathBuf) -> Option<NamedFile> {
|
||||||
NamedFile::open(Path::new(STATIC_JS_PATHFINDER_PATH).join(file)).ok()
|
NamedFile::open(Path::new(STATIC_JS_PATHFINDER_PATH).join(file)).ok()
|
||||||
|
@ -538,6 +543,7 @@ fn main() {
|
||||||
static_css_pathfinder_css,
|
static_css_pathfinder_css,
|
||||||
static_js_bootstrap,
|
static_js_bootstrap,
|
||||||
static_js_jquery,
|
static_js_jquery,
|
||||||
|
static_js_popper_js,
|
||||||
static_js_pathfinder,
|
static_js_pathfinder,
|
||||||
static_glsl,
|
static_glsl,
|
||||||
]).launch();
|
]).launch();
|
||||||
|
|
Loading…
Reference in New Issue