Skip to content

D
debomatic-webui
Commit 9bfbad18 authored by Leo Iannacone's avatar Leo Iannacone
Browse files
Options

update to bootstrap 3.2.0

parent f8bff919
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
debomatic-webui/public/javascripts/page_generic.js
View file @ 9bfbad18
...@@ -143,12 +143,12 @@ function Page_Generic() { ...@@ -143,12 +143,12 @@ function Page_Generic() {
$('footer .info').show(); $('footer .info').show();
$('.navbar .home-link').show(); $('.navbar .home-link').show();
} }
var bootstrap_theme_css = '/external_libs/bootstrap-3.2.0-dist/css/bootstrap-theme.min.css';
if (config.preferences.glossy_theme) { if (config.preferences.glossy_theme) {
if ($('head').find('link[href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css"]').length === 0) if ($('head').find('link[href="' + bootstrap_theme_css + '"]').length === 0)
$('head').append('<link rel="stylesheet" href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css">'); $('head').append('<link rel="stylesheet" href="' + bootstrap_theme_css + '">');
} else { } else {
$('head').find('link[href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css"]').remove(); $('head').find('link[href="' + bootstrap_theme_css + '"]').remove();
} }
}; };
......
debomatic-webui/scripts/install/download_external_libs.sh
View file @ 9bfbad18
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
EXT_LIBS_DIR="${SCRIPTS_DIR}/../public/external_libs" EXT_LIBS_DIR="${SCRIPTS_DIR}/../public/external_libs"
get_bootstrap() { get_bootstrap() {
VERSION="3.1.1" VERSION="3.2.0"
NAME="bootstrap-${VERSION}-dist" NAME="bootstrap-${VERSION}-dist"
if [ -d ${EXT_LIBS_DIR}/${NAME} ] ; then return ; fi if [ -d ${EXT_LIBS_DIR}/${NAME} ] ; then return ; fi
ARCHIVE=${NAME}.zip ARCHIVE=${NAME}.zip
......
debomatic-webui/views/footer.ejs
View file @ 9bfbad18
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<script src='/socket.io/socket.io.js?<%= version %>'></script> <script src='/socket.io/socket.io.js?<%= version %>'></script>
<script src='/external_libs/jquery/jquery-1.11.0.min.js'></script> <script src='/external_libs/jquery/jquery-1.11.0.min.js'></script>
<script src="/external_libs/bootstrap-3.1.1-dist/js/bootstrap.min.js"></script> <script src="/external_libs/bootstrap-3.2.0-dist/js/bootstrap.min.js"></script>
<script> <script>
var config = <%- JSON.stringify(web) %> var config = <%- JSON.stringify(web) %>
......
debomatic-webui/views/header.ejs
View file @ 9bfbad18
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<link rel="shortcut icon" type="image/x-icon" href="/images/favicon.png" /> <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.png" />
<title><%= web.title %></title> <title><%= web.title %></title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap.min.css"> <link rel="stylesheet" href="/external_libs/bootstrap-3.2.0-dist/css/bootstrap.min.css">
<link rel="stylesheet" href="/external_libs/bootstrap-3.1.1-dist/css/bootstrap-theme.min.css"> <link rel="stylesheet" href="/external_libs/bootstrap-3.2.0-dist/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/stylesheets/style.css?<%= version %>"> <link rel="stylesheet" href="/stylesheets/style.css?<%= version %>">
</head> </head>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment