~dricottone/blog

4d0d1f2bbce5cd12ef3151e42cd5104bc6ca9cad — Dominic Ricottone 3 years ago f841a17
Migrating hosts; Remove old JS
11 files changed, 76 insertions(+), 74 deletions(-)

M Makefile
M static/css/blog.css
M static/css/cgit.css
M static/css/common.css
D static/css/gallery.css
M static/css/header.css
D static/css/lightbox-2.11.3.min.css
M static/css/navi.css
R static/{css/arrow_down.png => files/arrow_down.png}
R static/{css/arrow_up.png => files/arrow_up.png}
D static/js/lightbox-2.11.3.min.js
M Makefile => Makefile +2 -5
@@ 1,8 1,5 @@
TARGET_IP=alpine1.local
TARGET_USER=deploy
TARGET_DIR=/var/public-blog
TARGET_HOST=$(TARGET_USER)@$(TARGET_IP)
DOCKER_URL=ssh://$(TARGET_HOST)
TARGET_HOST=$(TARGET_USER)@ubuntu2.intra.dominic-ricottone.com

.PHONY: dev
dev:


@@ 16,7 13,7 @@ build: clean
sync: build
	rsync --recursive --links --compress --delete \
		--chown=$(TARGET_USER):$(TARGET_USER) \
		public/ $(TARGET_HOST):$(TARGET_DIR)/html/
		public/ $(TARGET_HOST):/var/deploy/resources/webroot/

.PHONY: clean
clean:

M static/css/blog.css => static/css/blog.css +1 -1
@@ 1,7 1,7 @@
div#content {
  margin: 0;
  max-width: 800px;
  padding-left: 10px;
  padding: 0 0 0 10px;
}
ul#list-posts {
  list-style-type: none; /* no bullets for post lists */

M static/css/cgit.css => static/css/cgit.css +5 -22
@@ 123,7 123,8 @@ div#cgit div.content {
div#cgit table.list {
	width: 100%;
	border: none;
	border-collapse: collapse;
	border-collapse: separate;
	border-spacing: 0;
}

div#cgit table.list tr {


@@ 134,14 135,6 @@ div#cgit table.list tr.logheader {
	background: #eee;
}

div#cgit table.list tr:nth-child(even) {
	background: #f7f7f7;
}

div#cgit table.list tr:nth-child(odd) {
	background: white;
}

div#cgit table.list tr:hover {
	background: #eee;
}


@@ 154,27 147,14 @@ div#cgit table.list tr.nohover:hover {
	background: white;
}

div#cgit table.list tr.nohover-highlight:hover:nth-child(even) {
	background: #f7f7f7;
}

div#cgit table.list tr.nohover-highlight:hover:nth-child(odd) {
	background: white;
}

div#cgit table.list th {
	font-weight: bold;
	/* color: #888;
	border-top: dashed 1px #888;
	border-bottom: dashed 1px #888;
	*/
	padding: 0.1em 0.5em 0.05em 0.5em;
	vertical-align: baseline;
}

div#cgit table.list td {
	border: none;
	padding: 0.1em 0.5em 0.1em 0.5em;
}

div#cgit table.list td.commitgraph {


@@ 219,6 199,9 @@ div#cgit table.list td.logmsg {

div#cgit table.list td a {
	color: black;
	display: block;
	text-decoration: none;
	padding: 1em 0;
}

div#cgit table.list td a.ls-dir {

M static/css/common.css => static/css/common.css +56 -13
@@ 1,44 1,87 @@
body {
  margin-bottom: 50vh;
  margin: 0 0 50vh 0;
  padding: 0;
}
main {
  font-family: sans-serif;
  font-size: 10pt;
  margin: 0 0 0 calc(100px + 1em);
  padding: 4px;
  font-size: 10pt;
  font-family: sans-serif;
}

hr {
  margin: 2em 0;
  padding: 0;
}
h1 {
  font-size: 150%;
  font-size: 2em;
  line-height: 2.5em;
  margin: 0;
  padding: 0;
}
h2 {
  font-size: 125%;
  font-size: 1.5em;
  line-height: 2em;
  margin: 0;
  padding: 0;
}
h3 {
  font-size: 112%;
  font-size: 1.17em;
  line-height: 1.5em;
  margin: 0;
  padding: 0;
}
h4 {
  font-size: 100%;
  font-size: 1em;
  line-height: 1.5em;
  margin: 0;
  padding: 0;
}
h5 {
  font-size: 100%;
  font-size: 0.83em;
  line-height: 1.5em;
  margin: 0;
  padding: 0;
}
h6 {
  font-size: 100%;
  font-size: 0.67em;
  line-height: 1.5em;
  margin: 0;
  padding: 0;
}
p {
  font-size: 100%;
  font-size: 1em;
  line-height: 1.5em;
  margin: 0;
  padding: 0;
}
ol {
  margin: 0;
  padding: 0;
  list-style: none;
}
ul {
  margin-bottom: 2em;
  padding-left: 2em;
  margin: 0;
  padding: 0;
  list-style: none;
}
li {
  margin-bottom: 0.5em;
  margin: 0;
}

