Browse Source

Cleaned static stuff

master
Dashie der otter 3 years ago
parent
commit
9583321f8d

+ 0
- 3
.gitmodules View File

@@ -1,9 +1,6 @@
[submodule "texttable"]
path = texttable
url = https://github.com/bufordtaylor/python-texttable.git
[submodule "static/bootstrap-vertical-tabs"]
path = static/bootstrap-vertical-tabs
url = https://github.com/dbtek/bootstrap-vertical-tabs.git
[submodule "static/webcamjs"]
path = static/webcamjs
url = https://github.com/jhuckaby/webcamjs.git

+ 0
- 1
static/bootstrap-vertical-tabs

@@ -1 +0,0 @@
Subproject commit 6be315cf48f0bbf5d41db87338017bca14a85ae0

+ 132
- 15
static/css/bootstrap-theme.css View File

@@ -1,9 +1,8 @@
/*!
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

.btn-default,
.btn-primary,
.btn-success,
@@ -29,6 +28,27 @@
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
}
.btn-default.disabled,
.btn-primary.disabled,
.btn-success.disabled,
.btn-info.disabled,
.btn-warning.disabled,
.btn-danger.disabled,
.btn-default[disabled],
.btn-primary[disabled],
.btn-success[disabled],
.btn-info[disabled],
.btn-warning[disabled],
.btn-danger[disabled],
fieldset[disabled] .btn-default,
fieldset[disabled] .btn-primary,
fieldset[disabled] .btn-success,
fieldset[disabled] .btn-info,
fieldset[disabled] .btn-warning,
fieldset[disabled] .btn-danger {
-webkit-box-shadow: none;
box-shadow: none;
}
.btn-default .badge,
.btn-primary .badge,
.btn-success .badge,
@@ -63,8 +83,24 @@
background-color: #e0e0e0;
border-color: #dbdbdb;
}
.btn-default:disabled,
.btn-default[disabled] {
.btn-default.disabled,
.btn-default[disabled],
fieldset[disabled] .btn-default,
.btn-default.disabled:hover,
.btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover,
.btn-default.disabled:focus,
.btn-default[disabled]:focus,
fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus,
.btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus,
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
background-color: #e0e0e0;
background-image: none;
}
@@ -88,8 +124,24 @@
background-color: #265a88;
border-color: #245580;
}
.btn-primary:disabled,
.btn-primary[disabled] {
.btn-primary.disabled,
.btn-primary[disabled],
fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
.btn-primary.disabled:focus,
.btn-primary[disabled]:focus,
fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #265a88;
background-image: none;
}
@@ -113,8 +165,24 @@
background-color: #419641;
border-color: #3e8f3e;
}
.btn-success:disabled,
.btn-success[disabled] {
.btn-success.disabled,
.btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
.btn-success.disabled:focus,
.btn-success[disabled]:focus,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus,
.btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #419641;
background-image: none;
}
@@ -138,8 +206,24 @@
background-color: #2aabd2;
border-color: #28a4c9;
}
.btn-info:disabled,
.btn-info[disabled] {
.btn-info.disabled,
.btn-info[disabled],
fieldset[disabled] .btn-info,
.btn-info.disabled:hover,
.btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover,
.btn-info.disabled:focus,
.btn-info[disabled]:focus,
fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus,
.btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus,
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #2aabd2;
background-image: none;
}
@@ -163,8 +247,24 @@
background-color: #eb9316;
border-color: #e38d13;
}
.btn-warning:disabled,
.btn-warning[disabled] {
.btn-warning.disabled,
.btn-warning[disabled],
fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover,
.btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover,
.btn-warning.disabled:focus,
.btn-warning[disabled]:focus,
fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus,
.btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus,
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #eb9316;
background-image: none;
}
@@ -188,8 +288,24 @@
background-color: #c12e2a;
border-color: #b92c28;
}
.btn-danger:disabled,
.btn-danger[disabled] {
.btn-danger.disabled,
.btn-danger[disabled],
fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover,
.btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover,
.btn-danger.disabled:focus,
.btn-danger[disabled]:focus,
fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus,
.btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus,
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
background-color: #c12e2a;
background-image: none;
}
@@ -254,6 +370,7 @@
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-radius: 4px;
}
.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .active > a {

+ 1
- 1
static/css/bootstrap-theme.css.map
File diff suppressed because it is too large
View File


+ 3
- 3
static/css/bootstrap-theme.min.css
File diff suppressed because it is too large
View File


+ 578
- 110
static/css/bootstrap.css
File diff suppressed because it is too large
View File


+ 1
- 1
static/css/bootstrap.css.map
File diff suppressed because it is too large
View File


+ 3
- 3
static/css/bootstrap.min.css
File diff suppressed because it is too large
View File


+ 2026
- 0
static/css/font-awesome.css
File diff suppressed because it is too large
View File


+ 4
- 0
static/css/font-awesome.min.css
File diff suppressed because it is too large
View File


BIN
static/fonts/FontAwesome.otf View File


BIN
static/fonts/fontawesome-webfont.eot View File


+ 640
- 0
static/fonts/fontawesome-webfont.svg
File diff suppressed because it is too large
View File


BIN
static/fonts/fontawesome-webfont.ttf View File


BIN
static/fonts/fontawesome-webfont.woff View File


BIN
static/fonts/fontawesome-webfont.woff2 View File


BIN
static/fonts/glyphicons-halflings-regular.eot View File


+ 273
- 214
static/fonts/glyphicons-halflings-regular.svg
File diff suppressed because it is too large
View File


BIN
static/fonts/glyphicons-halflings-regular.ttf View File


BIN
static/fonts/glyphicons-halflings-regular.woff View File


BIN
static/fonts/glyphicons-halflings-regular.woff2 View File


+ 259
- 216
static/js/bootstrap.js
File diff suppressed because it is too large
View File


+ 5
- 5
static/js/bootstrap.min.js
File diff suppressed because it is too large
View File


+ 4
- 0
static/js/jquery-2.1.4.min.js
File diff suppressed because it is too large
View File


+ 5
- 5
templates/layout.jinja2 View File

@@ -14,11 +14,11 @@
</title>

<!-- Bootstrap Core CSS -->
<link href="{{url_for('static', filename='bower_components/bootstrap/dist/css/bootstrap.min.css')}}" rel="stylesheet">
<link href="{{url_for('static', filename='css/bootstrap.min.css')}}" rel="stylesheet">
<!-- Custom CSS -->
<link href="{{url_for('static', filename='css/sb-admin-2.css')}}" rel="stylesheet">
<!-- Custom Fonts -->
<link href="{{url_for('static', filename='bower_components/font-awesome/css/font-awesome.min.css')}}" rel="stylesheet" type="text/css">
<link href="{{url_for('static', filename='css/font-awesome.min.css')}}" rel="stylesheet" type="text/css">

<link href="{{ url_for('static', filename='themes_jstree/proton/style.min.css') }}" rel="stylesheet" type="text/css">

@@ -125,10 +125,10 @@
</div>

<!-- jQuery -->
<script src="{{url_for('static', filename='bower_components/jquery/dist/jquery.min.js')}}"></script>
<script src="{{url_for('static', filename='js/jquery-ui.js')}}"></script>
<script src="{{url_for('static', filename='js/jquery-2.1.4.min.js')}}"></script>
<script src="{{url_for('static', filename='js/jquery-ui.min.js')}}"></script>
<!-- Bootstrap Core JavaScript -->
<script src="{{url_for('static', filename='bower_components/bootstrap/dist/js/bootstrap.min.js')}}"></script>
<script src="{{url_for('static', filename='js/bootstrap.min.js')}}"></script>
<!-- Custom Theme JavaScript -->
<script src="{{url_for('static', filename='js/jstree.min.js')}}"></script>
<script src="{{url_for('static', filename='jtable/jquery.jtable.min.js')}}"></script>