jekyll-theme-paperwiki 0.1.3 → 0.1.5

data/_sass/partials/_base.scss

@@ -60,7 +60,7 @@ h3 {
    font-size: $fontsize-h3;
    font-variant: small-caps;
    padding: 0.71em 0 0.9em 0;
-   color: #828077;
+   color: $color-h3;
 }
 
 a,
@@ -97,15 +97,18 @@ blockquote {
    margin-left: 3em;
    margin-right: 3em;
    margin-bottom: 1.75rem;
-   padding-left: 1em;
+   padding: 1.75em;
 
-   border-left: 0.25em solid $color-linen;
+   background-color: $color-paperdark;
+   border-left: 0.5em solid $color-shortbread;
 
-   cite {
-      display: block;
-      width: 100%;
+   figcaption {
       text-align: right;
    }
+
+   figcaption cite {
+      display: inline;
+   }
 }
 
 ul ul {
@@ -131,15 +134,90 @@ samp {
 }
 
 code,
-kbd,
-.ipa {
-   padding: 0.1em 0.2em;
+kbd {
+   padding: 0.4em 0.5em 0.2em;
+
+   background-color: $color-codebg;
+   color: $color-codetext;
+   border-radius: 4px;
+}
+
+kbd {
+   position: relative;
+   top: -1px;
+   display: inline-block;
+   min-width: 0.75rem;
+   padding: 0.2rem 0.5rem;
+   line-height: 1;
+
+   background-color: $color-paperlight;
+   border: 1px solid $color-linen;
+   box-shadow: 0 2px 0 1px $color-linen;
+
+   cursor: default;
+
+   font-family: $fontfamily-body;
+   text-align: center;
+   color: $color-bodytext;
+
+   transition: .1s;
+   &:hover {
+      box-shadow: 0 1px 0 0.5px $color-linen;
+      top: 1px;
+   }
+}
+
+pre {
+   padding: 1rem;
 
    background-color: $color-codebg;
    color: $color-codetext;
-   border-radius: 0.3em;
+   border-radius: 6px;
 }
 
 input[type="search"] {
    background-color: $color-searchbg;
 }
+
+.tooltip {
+   position: relative;
+}
+
+.tooltip:before {
+   content: attr(data-tooltip);
+   position: absolute;
+   width: 100px;
+   background-color: #062B45;
+   color: #fff;
+   text-align: center;
+   padding: 10px;
+   line-height: 1.2;
+   border-radius: 6px;
+   z-index: 1;
+   opacity: 0;
+   transition: opacity .6s;
+   bottom: 125%;
+   left: 50%;
+   margin-left: -60px;
+   font-size: 0.75em;
+   visibility: hidden;
+}
+
+.tooltip:after {
+   content: "";
+   position: absolute;
+   bottom: 75%;
+   left: 50%;
+   margin-left: -5px;
+   border-width: 5px;
+   border-style: solid;
+   opacity: 0;
+   transition: opacity .6s;
+   border-color: #062B45 transparent transparent transparent;
+   visibility: hidden;
+}
+
+.tooltip:hover:before, .tooltip:hover:after {
+   opacity: 1;
+   visibility: visible;
+}

data/_sass/partials/_collections.scss

@@ -6,7 +6,8 @@
    grid-column: span 2 / auto;
    padding: 4.5em 2em;
 
-   background-color: $color-paperdark;
+   background-color: $color-collections_sidebar;
+   border-right: 1px solid $color-shortbread;
 
    font-size: $fontsize-small;
 
@@ -22,10 +23,6 @@
 .collections-content {
    grid-column: span 10 / auto;
 
-//   display: grid;
-//   grid-template-columns: repeat(12, 1fr);
-//   grid-gap: 2em;
-
    padding: 1.56em 2em 1.56em*2;
 
    h1 {
@@ -47,8 +44,8 @@
    padding: 1.5rem;
    margin-bottom: 1rem;
 
-   background-color: $color-paperdark;
-   border: 1px solid #faf7f6;
+   background-color: $color-collections_header;
+   border: 1px solid $color-collections_header_border;
    border-radius: 1.5rem;
 }
 
@@ -62,7 +59,7 @@
    width: 100%;
    padding: 12px 16px;
 
-   border: 1px solid transparent;
+   border: 1px solid $color-searchbar_border;
    border-radius: 1rem;
 
    font-size: $fontsize-body;
@@ -73,14 +70,14 @@
 }
 
 .collections-searchbar:hover {
-   border: 1px solid $color-launchpadsearch;
-   box-shadow: 0 0 6px $color-globalsearchbar;
+   border: 1px solid $color-searchbar_border_hover;
+   box-shadow: 0 0 6px $color-searchbar_shadow_hover;
 }
 
 .collections-searchbar:focus {
    outline: none;
-   border-color: $color-globalsearchbar;
-   box-shadow: 0 0 6px $color-globalsearchbar;
+   border-color: $color-searchbar_border_focus;
+   box-shadow: 0 0 6px $color-searchbar_shadow_focus;
    transition: 0.25s;
 }
 

data/_sass/partials/_entries.scss

@@ -4,6 +4,7 @@
 \*------------------------------------*/
 
 
+
 .entry {
    padding: 1.56em 2em;
 
@@ -33,6 +34,9 @@
    grid-column: span 10 / auto;
 }
 
+
+
+// The auto-generated table of contents.
 .entry-index {
    position: -webkit-sticky; /* Safari */
    position: sticky;
@@ -41,11 +45,23 @@
 
    grid-column: span 2 / auto;
 
-   padding: 4.5em 1em 2em 0.75em;
+   padding: 2em 1em 2em 0.75em;
 
    font-size: $fontsize-small;
 }
 
+.entry-index ul {
+   list-style: none;
+   padding-left: 1rem;
+   a {
+      text-decoration: none;
+   }
+}
+
+.entry-index_return {
+   margin-bottom: 1.5rem;
+}
+
 .entry-index ol {
    list-style: none;
    padding-left: 1rem;
@@ -66,13 +82,17 @@
 }
 
 
-.entry-summary {}
+
+// The righthand sidebar.
+.entry-sidebar {
+   grid-column: span 3 / auto;
+}
 
 .entry-other_projects {
    padding: 1rem;
-   margin: 1em 0;
+   margin: 1em;
    border-radius: 1em;
-   background-color: #f9f7f6;
+   background-color: $color-entry_secondary;
    font-size: $fontsize-small;
 
    ul {
@@ -83,17 +103,13 @@
    }
 }
 
-.entry-quickstats {
-   grid-column: span 3 / auto;
-   padding: 0.5em;
-}
-
-.stats-image {
+.entry-image {
    padding: 0.2em 0.2em 0.1em 0.2em;
    max-width: 100%;
 }
 
-.stats-facts {
+.entry-quickstats {
+   padding: 0.5em;
    font-size: $fontsize-small;
 }
 
@@ -107,21 +123,29 @@
    }
    tr td:first-child {
       text-align: right;
-      padding-right: 0.5em;
       background-color: $color-linen;
    }
    tr td:last-child {
       background-color: $color-paperdark;
    }
+   .entry-quickstats_double {
+      text-align: center !important;
+   }
+}
+
+.entry-quicknotes {
+   padding: 0.5em;
+   font-size: $fontsize-small;
+   text-align: center;
 }
 
 
 
+// The navigation, which can be at the top or bottom of the article.
 .entry-tags {
-   margin-bottom: 2em;
    padding: 1rem;
    border-radius: 1em;
-   background-color: #f9f7f6;
+   background-color: $color-entry_secondary;
    font-size: $fontsize-small;
    text-transform: uppercase;
 
@@ -130,6 +154,14 @@
    }
 }
 
+.entry-tags_top {
+   margin-bottom: 2em;
+}
+
+.entry-tags_bottom {
+   margin-top: 2em;
+}
+
 .entry-subhead_pair {
    display: inline;
    margin-right: 1em;
@@ -150,8 +182,10 @@
 
 
 
+// The footnotes section and the footnotes themselves.
 a.footnote {
    text-decoration: none;
+   line-height: 0;
 }
 a.footnote::before {
    content: "[";
@@ -161,11 +195,9 @@ a.footnote::after {
 }
 
 .footnotes {
-//   grid-column: span 7 / auto;
-
    padding: 1rem;
    border-radius: 1em;
-   background-color: #f9f7f6;
+   background-color: $color-entry_secondary;
    font-size: $fontsize-small;
    ol {
       padding-left: 1rem;
@@ -176,3 +208,5 @@ a.footnote::after {
       }
    }
 }
+
+.tooltip {}

data/_sass/partials/_global.scss

@@ -67,7 +67,7 @@
 
 .global-searchbar {
    padding: 0.2rem 1rem;
-   border: 1px solid transparent;
+   border: 1px solid $color-searchbar_border;
    border-radius: 8px;
    font-size: $fontsize-small;
    transition: 0.25s;
@@ -81,14 +81,14 @@
 }
 
 .global-searchbar:hover {
-   border: 1px solid $color-launchpadsearch;
-   box-shadow: 0 0 6px $color-globalsearchbar;
+   border: 1px solid $color-searchbar_border_hover;
+   box-shadow: 0 0 6px $color-searchbar_shadow_hover;
 }
 
 .global-searchbar:focus {
    outline: none;
-   border-color: $color-globalsearchbar;
-   box-shadow: 0 0 6px $color-globalsearchbar;
+   border-color: $color-searchbar_border_focus;
+   box-shadow: 0 0 6px $color-searchbar_shadow_focus;
    transition: 0.25s;
 }
 
@@ -106,18 +106,29 @@
 }
 
 .global-nav-link {
+   position: relative;
    display: inline-block;
-   padding-top: 0.3rem;
-
+   padding-top: 0.15rem;
    margin-right: 1.75rem;
 
-   border-bottom: 2px solid #f6bf5d;
-
    font-size: $fontsize-small;
    text-decoration: none;
    text-transform: uppercase;
-   &:hover {
-      opacity: 0.75;
+   &::after {
+      content: ' ';
+		position: absolute;
+		top: 100%;
+		left: 25%;
+
+		width: 50%;
+		height: 1px;
+		border-bottom: 2px solid $color-global_nav_underline;
+
+		transition: 0.4s;
+   }
+   &:hover::after {
+      width: 100%;
+      left: 0;
    }
 }
 

data/_sass/partials/_glossing.scss

@@ -9,10 +9,10 @@
    margin-top: 0;
    margin-bottom: 1.75rem;
    td {
-      padding: 0 0 0 0.8em;
+      padding: 0 0 0 1em;
    }
    td:first-child {
-      border-left: 2px solid $color-pistachio;
+      border-left: 4px solid $color-pistachio;
    }
 }
 

data/_sass/partials/_languages.scss

@@ -0,0 +1,10 @@
+/*------------------------------------*\
+  # LANGUAGE STYLING
+  # styling for grammars and the like
+\*------------------------------------*/
+
+.ipa {
+   background-color: $color-codebg;
+   padding: .25em;
+   border-radius: .25em;
+}

data/_sass/partials/_launchpad.scss

@@ -29,7 +29,7 @@
    width: 60%;
    padding: 12px 16px;
 
-   border: 1px solid transparent;
+   border: 1px solid #f0eae7;
    border-radius: 1rem;
 
    font-size: $fontsize-body;

data/_sass/partials/_search.scss

@@ -3,5 +3,17 @@
 \*------------------------------------*/
 
 #search-results dd {
-   margin-bottom: 1.75em;
+}
+
+.search_result {}
+
+.search_result-details {
+   margin-bottom: 0;
+   margin-left: 1.75rem;
+   font-size: $fontsize-small;
+   text-transform: uppercase;
+}
+
+.search_result-preview {
+   margin-bottom: 1.75rem;
 }

data/_sass/style.scss

@@ -11,4 +11,5 @@
 @import "partials/entries";
 @import "partials/search";
 @import "partials/blog";
+@import "partials/languages";
 @import "partials/glossing";

data/_sass/variables/_colors.scss

@@ -2,17 +2,24 @@
   # COLOUR SCHEME
 \*------------------------------------*/
 
+// neutrals
 $color-paperlight: #fdfcfc; // off white
 $color-paperdark: #fbf9f8;
 $color-linen: #f6f2ef; // shortbread
+$color-shortbread: #f9f6f4;//#f8f4f2;
 $color-ink: #4b4a46; // dark umber
+$color-inkwarm: #504b38;
+$color-ink_faded: #828077;
+
+// brights
 $color-limeade: #e2edbf;
 $color-pistachio: #f1f5e1;
 $color-kiwi: #a7c854;
 $color-melon: #f1a393;
 $color-peach: #f7dcd3;
-$color-inkwarm: #504b38;
+$color-mango: #f6bf5d;
 
+// links
 $color-bluelight: #4083ae;
 $color-bluedark: #356d90;
 $color-purple: #61609d;
@@ -21,19 +28,27 @@ $color-purple: #61609d;
   # COLOUR SCHEME values
 \*------------------------------------*/
 
+// Colours that apply to the body of all pages.
 $color-bodybg: $color-linen;
 $color-contentbg: $color-paperlight;
-$color-globalbg: $color-paperdark;
-$color-globalborder: #f7f2ef;
 
+// Global text and link colours.
 $color-bodytext: $color-ink;
+$color-h3: $color-ink_faded;
+
 $color-link: $color-bluelight;
 $color-linkhover: $color-bluedark;
 $color-linkactive: $color-purple;
 $color-linkvisited: $color-purple;
 
+// Colours that apply to the global header and footer.
+$color-globalbg: $color-paperdark;
+$color-globalborder: $color-shortbread;
+$color-global_nav_underline: $color-mango;
+
 $color-globalsearchbar: $color-peach;
 
+// Colours that apply to the index page or launchpad.
 $color-launchpadsearch: $color-linen;
 $color-launchpadborder: $color-linen;
 $color-launchpadsearchbar: $color-melon;
@@ -41,9 +56,25 @@ $color-projectcard: $color-kiwi;
 $color-projectborder: $color-linen;
 $color-projecthover: $color-limeade;
 
+// General searchbar colours.
+$color-searchbar_border: $color-shortbread;
+$color-searchbar_border_hover: $color-linen;
+$color-searchbar_border_focus: $color-peach;
+$color-searchbar_shadow_hover: $color-peach;
+$color-searchbar_shadow_focus: $color-peach;
+
+// Colours that apply only to collections pages.
+$color-collections_sidebar: $color-paperdark;
+$color-collections_header: $color-paperdark;
+$color-collections_header_border: $color-shortbread;//#faf7f6;
+
+// Colours that apply only to entry pages.
 $color-articleborder: $color-linen;
+$color-entry_secondary: $color-paperdark;
 
 $color-searchbg: $color-paperlight;
 $color-codebg: $color-pistachio;
 $color-codetext: $color-inkwarm;
 $color-hr: $color-linen;
+
+$color-blockquoteborder: $color-linen;

data/assets/js/search.js

@@ -1,36 +1,39 @@
 // Yoinked in its entirety from https://davidwalsh.name/adding-search-to-your-site-with-javascript
 
 var searchIndex = lunr(function() {
-    this.ref("id");
-    this.field("title", { boost: 10 });
-    this.field("content");
-    for (var key in window.pages) {
-        this.add({
-            "id": key,
-            "title": pages[key].title,
-            "content": pages[key].content
-        });
-    }
+   // define searchable fields for each page
+   this.ref("id");
+   this.field("title", { boost: 10 });
+   this.field("content");
+   this.field("portal");
+   this.field("categories");
+   for (var key in window.pages) {
+      this.add({
+         "id": key,
+         "title": pages[key].title,
+         "content": pages[key].content
+      });
+   }
 });
 
 
 
 function getQueryVariable(variable) {
-  var query = window.location.search.substring(1);
-  var vars = query.split("&");
-  for (var i = 0; i < vars.length; i++) {
+   var query = window.location.search.substring(1);
+   var vars = query.split("&");
+   for (var i = 0; i < vars.length; i++) {
       var pair = vars[i].split("=");
       if (pair[0] === variable) {
-          return decodeURIComponent(pair[1].replace(/\+/g, "%20"));
+         return decodeURIComponent(pair[1].replace(/\+/g, "%20"));
       }
-  }
+   }
 }
 
 var searchTerm = getQueryVariable("q");
 // creation of searchIndex from earlier example
 var results = searchIndex.search(searchTerm);
 var resultPages = results.map(function (match) {
-  return pages[match.ref];
+   return pages[match.ref];
 });
 
 
@@ -39,9 +42,9 @@ var resultPages = results.map(function (match) {
 // resultPages from previous example
 resultsString = "";
 resultPages.forEach(function (r) {
-    resultsString += "<dt>";
-    resultsString += "<a class='result' href='" + r.url + "'>" + r.title + "</a></dt>";
-//    resultsString += "<dd><a href='/" + r.collection + "'>" + r.collection + "</a>";
-    resultsString += "<dd>" + r.content.substring(0, 200) + "..." + "</dd>";
+   resultsString += "<dt class='search_result'>";
+   resultsString += "<a href='" + r.url + "'>" + r.title + "</a>";
+   resultsString += "<span class='search_result-details'>" + r.portal + " ⋅ " + r.categories + "</span></dt>"
+   resultsString += "<dd class='search_result-preview'>" + r.content.substring(0, 200) + "..." + "</dd>";
 });
 document.querySelector("#search-results").innerHTML = resultsString;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-paperwiki
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - pomeloshark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -26,7 +26,6 @@ dependencies:
         version: '4.2'
 description:
 email:
-- pomeloshark@proton.me
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -37,9 +36,12 @@ files:
 - _data/navigation.yml
 - _includes/collections_header.html
 - _includes/collections_sidebar.html
+- _includes/entry_tags.html
 - _includes/global_footer.html
 - _includes/global_head.html
 - _includes/global_header.html
+- _includes/search_results.html
+- _includes/wiki_sidebar.html
 - _layouts/collections.html
 - _layouts/default.html
 - _layouts/entry.html
@@ -49,31 +51,29 @@ files:
 - _layouts/portal.html
 - _layouts/post.html
 - _layouts/reference_desk.html
+- _layouts/search.html
 - _layouts/wiki.html
 - _layouts/work.html
-- _pages/random.html
-- _pages/search.md
-- _pages/wiki/wiki.md
-- _pages/wiki/wiki_all.md
-- _pages/wiki/wiki_contents.md
-- _pages/wiki/wiki_random.md
-- _pages/wiki/wiki_search.md
+- _plugins/blockquote.rb
 - _plugins/gloss.rb
 - _plugins/interlinear.rb
 - _plugins/ipa.rb
 - _plugins/lang.rb
+- _plugins/sidenote.rb
 - _sass/partials/_base.scss
 - _sass/partials/_blog.scss
 - _sass/partials/_collections.scss
 - _sass/partials/_entries.scss
 - _sass/partials/_global.scss
 - _sass/partials/_glossing.scss
+- _sass/partials/_languages.scss
 - _sass/partials/_launchpad.scss
 - _sass/partials/_page.scss
 - _sass/partials/_search.scss
 - _sass/style.scss
 - _sass/variables/_colors.scss
 - _sass/variables/_fonts.scss
+- assets/.DS_Store
 - assets/css/style.scss
 - assets/fonts/Inter/.DS_Store
 - assets/fonts/Inter/Inter-Bold.otf