table {
  border: none;
  border-collapse: collapse;
  border-spacing: 0;
  margin: 0;
  padding: 0;
}
tr {
  margin: 0;
  padding: 0;
}
td {
  margin: 0;
  padding: 0;
}


D static/css/gallery.css => static/css/gallery.css +0 -6
@@ 1,6 0,0 @@
.gallery {
  display: grid;
  grid-gap: 0px;
  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
}


M static/css/header.css => static/css/header.css +7 -5
@@ 1,12 1,13 @@
/* Header content */
table#header {
  width: 100%;
  margin-bottom: 1em;
  border-collapse: collapse;
  margin-bottom: 1em;
  width: 100%;
}
table#header td.main {
  font-size: 250%;
  padding-left: 10px;
  color: #000;
  font-size: 2.5em;
  padding: 0 0 0 10px;
  white-space: nowrap;
}
table#header td.main a {


@@ 15,7 16,8 @@ table#header td.main a {
table#header td.sub {
  color: #777;
  border-top: solid 1px #ccc;
  padding-left: 10px;
  font-size: 1em;
  padding: 0 0 0 10px;
}
table#header td.sub a {
  color: #777;

D static/css/lightbox-2.11.3.min.css => static/css/lightbox-2.11.3.min.css +0 -1
@@ 1,1 0,0 @@
.lb-loader,.lightbox{text-align:center;line-height:0;position:absolute;left:0}body.lb-disable-scrolling{overflow:hidden}.lightboxOverlay{position:absolute;top:0;left:0;z-index:9999;background-color:#000;filter:alpha(Opacity=80);opacity:.8;display:none}.lightbox{width:100%;z-index:10000;font-weight:400;outline:0}.lightbox .lb-image{display:block;height:auto;max-width:inherit;max-height:none;border-radius:3px;border:4px solid #fff}.lightbox a img{border:none}.lb-outerContainer{position:relative;width:250px;height:250px;margin:0 auto;border-radius:4px;background-color:#fff}.lb-outerContainer:after{content:"";display:table;clear:both}.lb-loader{top:43%;height:25%;width:100%}.lb-cancel{display:block;width:32px;height:32px;margin:0 auto;background:url(../images/loading.gif) no-repeat}.lb-nav{position:absolute;top:0;left:0;height:100%;width:100%;z-index:10}.lb-container>.nav{left:0}.lb-nav a{outline:0;background-image:url(data:image/gif;base64,R0lGODlhAQABAPAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==)}.lb-next,.lb-prev{height:100%;cursor:pointer;display:block}.lb-nav a.lb-prev{width:34%;left:0;float:left;background:url(../images/prev.png) left 48% no-repeat;filter:alpha(Opacity=0);opacity:0;-webkit-transition:opacity .6s;-moz-transition:opacity .6s;-o-transition:opacity .6s;transition:opacity .6s}.lb-nav a.lb-prev:hover{filter:alpha(Opacity=100);opacity:1}.lb-nav a.lb-next{width:64%;right:0;float:right;background:url(../images/next.png) right 48% no-repeat;filter:alpha(Opacity=0);opacity:0;-webkit-transition:opacity .6s;-moz-transition:opacity .6s;-o-transition:opacity .6s;transition:opacity .6s}.lb-nav a.lb-next:hover{filter:alpha(Opacity=100);opacity:1}.lb-dataContainer{margin:0 auto;padding-top:5px;width:100%;border-bottom-left-radius:4px;border-bottom-right-radius:4px}.lb-dataContainer:after{content:"";display:table;clear:both}.lb-data{padding:0 4px;color:#ccc}.lb-data .lb-details{width:85%;float:left;text-align:left;line-height:1.1em}.lb-data .lb-caption{font-size:13px;font-weight:700;line-height:1em}.lb-data .lb-caption a{color:#4ae}.lb-data .lb-number{display:block;clear:left;padding-bottom:1em;font-size:12px;color:#999}.lb-data .lb-close{display:block;float:right;width:30px;height:30px;background:url(../images/close.png) top right no-repeat;text-align:right;outline:0;filter:alpha(Opacity=70);opacity:.7;-webkit-transition:opacity .2s;-moz-transition:opacity .2s;-o-transition:opacity .2s;transition:opacity .2s}.lb-data .lb-close:hover{cursor:pointer;filter:alpha(Opacity=100);opacity:1}
\ No newline at end of file

M static/css/navi.css => static/css/navi.css +5 -6
@@ 2,11 2,11 @@
div#navi {
  height: 100%;
  left: 0;
  margin: 5em 0 0 0;
  margin: 0;
  overflow-x: hidden;
  padding: 0.5em;
  padding: 0 0.5em 0.5em 0.5em;
  position: fixed;
  top: 0;
  top: calc(3em + 2px); /* should match height of vertical line in header */
}
@media (max-width: 800px) {
  div#navi {


@@ 59,13 59,12 @@ ul#list-navi li.shown:hover {
  background-color: #333;
}
ul#list-navi li.shown.trigger {
  background: url('/css/arrow_down.png') no-repeat right #000;
  background: url('/files/arrow_down.png') no-repeat right #000;
  background-origin: content-box;
  padding: 0 0.5em 0 0;
}
ul#list-navi li.shown.trigger.selection {
  /* background-color: #999; */
  background: url('/css/arrow_up.png') no-repeat right #999;
  background: url('/files/arrow_up.png') no-repeat right #999;
  background-origin: content-box;
  color: #000;
  padding: 0 0.5em 0 0;

