aboutsummaryrefslogtreecommitdiffstats
path: root/nikola/data/themes/bootstrap3
diff options
context:
space:
mode:
authorLibravatarDererk <dererk@satellogic.com>2016-11-15 14:18:46 -0300
committerLibravatarDererk <dererk@satellogic.com>2016-11-15 14:18:46 -0300
commitffb671c61a24a9086343b54bad080e145ff33fc5 (patch)
tree2c5291f7a34edf4afdc8e07887a148291bfa3fa1 /nikola/data/themes/bootstrap3
parent4e3224c012df9f74f010eb92203520515e8537b9 (diff)
New upstream version 7.8.1upstream/7.8.1
Diffstat (limited to 'nikola/data/themes/bootstrap3')
l---------nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css.map1
l---------nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css.map1
-rw-r--r--nikola/data/themes/bootstrap3/assets/css/theme.css10
-rw-r--r--nikola/data/themes/bootstrap3/assets/js/flowr.plugin.js4
-rw-r--r--nikola/data/themes/bootstrap3/templates/base.tmpl2
-rw-r--r--nikola/data/themes/bootstrap3/templates/base_helper.tmpl15
-rw-r--r--nikola/data/themes/bootstrap3/templates/gallery.tmpl1
-rw-r--r--nikola/data/themes/bootstrap3/templates/listing.tmpl8
8 files changed, 29 insertions, 13 deletions
diff --git a/nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css.map b/nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css.map
new file mode 120000
index 0000000..fcd3722
--- /dev/null
+++ b/nikola/data/themes/bootstrap3/assets/css/bootstrap-theme.min.css.map
@@ -0,0 +1 @@
+../../../../../../bower_components/bootstrap/dist/css/bootstrap-theme.min.css.map \ No newline at end of file
diff --git a/nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css.map b/nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css.map
new file mode 120000
index 0000000..5914aca
--- /dev/null
+++ b/nikola/data/themes/bootstrap3/assets/css/bootstrap.min.css.map
@@ -0,0 +1 @@
+../../../../../../bower_components/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file
diff --git a/nikola/data/themes/bootstrap3/assets/css/theme.css b/nikola/data/themes/bootstrap3/assets/css/theme.css
index 6964ec6..52466de 100644
--- a/nikola/data/themes/bootstrap3/assets/css/theme.css
+++ b/nikola/data/themes/bootstrap3/assets/css/theme.css
@@ -118,7 +118,7 @@ article.post-micro {
}
.metadata p:before,
-.postlist .listdate:before {
+.postlist .listdate:after {
content: " — ";
}
@@ -177,6 +177,14 @@ article.post-micro {
border-top: 1px solid #e5e5e5;
}
+.codetable {
+ table-layout: fixed;
+}
+
+.codetable pre {
+ overflow-x: scroll;
+}
+
/* hat tip bootstrap/html5 boilerplate */
@media print {
*, *:before, *:after {
diff --git a/nikola/data/themes/bootstrap3/assets/js/flowr.plugin.js b/nikola/data/themes/bootstrap3/assets/js/flowr.plugin.js
index a6ab900..732fa3d 100644
--- a/nikola/data/themes/bootstrap3/assets/js/flowr.plugin.js
+++ b/nikola/data/themes/bootstrap3/assets/js/flowr.plugin.js
@@ -180,7 +180,7 @@
}
} //utils
- // If the resposive var is set to true then listen for resize method
+ // If the responsive var is set to true then listen for resize method
// and prevent resizing from happening twice if responsive is set again during append phase!
if (settings.responsive && !$this.data('__responsive')) {
$(window).resize(function() {
@@ -211,7 +211,7 @@
var currentItem = 0;
// Store all the data
- var allData = $this.data('data') || [];
+ var allData = [];
for (i = 0; i < data.length; i++) {
allData.push(data[i]);
}
diff --git a/nikola/data/themes/bootstrap3/templates/base.tmpl b/nikola/data/themes/bootstrap3/templates/base.tmpl
index ab7805b..2f7a290 100644
--- a/nikola/data/themes/bootstrap3/templates/base.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/base.tmpl
@@ -17,7 +17,7 @@ ${template_hooks['extra_head']()}
<div class="container"><!-- This keeps the margins nice -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false">
- <span class="sr-only">Toggle navigation</span>
+ <span class="sr-only">${messages("Toggle navigation")}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
index 587a933..20b135b 100644
--- a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -63,7 +63,7 @@ lang="${lang}">
${mathjax_config}
%if use_cdn:
- <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+ <!--[if lt IE 9]><script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
%else:
<!--[if lt IE 9]><script src="${url_replacer(permalink, '/assets/js/html5.js', lang)}"></script><![endif]-->
%endif
@@ -74,16 +74,17 @@ lang="${lang}">
<%def name="late_load_js()">
%if use_bundles:
%if use_cdn:
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.3/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+
<script src="/assets/js/all.js"></script>
%else:
<script src="/assets/js/all-nocdn.js"></script>
%endif
%else:
%if use_cdn:
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.3/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
%else:
<script src="/assets/js/jquery.min.js"></script>
<script src="/assets/js/bootstrap.min.js"></script>
@@ -102,14 +103,14 @@ lang="${lang}">
<%def name="html_stylesheets()">
%if use_bundles:
%if use_cdn:
- <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
%else:
<link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
%endif
%else:
%if use_cdn:
- <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
%else:
<link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
%endif
diff --git a/nikola/data/themes/bootstrap3/templates/gallery.tmpl b/nikola/data/themes/bootstrap3/templates/gallery.tmpl
index af0c194..3dbfa82 100644
--- a/nikola/data/themes/bootstrap3/templates/gallery.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/gallery.tmpl
@@ -90,5 +90,6 @@ $("#gallery_container").flowr({
}
});
$("a.image-reference").colorbox({rel:"gal", maxWidth:"100%",maxHeight:"100%",scalePhotos:true});
+$('a.image-reference[href="'+window.location.hash.substring(1,1000)+'"]').click();
</script>
</%block>
diff --git a/nikola/data/themes/bootstrap3/templates/listing.tmpl b/nikola/data/themes/bootstrap3/templates/listing.tmpl
index 8c43806..44809d0 100644
--- a/nikola/data/themes/bootstrap3/templates/listing.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/listing.tmpl
@@ -1,11 +1,10 @@
## -*- coding: utf-8 -*-
<%inherit file="base.tmpl"/>
<%namespace name="ui" file="crumbs.tmpl" import="bar"/>
-
<%block name="content">
${ui.bar(crumbs)}
%if folders or files:
-<ul class="list-unstyled">
+<ul>
% for name in folders:
<li><a href="${name|u}"><i class="glyphicon glyphicon-folder-open"></i> ${name|h}</a>
% endfor
@@ -15,6 +14,11 @@ ${ui.bar(crumbs)}
</ul>
%endif
% if code:
+<h1>${title}
+ % if source_link:
+ <small><a href="${source_link}">(${messages("Source")})</a></small>
+ % endif
+ </h1>
${code}
% endif
</%block>