From 70cf7d32deec1c075d858b3807a6013def649f6b Mon Sep 17 00:00:00 2001 From: Leander Hutton Date: Sat, 15 Feb 2025 12:28:08 -0500 Subject: [PATCH] CSS changes --- static/css/justifiedGallery.min.css | 36 +++++++++++-------- static/css/main.css | 38 ++++++++------------ static/css/pygment.css.min | 2 -- static/js/jquery.justifiedGallery.min.js | 6 ++-- templates/base.html | 46 +++++++----------------- templates/index.html | 1 - 6 files changed, 53 insertions(+), 76 deletions(-) delete mode 100644 static/css/pygment.css.min diff --git a/static/css/justifiedGallery.min.css b/static/css/justifiedGallery.min.css index 8b753dc..172dd8b 100644 --- a/static/css/justifiedGallery.min.css +++ b/static/css/justifiedGallery.min.css @@ -1,7 +1,7 @@ /*! - * justifiedGallery - v3.7.0 + * justifiedGallery - v3.8.0 * http://miromannino.github.io/Justified-Gallery/ - * Copyright (c) 2018 Miro Mannino + * Copyright (c) 2020 Miro Mannino * Licensed under the MIT license. */ .justified-gallery { @@ -26,7 +26,13 @@ .justified-gallery > figure > img, .justified-gallery > a > a > img, .justified-gallery > div > a > img, -.justified-gallery > figure > a > img { +.justified-gallery > figure > a > img, +.justified-gallery > a > svg, +.justified-gallery > div > svg, +.justified-gallery > figure > svg, +.justified-gallery > a > a > svg, +.justified-gallery > div > a > svg, +.justified-gallery > figure > a > svg { position: absolute; top: 50%; left: 50%; @@ -36,9 +42,9 @@ filter: "alpha(opacity=0)"; opacity: 0; } -.justified-gallery > a > .caption, -.justified-gallery > div > .caption, -.justified-gallery > figure > .caption { +.justified-gallery > a > .jg-caption, +.justified-gallery > div > .jg-caption, +.justified-gallery > figure > .jg-caption { display: none; position: absolute; bottom: 0; @@ -52,9 +58,9 @@ font-weight: 300; font-family: sans-serif; } -.justified-gallery > a > .caption.caption-visible, -.justified-gallery > div > .caption.caption-visible, -.justified-gallery > figure > .caption.caption-visible { +.justified-gallery > a > .jg-caption.jg-caption-visible, +.justified-gallery > div > .jg-caption.jg-caption-visible, +.justified-gallery > figure > .jg-caption.jg-caption-visible { display: initial; filter: "alpha(opacity=70)"; opacity: 0.7; @@ -63,13 +69,15 @@ -o-transition: opacity 500ms ease-in; transition: opacity 500ms ease-in; } -.justified-gallery > .entry-visible { +.justified-gallery > .jg-entry-visible { filter: "alpha(opacity=100)"; opacity: 1; background: none; } -.justified-gallery > .entry-visible > img, -.justified-gallery > .entry-visible > a > img { +.justified-gallery > .jg-entry-visible > img, +.justified-gallery > .jg-entry-visible > a > img, +.justified-gallery > .jg-entry-visible > svg, +.justified-gallery > .jg-entry-visible > a > svg { filter: "alpha(opacity=100)"; opacity: 1; -webkit-transition: opacity 500ms ease-in; @@ -80,7 +88,7 @@ .justified-gallery > .jg-filtered { display: none; } -.justified-gallery > .spinner { +.justified-gallery > .jg-spinner { position: absolute; bottom: 0; margin-left: -24px; @@ -90,7 +98,7 @@ opacity: 1; overflow: initial; } -.justified-gallery > .spinner > span { +.justified-gallery > .jg-spinner > span { display: inline-block; filter: "alpha(opacity=0)"; opacity: 0; diff --git a/static/css/main.css b/static/css/main.css index d9930da..a6684ad 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,11 +1,13 @@ @import url("pygment.css"); @import url("colorbox.css"); -body { margin:0px; padding:20px 0px; text-align:center; font-family: Arial, Helvetica, sans-serif; color:#000000; } -a, a:visited { text-decoration:none; color:#002b80; } -a:hover { text-decoration:underline; } +@import url("justifiedGallery.min.css"); + +body { margin:0px; padding:15px 0px; text-align:center; font-family: Arial, Helvetica, sans-serif; color:#000000; } +a, a:visited { color:#0070b4;} +a:hover { color:#009dfc; } h1, h2, h3, h4, h5, h6, h7 { margin:0px; line-height: 1.0em; } h4, h5, h6 { font-size:18px; } -h1 { padding:0px 0px 0.5em; margin:0px 0px 5px 0px; } +h1 { padding:0px 0px 0.5em; margin:0px 0px 5px 0px; font-size: 1.5em; } blockquote { font-style:italic; background:#EAEAEA; margin:20px; padding:5px 10px; } blockquote cite { display:block; padding:10px 20px 0 0; text-align:right; } input, textarea { padding:5px; border:1px solid #8A8A8A; background:#EAEAEA; } @@ -15,19 +17,21 @@ th { color: white; background: navy; text-align: center; } td { padding-left: 0.5em; } table { width: 100%; } tr:nth-child(odd) { background-color: lightgray;} +pre { font-size: 1.2em; } #wrap { margin:0em auto; text-align:left; line-height: 1.0; width: 100%; } -#container { float: right; width: 70% } -#sidebar { overflow:hidden; clear:left; text-align:right; width:25%; height:auto; padding:0px 15px 0px 0px; border-right:0.15em solid #C8C8C8; } +#container { float: right; width: 77%; } +#sidebar { overflow:hidden; clear:left; text-align:right; width: 20%; height:auto; padding:20px 15px 0px 0px; border-right:0.15em solid #C8C8C8; } #sidebar .description { display:block; font-size: 1.0em; width:100%; height:auto; margin:0px 0px 10px 0px; } #sidebar li { list-style-type:none; font-size: 1.2em; line-height: 1.1em; font-weight: bold; } -#sidebar li a { font-weight: normal; } +#sidebar a { text-decoration: none } #sidebar > li { margin:20px 0px; } #sidebar .description { display:block; font-size: 1.1em; width:100%; height:auto; margin:0px 0px 10px 0px; } #landing img { display:block; border:1px solid #000000 !important; margin-left: auto; margin-right: auto; max-height: 100%; max-width: 100%; } #landing p { text-align: center; } /*pre { background: #14191E; border: 1px solid #AAAAAA; overflow: auto; padding: 10px; color: #FFFFFF; font-family: "Lucida Console", "Courier New", monospace; }*/ +code { font-size: 1.1em; } ul.sub-menu, ul.children { margin:0px 10px 0px 0px; } @@ -36,18 +40,6 @@ ul.sub-menu, ul.children { margin:0px 10px 0px 0px; } .meta { margin:10px; padding:15px; background:#EAEAEA; clear:both; } .meta span { display:block; clear:left; } -.gallerysquare { position: relative; float: left; max-width: 50%; max-height: 50%; display: flex; } -.gallerysquare img { object-fit: cover; width: 500px; height: 500px; } -.gallerylabel { position: absolute; bottom: 20px; left: 20px; background-color: rgba(0, 0, 0, 0.5); color: white; font-size: 1.7em; font-weight: 600; font-family: Serif; padding: 1.5em; } - -.gallerylabel a.hover { font-style: underline; } -.gallerylabel a { color:#FFFFFF; } -.gallerylabel a.visited { color:#FFFFFF; } - -.portfolio { padding-right: 1.0em; text-align: center; } -.portfolio h4 { font-size: 2.0em; font-family: Serif; } -.portfolio img { display:block; border:1px solid #000000 !important; margin-left: auto; margin-right: auto; max-height: 100%; max-width: 100%; } - .prow { display: flex; flex-wrap: wrap; padding: 0 4px; } .pcolumn { flex: 25%; max-width: 25%; padding: 0 4px; } .pcolumn img { margin-top: 8px; vertical-align: middle; } @@ -56,8 +48,7 @@ ul.sub-menu, ul.children { margin:0px 10px 0px 0px; } .entry { font-size: 1.0em; padding-right: 1.0em; max-width:1024px; line-height:1.2em; } -.entry h2, h3, h4, h5 { margin:30px 0px 10px 0px; font-variant: small-caps; } -.entry h1 { font-variant: small-caps; } +.entry h2, h3, h4, h5 { margin:30px 0px 10px 0px; } .entry img { display:block; border:1px solid #000000 !important; margin-left: auto; margin-right: auto; max-height: 100%; max-width: 100%; } .entry img.wp-smiley { border:0px !important; } .entry a img:hover { background-color:transparent; border:1px solid #E5E5E5 !important; } @@ -111,8 +102,8 @@ ul.commentlist ul.children li { list-style-type:none; border:1px solid #AAA } input#submit { font-weight:bold; } input#s { width:70%; height:auto; margin:5px 0px; } -#footer { text-align:center; clear:both; font-size: 1.1em; } -#footer div { margin:30px 0px 0px 0px; padding:30px 0px 0px 0px; border-top:0.15em solid #C8C8C8; } +#footer { text-align:center; clear:both; font-size: 1.0em; } +#footer div { margin:30px 0px 0px 0px; padding:20px 0px 0px 0px; } #footer li { list-style-type:none; } #footer .widget_tag_cloud h2 { display:none; } @@ -120,4 +111,5 @@ input#s { width:70%; height:auto; margin:5px 0px; } #page-title{ position : relative; top : 8px; + text-decoration: none; } diff --git a/static/css/pygment.css.min b/static/css/pygment.css.min deleted file mode 100644 index f4581c2..0000000 --- a/static/css/pygment.css.min +++ /dev/null @@ -1,2 +0,0 @@ -.highlight code,.highlight pre{color:#fdce93;background-color:#3f3f3f;padding:10px;}.highlight .hll{background-color:#222}.highlight .c{color:#7f9f7f}.highlight .err{color:#e37170;background-color:#3d3535}.highlight .g{color:#7f9f7f}.highlight .k{color:#f0dfaf}.highlight .l{color:#ccc}.highlight .n{color:#dcdccc}.highlight .o{color:#f0efd0}.highlight .x{color:#ccc}.highlight .p{color:#41706f}.highlight .cm{color:#7f9f7f}.highlight .cp{color:#7f9f7f}.highlight .c1{color:#7f9f7f}.highlight .cs{color:#cd0000;font-weight:bold}.highlight .gd{color:#cd0000}.highlight .ge{color:#ccc;font-style:italic}.highlight .gr{color:red}.highlight .gh{color:#dcdccc;font-weight:bold}.highlight .gi{color:#00cd00}.highlight .go{color:gray}.highlight .gp{color:#dcdccc;font-weight:bold}.highlight .gs{color:#ccc;font-weight:bold}.highlight .gu{color:purple;font-weight:bold}.highlight .gt{color:#0040D0}.highlight .kc{color:#dca3a3}.highlight .kd{color:#ffff86}.highlight .kn{color:#dfaf8f;font-weight:bold}.highlight .kp{color:#cdcf99}.highlight .kr{color:#cdcd00}.highlight .kt{color:#00cd00}.highlight .ld{color:#cc9393}.highlight .m{color:#8cd0d3}.highlight .s{color:#cc9393}.highlight .na{color:#9ac39f}.highlight .nb{color:#efef8f}.highlight .nc{color:#efef8f}.highlight .no{color:#ccc}.highlight .nd{color:#ccc}.highlight .ni{color:#c28182}.highlight .ne{color:#c3bf9f;font-weight:bold}.highlight .nf{color:#efef8f}.highlight .nl{color:#ccc}.highlight .nn{color:#8fbede}.highlight .nx{color:#ccc}.highlight .py{color:#ccc}.highlight .nt{color:#9ac39f}.highlight .nv{color:#dcdccc}.highlight .ow{color:#f0efd0}.highlight .w{color:#ccc}.highlight .mf{color:#8cd0d3}.highlight .mh{color:#8cd0d3}.highlight .mi{color:#8cd0d3}.highlight .mo{color:#8cd0d3}.highlight .sb{color:#cc9393}.highlight .sc{color:#cc9393}.highlight .sd{color:#cc9393}.highlight .s2{color:#cc9393}.highlight .se{color:#cc9393}.highlight .sh{color:#cc9393}.highlight .si{color:#cc9393}.highlight .sx{color:#cc9393}.highlight .sr{color:#cc9393}.highlight .s1{color:#cc9393}.highlight .ss{color:#cc9393}.highlight .bp{color:#efef8f}.highlight .vc{color:#efef8f}.highlight .vg{color:#dcdccc}.highlight .vi{color:#ffffc7}.highlight .il{color:#8cd0d3} - diff --git a/static/js/jquery.justifiedGallery.min.js b/static/js/jquery.justifiedGallery.min.js index bda51a1..cea4439 100644 --- a/static/js/jquery.justifiedGallery.min.js +++ b/static/js/jquery.justifiedGallery.min.js @@ -1,8 +1,8 @@ /*! - * justifiedGallery - v3.7.0 + * justifiedGallery - v3.8.0 * http://miromannino.github.io/Justified-Gallery/ - * Copyright (c) 2018 Miro Mannino + * Copyright (c) 2020 Miro Mannino * Licensed under the MIT license. */ -!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof module&&module.exports?module.exports=function(t,i){return void 0===i&&(i="undefined"!=typeof window?require("jquery"):require("jquery")(t)),e(i),i}:e(jQuery)}(function(g){var r=function(t,i){this.settings=i,this.checkSettings(),this.imgAnalyzerTimeout=null,this.entries=null,this.buildingRow={entriesBuff:[],width:0,height:0,aspectRatio:0},this.lastFetchedEntry=null,this.lastAnalyzedIndex=-1,this.yield={every:2,flushed:0},this.border=0<=i.border?i.border:i.margins,this.maxRowHeight=this.retrieveMaxRowHeight(),this.suffixRanges=this.retrieveSuffixRanges(),this.offY=this.border,this.rows=0,this.spinner={phase:0,timeSlot:150,$el:g('
'),intervalId:null},this.scrollBarOn=!1,this.checkWidthIntervalId=null,this.galleryWidth=t.width(),this.$gallery=t};r.prototype.getSuffix=function(t,i){var e,s;for(e=i .caption");return 0===i.length?null:i},r.prototype.displayEntry=function(t,i,e,s,n,r){t.width(s),t.height(r),t.css("top",e),t.css("left",i);var o=this.imgFromEntry(t);if(null!==o){o.css("width",s),o.css("height",n),o.css("margin-left",-s/2),o.css("margin-top",-n/2);var a=o.attr("src"),h=this.newSrc(a,s,n,o[0]);o.one("error",function(){o.attr("src",o.data("jg.originalSrc"))});var l=function(){a!==h&&o.attr("src",h)};"skipped"===t.data("jg.loaded")?this.onImageEvent(a,g.proxy(function(){this.showImg(t,l),t.data("jg.loaded",!0)},this)):this.showImg(t,l)}else this.showImg(t);this.displayEntryCaption(t)},r.prototype.displayEntryCaption=function(t){var i=this.imgFromEntry(t);if(null!==i&&this.settings.captions){var e=this.captionFromEntry(t);if(null===e){var s=i.attr("alt");this.isValidCaption(s)||(s=t.attr("title")),this.isValidCaption(s)&&(e=g('
'+s+"
"),t.append(e),t.data("jg.createdCaption",!0))}null!==e&&(this.settings.cssAnimation||e.stop().fadeTo(0,this.settings.captionSettings.nonVisibleOpacity),this.addCaptionEventsHandlers(t))}else this.removeCaptionEventsHandlers(t)},r.prototype.isValidCaption=function(t){return void 0!==t&&0this.settings.justifyThreshold;if(t&&"hide"===this.settings.lastRow&&!u){for(i=0;i img, > a > img").fadeTo(0,0));return-1}for(t&&!u&&"justify"!==this.settings.lastRow&&"hide"!==this.settings.lastRow&&(o=!1,0this.settings.justifyThreshold)),i=0;ig(window).height()}r.prototype.rememberGalleryHeight=function(){i=this.$gallery.height(),this.$gallery.height(i)},r.prototype.setGalleryTempHeight=function(t){i=Math.max(t,i),this.$gallery.height(i)},r.prototype.setGalleryFinalHeight=function(t){i=t,this.$gallery.height(t)},r.prototype.checkWidth=function(){this.checkWidthIntervalId=setInterval(g.proxy(function(){if(this.$gallery.is(":visible")){var t=parseFloat(this.$gallery.width());e()===this.scrollBarOn?Math.abs(t-this.galleryWidth)>this.settings.refreshSensitivity&&(this.galleryWidth=t,this.rewind(),this.rememberGalleryHeight(),this.startImgAnalyzer(!0)):(this.scrollBarOn=e(),this.galleryWidth=t)}},this),this.settings.refreshTime)},r.prototype.isSpinnerActive=function(){return null!==this.spinner.intervalId},r.prototype.getSpinnerHeight=function(){return this.spinner.$el.innerHeight()},r.prototype.stopLoadingSpinnerAnimation=function(){clearInterval(this.spinner.intervalId),this.spinner.intervalId=null,this.setGalleryTempHeight(this.$gallery.height()-this.getSpinnerHeight()),this.spinner.$el.detach()},r.prototype.startLoadingSpinnerAnimation=function(){var t=this.spinner,i=t.$el.find("span");clearInterval(t.intervalId),this.$gallery.append(t.$el),this.setGalleryTempHeight(this.offY+this.buildingRow.height+this.getSpinnerHeight()),t.intervalId=setInterval(function(){t.phase=this.yield.every))return void this.startImgAnalyzer(t);this.buildingRow.entriesBuff.push(e),this.buildingRow.aspectRatio+=n,this.buildingRow.width+=n*this.settings.rowHeight,this.lastAnalyzedIndex=i}else if("error"!==e.data("jg.loaded"))return}0 img, > a > img",triggerEvent:function(t){this.$gallery.trigger(t)}},g.fn.justifiedGallery=function(n){return this.each(function(t,i){var e=g(i);e.addClass("justified-gallery");var s=e.data("jg.controller");if(void 0===s){if(null!=n&&"object"!==g.type(n)){if("destroy"===n)return;throw"The argument must be an object"}s=new r(e,g.extend({},r.prototype.defaults,n)),e.data("jg.controller",s)}else if("norewind"===n);else{if("destroy"===n)return void s.destroy();s.updateSettings(n),s.rewind()}s.updateEntries("norewind"===n)&&s.init()})}}); \ No newline at end of file +!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof module&&module.exports?module.exports=function(t,i){return void 0===i&&(i="undefined"!=typeof window?require("jquery"):require("jquery")(t)),e(i),i}:e(jQuery)}(function(l){var r=function(t,i){this.settings=i,this.checkSettings(),this.imgAnalyzerTimeout=null,this.entries=null,this.buildingRow={entriesBuff:[],width:0,height:0,aspectRatio:0},this.lastFetchedEntry=null,this.lastAnalyzedIndex=-1,this.yield={every:2,flushed:0},this.border=0<=i.border?i.border:i.margins,this.maxRowHeight=this.retrieveMaxRowHeight(),this.suffixRanges=this.retrieveSuffixRanges(),this.offY=this.border,this.rows=0,this.spinner={phase:0,timeSlot:150,$el:l('
'),intervalId:null},this.scrollBarOn=!1,this.checkWidthIntervalId=null,this.galleryWidth=t.width(),this.$gallery=t};r.prototype.getSuffix=function(t,i){var e,s;for(e=i .jg-caption");return 0===i.length?null:i},r.prototype.displayEntry=function(t,i,e,s,n,r){t.width(s),t.height(r),t.css("top",e),t.css("left",i);var o=this.imgFromEntry(t);if(null!==o){o.css("width",s),o.css("height",n),o.css("margin-left",-Math.round(s/2)),o.css("margin-top",-Math.round(n/2));var a=o.data("jg.src");if(a){a=this.newSrc(a,s,n,o[0]),o.one("error",function(){this.resetImgSrc(o)});var h=function(){o.attr("src",a)};"skipped"===t.data("jg.loaded")&&a?this.onImageEvent(a,function(){this.showImg(t,h),t.data("jg.loaded",!0)}.bind(this)):this.showImg(t,h)}}else this.showImg(t);this.displayEntryCaption(t)},r.prototype.displayEntryCaption=function(t){var i=this.imgFromEntry(t);if(null!==i&&this.settings.captions){var e=this.captionFromEntry(t);if(null===e){var s=i.attr("alt");this.isValidCaption(s)||(s=t.attr("title")),this.isValidCaption(s)&&(e=l('
'+s+"
"),t.append(e),t.data("jg.createdCaption",!0))}null!==e&&(this.settings.cssAnimation||e.stop().fadeTo(0,this.settings.captionSettings.nonVisibleOpacity),this.addCaptionEventsHandlers(t))}else this.removeCaptionEventsHandlers(t)},r.prototype.isValidCaption=function(t){return void 0!==t&&0this.settings.justifyThreshold;if(i||t&&"hide"===this.settings.lastRow&&!d){for(e=0;e img, > a > img").fadeTo(0,0));return-1}for(t&&!d&&"justify"!==this.settings.lastRow&&"hide"!==this.settings.lastRow&&(a=!1,0this.settings.justifyThreshold)),e=0;ethis.settings.refreshSensitivity&&(this.galleryWidth=t,this.rewind(),this.rememberGalleryHeight(),this.startImgAnalyzer(!0))}},this),this.settings.refreshTime)},r.prototype.isSpinnerActive=function(){return null!==this.spinner.intervalId},r.prototype.getSpinnerHeight=function(){return this.spinner.$el.innerHeight()},r.prototype.stopLoadingSpinnerAnimation=function(){clearInterval(this.spinner.intervalId),this.spinner.intervalId=null,this.setGalleryTempHeight(this.$gallery.height()-this.getSpinnerHeight()),this.spinner.$el.detach()},r.prototype.startLoadingSpinnerAnimation=function(){var t=this.spinner,i=t.$el.find("span");clearInterval(t.intervalId),this.$gallery.append(t.$el),this.setGalleryTempHeight(this.offY+this.buildingRow.height+this.getSpinnerHeight()),t.intervalId=setInterval(function(){t.phase=this.yield.every))return void this.startImgAnalyzer(t)}else if("error"!==e.data("jg.loaded"))return}0 img, > a > img, > svg, > a > svg",triggerEvent:function(t){this.$gallery.trigger(t)}},l.fn.justifiedGallery=function(n){return this.each(function(t,i){var e=l(i);e.addClass("justified-gallery");var s=e.data("jg.controller");if(void 0===s){if(null!=n&&"object"!==l.type(n)){if("destroy"===n)return;throw"The argument must be an object"}s=new r(e,l.extend({},r.prototype.defaults,n)),e.data("jg.controller",s)}else if("norewind"===n);else{if("destroy"===n)return void s.destroy();s.updateSettings(n),s.rewind()}s.updateEntries("norewind"===n)&&s.init()})}}); \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index f02b16d..62e8f94 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,16 +9,8 @@ {% endif %} - - - - - - + {% block scripts %} + {% endblock %} @@ -30,26 +22,15 @@ {{ DESCRIPTION }}