jekyll-theme-paperwiki 0.1.4 → 0.1.6

data/_sass/partials/_launchpad.scss

@@ -15,94 +15,53 @@
    padding: 56px 0;
 }
 
+// The section containing the search form.
 .launchpad-search {
    grid-column: span 12 / auto;
 
    padding: 36px 44px;
 
-   background-color: $color-launchpadsearch;
-   border: 1px solid #f0eae7;
+   background-color: $color-launchpad_search;
+   border: 1px solid $color-launchpad_search_border;
    border-radius: 1.5rem;
 }
 
-.launchpad-searchbar {
-   width: 60%;
-   padding: 12px 16px;
-
-   border: 1px solid transparent;
-   border-radius: 1rem;
-
-   font-size: $fontsize-body;
-
-   transition: 0.25s;
-   appearance: none;
-   outline: none;
-}
-
-.launchpad-searchbar:hover {
-   border: 1px solid $color-launchpadsearch;
-   box-shadow: 0 0 6px $color-globalsearchbar;
-}
-
-.launchpad-searchbar:focus {
-   outline: none;
-   border-color: $color-globalsearchbar;
-   box-shadow: 0 0 6px $color-globalsearchbar;
-   transition: 0.25s;
-}
-
+// The elements within the search form itself.
 .launchpad-search label {
-   font-family: $font-serif;
+   font-family: $fontfamily-header;
    font-size: $fontsize-larger;
 }
 