R static/css/arrow_down.png => static/files/arrow_down.png +0 -0
R static/css/arrow_up.png => static/files/arrow_up.png +0 -0
D static/js/lightbox-2.11.3.min.js => static/js/lightbox-2.11.3.min.js +0 -15
@@ 1,15 0,0 @@
/*!
 * Lightbox v2.11.3
 * by Lokesh Dhakar
 *
 * More info:
 * http://lokeshdhakar.com/projects/lightbox2/
 *
 * Copyright Lokesh Dhakar
 * Released under the MIT license
 * https://github.com/lokesh/lightbox2/blob/master/LICENSE
 *
 * @preserve
 */
!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],b):"object"==typeof exports?module.exports=b(require("jquery")):a.lightbox=b(a.jQuery)}(this,function(a){function b(b){this.album=[],this.currentImageIndex=void 0,this.init(),this.options=a.extend({},this.constructor.defaults),this.option(b)}return b.defaults={albumLabel:"Image %1 of %2",alwaysShowNavOnTouchDevices:!1,fadeDuration:600,fitImagesInViewport:!0,imageFadeDuration:600,positionFromTop:50,resizeDuration:700,showImageNumberLabel:!0,wrapAround:!1,disableScrolling:!1,sanitizeTitle:!1},b.prototype.option=function(b){a.extend(this.options,b)},b.prototype.imageCountLabel=function(a,b){return this.options.albumLabel.replace(/%1/g,a).replace(/%2/g,b)},b.prototype.init=function(){var b=this;a(document).ready(function(){b.enable(),b.build()})},b.prototype.enable=function(){var b=this;a("body").on("click","a[rel^=lightbox], area[rel^=lightbox], a[data-lightbox], area[data-lightbox]",function(c){return b.start(a(c.currentTarget)),!1})},b.prototype.build=function(){if(!(a("#lightbox").length>0)){var b=this;a('<div id="lightboxOverlay" tabindex="-1" class="lightboxOverlay"></div><div id="lightbox" tabindex="-1" class="lightbox"><div class="lb-outerContainer"><div class="lb-container"><img class="lb-image" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt=""/><div class="lb-nav"><a class="lb-prev" aria-label="Previous image" href="" ></a><a class="lb-next" aria-label="Next image" href="" ></a></div><div class="lb-loader"><a class="lb-cancel"></a></div></div></div><div class="lb-dataContainer"><div class="lb-data"><div class="lb-details"><span class="lb-caption"></span><span class="lb-number"></span></div><div class="lb-closeContainer"><a class="lb-close"></a></div></div></div></div>').appendTo(a("body")),this.$lightbox=a("#lightbox"),this.$overlay=a("#lightboxOverlay"),this.$outerContainer=this.$lightbox.find(".lb-outerContainer"),this.$container=this.$lightbox.find(".lb-container"),this.$image=this.$lightbox.find(".lb-image"),this.$nav=this.$lightbox.find(".lb-nav"),this.containerPadding={top:parseInt(this.$container.css("padding-top"),10),right:parseInt(this.$container.css("padding-right"),10),bottom:parseInt(this.$container.css("padding-bottom"),10),left:parseInt(this.$container.css("padding-left"),10)},this.imageBorderWidth={top:parseInt(this.$image.css("border-top-width"),10),right:parseInt(this.$image.css("border-right-width"),10),bottom:parseInt(this.$image.css("border-bottom-width"),10),left:parseInt(this.$image.css("border-left-width"),10)},this.$overlay.hide().on("click",function(){return b.end(),!1}),this.$lightbox.hide().on("click",function(c){"lightbox"===a(c.target).attr("id")&&b.end()}),this.$outerContainer.on("click",function(c){return"lightbox"===a(c.target).attr("id")&&b.end(),!1}),this.$lightbox.find(".lb-prev").on("click",function(){return 0===b.currentImageIndex?b.changeImage(b.album.length-1):b.changeImage(b.currentImageIndex-1),!1}),this.$lightbox.find(".lb-next").on("click",function(){return b.currentImageIndex===b.album.length-1?b.changeImage(0):b.changeImage(b.currentImageIndex+1),!1}),this.$nav.on("mousedown",function(a){3===a.which&&(b.$nav.css("pointer-events","none"),b.$lightbox.one("contextmenu",function(){setTimeout(function(){this.$nav.css("pointer-events","auto")}.bind(b),0)}))}),this.$lightbox.find(".lb-loader, .lb-close").on("click",function(){return b.end(),!1})}},b.prototype.start=function(b){function c(a){d.album.push({alt:a.attr("data-alt"),link:a.attr("href"),title:a.attr("data-title")||a.attr("title")})}var d=this,e=a(window);e.on("resize",a.proxy(this.sizeOverlay,this)),this.sizeOverlay(),this.album=[];var f,g=0,h=b.attr("data-lightbox");if(h){f=a(b.prop("tagName")+'[data-lightbox="'+h+'"]');for(var i=0;i<f.length;i=++i)c(a(f[i])),f[i]===b[0]&&(g=i)}else if("lightbox"===b.attr("rel"))c(b);else{f=a(b.prop("tagName")+'[rel="'+b.attr("rel")+'"]');for(var j=0;j<f.length;j=++j)c(a(f[j])),f[j]===b[0]&&(g=j)}var k=e.scrollTop()+this.options.positionFromTop,l=e.scrollLeft();this.$lightbox.css({top:k+"px",left:l+"px"}).fadeIn(this.options.fadeDuration),this.options.disableScrolling&&a("body").addClass("lb-disable-scrolling"),this.changeImage(g)},b.prototype.changeImage=function(b){var c=this,d=this.album[b].link,e=d.split(".").slice(-1)[0],f=this.$lightbox.find(".lb-image");this.disableKeyboardNav(),this.$overlay.fadeIn(this.options.fadeDuration),a(".lb-loader").fadeIn("slow"),this.$lightbox.find(".lb-image, .lb-nav, .lb-prev, .lb-next, .lb-dataContainer, .lb-numbers, .lb-caption").hide(),this.$outerContainer.addClass("animating");var g=new Image;g.onload=function(){var h,i,j,k,l,m;f.attr({alt:c.album[b].alt,src:d}),a(g),f.width(g.width),f.height(g.height),m=a(window).width(),l=a(window).height(),k=m-c.containerPadding.left-c.containerPadding.right-c.imageBorderWidth.left-c.imageBorderWidth.right-20,j=l-c.containerPadding.top-c.containerPadding.bottom-c.imageBorderWidth.top-c.imageBorderWidth.bottom-c.options.positionFromTop-70,"svg"===e&&(f.width(k),f.height(j)),c.options.fitImagesInViewport?(c.options.maxWidth&&c.options.maxWidth<k&&(k=c.options.maxWidth),c.options.maxHeight&&c.options.maxHeight<j&&(j=c.options.maxHeight)):(k=c.options.maxWidth||g.width||k,j=c.options.maxHeight||g.height||j),(g.width>k||g.height>j)&&(g.width/k>g.height/j?(i=k,h=parseInt(g.height/(g.width/i),10),f.width(i),f.height(h)):(h=j,i=parseInt(g.width/(g.height/h),10),f.width(i),f.height(h))),c.sizeContainer(f.width(),f.height())},g.src=this.album[b].link,this.currentImageIndex=b},b.prototype.sizeOverlay=function(){var b=this;setTimeout(function(){b.$overlay.width(a(document).width()).height(a(document).height())},0)},b.prototype.sizeContainer=function(a,b){function c(){d.$lightbox.find(".lb-dataContainer").width(g),d.$lightbox.find(".lb-prevLink").height(h),d.$lightbox.find(".lb-nextLink").height(h),d.$overlay.focus(),d.showImage()}var d=this,e=this.$outerContainer.outerWidth(),f=this.$outerContainer.outerHeight(),g=a+this.containerPadding.left+this.containerPadding.right+this.imageBorderWidth.left+this.imageBorderWidth.right,h=b+this.containerPadding.top+this.containerPadding.bottom+this.imageBorderWidth.top+this.imageBorderWidth.bottom;e!==g||f!==h?this.$outerContainer.animate({width:g,height:h},this.options.resizeDuration,"swing",function(){c()}):c()},b.prototype.showImage=function(){this.$lightbox.find(".lb-loader").stop(!0).hide(),this.$lightbox.find(".lb-image").fadeIn(this.options.imageFadeDuration),this.updateNav(),this.updateDetails(),this.preloadNeighboringImages(),this.enableKeyboardNav()},b.prototype.updateNav=function(){var a=!1;try{document.createEvent("TouchEvent"),a=!!this.options.alwaysShowNavOnTouchDevices}catch(a){}this.$lightbox.find(".lb-nav").show(),this.album.length>1&&(this.options.wrapAround?(a&&this.$lightbox.find(".lb-prev, .lb-next").css("opacity","1"),this.$lightbox.find(".lb-prev, .lb-next").show()):(this.currentImageIndex>0&&(this.$lightbox.find(".lb-prev").show(),a&&this.$lightbox.find(".lb-prev").css("opacity","1")),this.currentImageIndex<this.album.length-1&&(this.$lightbox.find(".lb-next").show(),a&&this.$lightbox.find(".lb-next").css("opacity","1"))))},b.prototype.updateDetails=function(){var a=this;if(void 0!==this.album[this.currentImageIndex].title&&""!==this.album[this.currentImageIndex].title){var b=this.$lightbox.find(".lb-caption");this.options.sanitizeTitle?b.text(this.album[this.currentImageIndex].title):b.html(this.album[this.currentImageIndex].title),b.fadeIn("fast")}if(this.album.length>1&&this.options.showImageNumberLabel){var c=this.imageCountLabel(this.currentImageIndex+1,this.album.length);this.$lightbox.find(".lb-number").text(c).fadeIn("fast")}else this.$lightbox.find(".lb-number").hide();this.$outerContainer.removeClass("animating"),this.$lightbox.find(".lb-dataContainer").fadeIn(this.options.resizeDuration,function(){return a.sizeOverlay()})},b.prototype.preloadNeighboringImages=function(){if(this.album.length>this.currentImageIndex+1){(new Image).src=this.album[this.currentImageIndex+1].link}if(this.currentImageIndex>0){(new Image).src=this.album[this.currentImageIndex-1].link}},b.prototype.enableKeyboardNav=function(){this.$lightbox.on("keyup.keyboard",a.proxy(this.keyboardAction,this)),this.$overlay.on("keyup.keyboard",a.proxy(this.keyboardAction,this))},b.prototype.disableKeyboardNav=function(){this.$lightbox.off(".keyboard"),this.$overlay.off(".keyboard")},b.prototype.keyboardAction=function(a){var b=a.keyCode;27===b?(a.stopPropagation(),this.end()):37===b?0!==this.currentImageIndex?this.changeImage(this.currentImageIndex-1):this.options.wrapAround&&this.album.length>1&&this.changeImage(this.album.length-1):39===b&&(this.currentImageIndex!==this.album.length-1?this.changeImage(this.currentImageIndex+1):this.options.wrapAround&&this.album.length>1&&this.changeImage(0))},b.prototype.end=function(){this.disableKeyboardNav(),a(window).off("resize",this.sizeOverlay),this.$lightbox.fadeOut(this.options.fadeDuration),this.$overlay.fadeOut(this.options.fadeDuration),this.options.disableScrolling&&a("body").removeClass("lb-disable-scrolling")},new b});
//# sourceMappingURL=lightbox.min.map
\ No newline at end of file