-.launchpad-search_select {
-   padding: 16px 16px 17px 16px;
+.launchpad-searchbar {
+   width: 60%;
+   padding: 12px 16px;
 
-   border: 1px solid transparent;
    border-radius: 1rem;
 
-   background-color: $color-globalsearchbar;
-
    font-size: $fontsize-body;
-
-   transition: 0.25s;
-//   appearance: none;
-}
-
-.launchpad-search_select:hover {
-   border: 1px solid $color-launchpadsearch;
-   box-shadow: 0 0 6px $color-globalsearchbar;
-}
-
-.launchpad-search_select:focus {
-   outline: none;
-   border-color: $color-globalsearchbar;
-   box-shadow: 0 0 6px $color-globalsearchbar;
-   transition: 0.25s;
 }
 
 .launchpad-search_submit {
    padding: 12px 20px;
+   appearance: none;
+   outline: none;
 
-   background: $color-launchpadsearchbar;
-   border: 1px solid transparent;
+   background: $color-launchpad_search_submit;
+   border: 0;
    border-radius: 1rem;
 
    font-size: $fontsize-body;
-}
 
-.launchpad-search_submit:hover {
-   border: 1px solid $color-launchpadsearch;
-   box-shadow: 0 0 6px $color-globalsearchbar;
-   transition: 0.25s;
-}
+   transition: $transition;
 
-.launchpad-search_submit:focus {
-   outline: none;
-   border-color: $color-globalsearchbar;
-   box-shadow: 0 0 6px $color-globalsearchbar;
-   transition: 0.25s;
+   &:hover {
+      box-shadow: 0 0 7px $color-launchpad_search_submit_hover;
+      transition: $transition;
+   }
+   &:focus {
+      box-shadow: 0 0 7px $color-launchpad_search_submit_focus;
+      transition: $transition;
+   }
 }
 
 .launchpad-projects {
@@ -125,50 +84,55 @@
    padding: 36px 28px 28px;
 
    border-radius: 1.5rem;
-   border: 1px solid $color-projectborder;
+   border: 1px solid $color-project_card_border;
 
    text-decoration: none;
-   color: $color-bodytext;
+   color: $color-body_text;
+
+   transition: $transition;
 
    header {
-      margin-top: 16px;
+      margin-top: 1rem;
 
       font-family: $fontfamily-header;
       font-size: $fontsize-med;
    }
 
    .project-icon {
-      padding: 16px;
+      padding: 1rem;
 
       border-radius: 3rem;
-      background-color: $color-projectcard;
+      background-color: $color-project_card_icon;
 
       color: #ffffff;
       font-size: $fontsize-med;
 
-      transition: 0.2s;
+      transition: $transition;
    }
 }
 
 .launchpad-card:link {
-   color: $color-bodytext;
+   color: $color-body_text;
 }
 
 .launchpad-card:hover {
    border: 1px solid transparent;
-   box-shadow: 0 0 6px $color-projectborder;
+   box-shadow: 0 0 6px $color-project_card_hover_shadow;
+
+   transition: $transition;
+
    .project-icon {
-      background-color: $color-projecthover;
+      background-color: $color-project_card_icon_hover;
 
-      color: $color-projectcard;
+      color: $color-project_card_icon;
 
-      transition: 0.2s;
+      transition: $transition;
    }
-   color: $color-bodytext;
+   color: $color-body_text;
 }
 
 .launchpad-card:visited {
-   color: $color-bodytext;
+   color: $color-body_text;
 }
 
 
@@ -178,20 +142,22 @@
 \*------------------------------------*/
 
 .launchpad-card_wiki {
-   background-color: $color-projecthover;
+   background-color: $color-wiki_card_background;
    border-radius: 1.5rem;
-   border: 1px solid $color-projecthover;
+   border: 1px solid $color-wiki_card_border;
 }
 
 .launchpad-card_wiki:hover {
-   background-color: $color-projecthover;
+   border: 1px solid transparent;
+   box-shadow: 0 0 6px $color-wiki_card_hover_shadow;
+
+   transition: $transition;
 
-   color: $color-projectcard;
    .project-icon {
-      background-color: $color-paperlight;
+      background-color: $color-paper_light;
 
-      color: $color-projectcard;
+      color: $color-project_card_icon;
 
-      transition: 0.2s;
+      transition: $transition;
    }
 }

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

@@ -1,6 +1,7 @@
 /* The variables directory contains any SCSS that doesn't create any actual CSS output. */
 @import "variables/colors";
 @import "variables/fonts";
+@import "variables/misc";
 
 /* Partials are all the components of a webpage broken down into manageable chunks. Organized by page type (i.e. templates for wiki pages, grammars, etc). */
 @import "partials/base";
@@ -11,4 +12,5 @@
 @import "partials/entries";
 @import "partials/search";
 @import "partials/blog";
+@import "partials/languages";
 @import "partials/glossing";

data/_sass/variables/_colors.scss

@@ -2,48 +2,101 @@
   # COLOUR SCHEME
 \*------------------------------------*/
 
-$color-paperlight: #fdfcfc; // off white
-$color-paperdark: #fbf9f8;
+// neutrals
+$color-paper_light: #fdfcfc; // off white
+$color-paper_dark: #fbf9f8;
 $color-linen: #f6f2ef; // shortbread
+$color-shortbread: #f9f6f4;//#f8f4f2;
+$color-shortbread_dark: #f3efec;
 $color-ink: #4b4a46; // dark umber
+$color-ink_warm: #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;
 
-$color-bluelight: #4083ae;
-$color-bluedark: #356d90;
+// links
+$color-blue_light: #4083ae;
+$color-blue_dark: #356d90;
 $color-purple: #61609d;
 
 /*------------------------------------*\
   # COLOUR SCHEME values
 \*------------------------------------*/
 
-$color-bodybg: $color-linen;
-$color-contentbg: $color-paperlight;
-$color-globalbg: $color-paperdark;
-$color-globalborder: #f7f2ef;
-
-$color-bodytext: $color-ink;
-$color-link: $color-bluelight;
-$color-linkhover: $color-bluedark;
-$color-linkactive: $color-purple;
-$color-linkvisited: $color-purple;
+// Colours that apply to the body of all pages.
+$color-body_background: $color-linen;
+$color-content_background: $color-paper_light;
 
-$color-globalsearchbar: $color-peach;
+// Global text and link colours.
+$color-body_text: $color-ink;
+$color-h3: $color-ink_faded;
 
-$color-launchpadsearch: $color-linen;
-$color-launchpadborder: $color-linen;
-$color-launchpadsearchbar: $color-melon;
-$color-projectcard: $color-kiwi;
-$color-projectborder: $color-linen;
-$color-projecthover: $color-limeade;
+$color-link: $color-blue_light;
+$color-link_hover: $color-blue_dark;
+$color-link_active: $color-purple;
+$color-link_visited: $color-purple;
 
-$color-articleborder: $color-linen;
+// General searchbar colours.
+$color-searchbar_background: $color-paper_light;
+$color-searchbar_border: $color-shortbread_dark;
+$color-searchbar_border_hover: $color-linen;
+$color-searchbar_border_focus: $color-peach;
+$color-searchbar_shadow_hover: $color-peach;
+$color-searchbar_shadow_focus: $color-peach;
 
-$color-searchbg: $color-paperlight;
-$color-codebg: $color-pistachio;
-$color-codetext: $color-inkwarm;
+$color-code_background: $color-pistachio;
+$color-code_text: $color-ink_warm;
 $color-hr: $color-linen;
+
+$color-kbd_background: $color-paper_light;
+$color-kbd_border: $color-linen;
+$color-kbd_box_shadow: $color-linen;
+$color-kbd_hover: $color-linen;
+
+$color-blockquote_background: $color-paper_dark;
+$color-blockquote_border: $color-shortbread;
+
+/*------------------------------------*\
+  # COLOUR SCHEME values
+  # page- or section-specific
+\*------------------------------------*/
+
+// Colours that apply to the global header and footer.
+$color-global_background: $color-paper_dark;
+$color-global_border: $color-shortbread;
+$color-global_nav_underline: $color-mango;
+
+// Colours that apply to the index page or launchpad.
+$color-launchpad_search: $color-linen;
+$color-launchpad_search_border: $color-shortbread_dark;
+$color-launchpad_search_submit: $color-melon;
+$color-launchpad_search_submit_hover: $color-melon;
+$color-launchpad_search_submit_focus: $color-melon;
+
+$color-project_card_icon: $color-kiwi;
+$color-project_card_border: $color-linen;
+$color-project_card_hover_shadow: $color-linen;
+$color-project_card_icon_hover: $color-limeade;
+
+$color-wiki_card_background: $color-limeade;
+$color-wiki_card_border: $color-limeade;
+$color-wiki_card_hover_shadow: $color-limeade;
+
+// Colours that apply only to collections pages.
+$color-collections_sidebar: $color-paper_dark;
+$color-collections_sidebar_border: $color-shortbread;
+$color-collections_header: $color-paper_dark;
+$color-collections_header_border: $color-shortbread;
+
+$color-portal_card_border: $color-linen;
+$color-portal_card_icon_hover: $color-kiwi;
+
+// Colours that apply only to entry pages.
+$color-article_border: $color-linen;
+$color-entry_secondary: $color-paper_dark;

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.4
+  version: 0.1.6
 platform: ruby
 authors:
 - pomeloshark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -36,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
@@ -48,20 +51,29 @@ files:
 - _layouts/portal.html
 - _layouts/post.html
 - _layouts/reference_desk.html
+- _layouts/search.html
 - _layouts/wiki.html
 - _layouts/work.html
+- _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