jekyll-theme-paperwiki 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9bd7015a5fd9b6b1ea1139ce529d52c0d769b96585cc00800a3bf1db28d571
-  data.tar.gz: 358584149a0141a2f73b19565ae0a17a3a8d233fac4d153788a59b105148bf45
+  metadata.gz: 96dc441b57acdaf6886f2e20b25d4b95855cef23475163a86fd42dfaafcc282e
+  data.tar.gz: 0b11702d89f94b83299c46118f9d7cee573774ba775611cf72168aa5a135a527
 SHA512:
-  metadata.gz: '0900591839357e2f3ef3059d75b50dec0ed9b6863248eb69a80bbc4d77ab4d9a0d156fe1fe0e0e701f4256aa77b4a69452de5e4cf13f2f40c3d7f60feda38bf7'
-  data.tar.gz: 76c2dc278a7d1a4f33f0faf737ce1a2116538273d8108ede6da2b612b74b3fc5a5d670a5370ff0e1d344113c9a34c4810a816fd2bcf6d3ba7e9c320c636fa7e3
+  metadata.gz: 308ed2f06df61653cf4ee6a45c79bb3164a00c42d3cc94a8645530dfda98942f5c345f42588a50317eb78e4491bf1ff1fde52609c983fe96644f71fb2cec5502
+  data.tar.gz: 6944c6581d6f26a18f823d50c11ae19dbec6c73a5141473f5ce1a02f657f251afd7b5fc3f23957714f77eb1458a6b466949ff5ec559b9cd8ee54d00350c4c08d

data/README.md

@@ -1,8 +1,12 @@
 # jekyll-theme-paperwiki
 
-The intent of this theme is to get all the code out of the way and to allow you to write Markdown articles; the best way to do that is to install the theme as a gem. However, if you want to tinker with the code, just download this repository.
+For storing your worldbuilding notes! The intent of this theme is to get all the code out of the way and to allow you to write Markdown articles; the best way to do that is to install the theme as a gem. However, if you want to tinker with the code, just download this repository.
 
-This theme is not mobile friendly, as I personally do absolutely no worldbuilding on mobile and thus my development skills are lacking. There is also no dark mode or other alternate colour scheme, but please feel free to fork this project and add whatever functionality it's missing.
+For the easiest starting point, I have uploaded a sample site that you can download with everything preconfigured, so if you're unfamiliar with Jekyll you can bypass all the setup and get right to it. See that repo for instructions.
+
+I've tried to adhere to accessible and easy to read design principles while retaining the look and layout of a classic wiki that we're all familiar with - I've aped some elements of Wikipedia's organizational system and layout while trying to make it as clean and user friendly as possible.
+
+This theme is not mobile friendly, as I personally do absolutely no work on mobile and thus my development skills are lacking. There is also no dark mode or other alternate colour scheme, but please feel free to fork this project and add whatever functionality it's missing.
 
 
 
@@ -15,7 +19,7 @@ In case you're unfamiliar with it, a basic Jekyll site includes the following:
 + The `_site` folder contains everything that Jekyll outputs when it builds the site. Don't edit anything in this folder, as it will be rewritten the next time you serve the site.
 + The `assets` folder contains things like fonts, images, and Javascript files. It also contains a `.scss` file importing all of your SCSS so that Jekyll can convert it to regular CSS.
 
-This theme comes with all of these prepackaged, so most of what you have to do is edit the `_config.yaml` file. The theme has some default config set already, but you can override these in your own config file if you wish. You can also add any of the above folders with includes, layouts, or SCSS to override the theme's own files. For example, you will want to add your own `assets` folder to store your own images, including one titled `favicon.png` in order to override the placeholder one i've included.
+This theme comes with all of these prepackaged, so most of what you have to do is edit the `_config.yaml` file. The theme has some default config set already, but you can override these in your own config file if you wish. You can also add any of the above folders to your own project with includes, layouts, or SCSS to override the theme's files. For example, you will want to add your own `assets` folder to store your own images, including one titled `favicon.png` in order to override the placeholder one i've included.
 
 
 
@@ -46,12 +50,10 @@ This will give you a very bare bones Jekyll site, with an index page, a folder f
 
 (Don't worry about the .gitignore or the Gemfile.lock.)
 
-(You can also move your `_posts` folder into your `collections` folder if you want; I find it makes things a little neater.)
-
 To use this theme, open your Jekyll site's `Gemfile`, delete the line that says `gem "minima"` and replace it with this line:
 
 ```ruby
-gem "jekyll-theme-paperwiki", "~> 0.1.2"
+gem "jekyll-theme-paperwiki", "~> 0.1.4"
 ```
 
 And add this line to your Jekyll site's `_config.yml`:
@@ -98,9 +100,10 @@ All of your wiki pages should be written in markdown, and you must begin each `.
 Between these two lines is where you include *front matter*, such as specifying the layout or the permalink to the page. However, you can leave the front matter blank - wiki pages have layouts and permalinks set by default in the theme's config file, and you only need to specify them if you want to override the defaults. You also do not need to specify a title for the page, as it is automatically taken from the filename. All you absolutely need is the two triple-dashed lines, as Jekyll needs it to know that the front matter is there in order to output the page.
 
 Caveats:
-- if the site won't build due to an error with the random page, make sure you have more than one wiki article for it to draw from
+- If the site won't build due to an error with the random page, make sure you have more than one wiki article for it to draw from
+- You may need to specify a permalink and a title if you want to use certain characters that are not allowed in filenames -- say, some IPA characters. Otherwise just title your articles "Article title.md", with spaces, not underscores or hyphens, and the default settings will take care of the rest.
+
 
-​
 
 ## Config
 
@@ -119,7 +122,8 @@ collections:
 However, if you would like to have additional collections akin to the Wikimedia Foundation's other projects - such as Wikisource, Wikispecies, or Wiktionary - then you can specify them in the same format as above, also under the `collections` key:
 
 ```yaml
-   collection_name:
+collections:
+   COLLECTION_NAME:
       output: true
       permalink: /:collection/:name
 ```
@@ -141,9 +145,9 @@ You will also need to add a data file listing your projects: create a folder tit
   desc: A brief description here
 ```
 
-For the icon, find one you like from RemixIcon and copy the code.
+For the icon, find one you like from [RemixIcon](https://remixicon.com/) and copy the code.
 
-This will add links to each different collection on your homepage, and allow you to limit the scope of your searches to a single collection or expand it to cover all of them at once. You do not need to do anything to
+This will add links to each different collection on your homepage, and allow you to limit the scope of your searches to a single collection or expand it to cover all of them at once. The search logic is already taken care of in the theme itself; it just needs the names of your collections.
 
 
 

data/_config.yml

@@ -1,12 +1,32 @@
+# Build settings
+include: ['_pages'] # forces custom pages to be organized into their own directory
+
+# Plugins
+# plugins:
+#    - jekyll-ipa
 
 random_redirect:
    pages: true
 
+multi_projects: true
+entry_tags_top: true
+
+
+
+# Sets the collections directory and defines your collections.
 collections_dir: collections
 collections:
    wiki:
       output: true
       permalink: /:collection/:name
+   works:
+      output: true
+      permalink: /:collection/:name
+   grammars:
+      output: true
+      permalink: /:collection/:name
+
+
 
 # Front matter defaults, so you don't need to set layouts on every new page.
 # As long as pages are in the correct folder, they'll automatically have the
@@ -31,3 +51,15 @@ defaults:
          type: "wiki"
       values:
          layout: "wiki"
+   -
+      scope:
+         path: "_works" # all pages in the works folder
+         type: "works"
+      values:
+         layout: "work"
+   -
+      scope:
+         path: "_grammars" # all pages in the grammars folder
+         type: "grammars"
+      values:
+         layout: "grammar"

data/_includes/collections_header.html

@@ -4,11 +4,7 @@
       {% for item in site.data.projects %}
          {% if page.url contains item.link %}
             Total number of {{ item.name | downcase }} entries:
-            {% if item.name == "Wiki" %}
-               {{ site.wiki.size }}
-            {% else %}
-               ? for now
-            {% endif %}
+               <strong>{{ site.[page.project].size }}</strong>
          {% endif %}
       {% endfor %}
    </section>

data/_includes/entry_tags.html

@@ -0,0 +1,36 @@
+<div class="entry-subhead_pair">
+
+   <span class="entry-subhead_key">Portals:</span>
+   <span>
+      <a href="/{{ page.collection }}/portal:{{ page.portal }}" class="entry-subhead_value">
+         {{ page.portal }}
+      </a>
+   </span>
+
+</div>
+
+<div class="entry-subhead_pair">
+
+   <span class="entry-subhead_key">Categories:</span>
+   <span>
+      {% for item in page.categories %}
+         <a href="/{{ page.collection }}/category:{{ item | slugify }}" class="entry-subhead_value">
+            {{ item }}
+         </a>
+      {% endfor %}
+   </span>
+
+</div>
+
+<div class="entry-subhead_pair">
+
+   <span class="entry-subhead_key">Tags:</span>
+   <span>
+      {% for item in page.tags %}
+         <a href="/{{ page.category }}/tag:{{ item }}" class="entry-subhead_value">
+            {{ item }}
+         </a>
+      {% endfor %}
+   </span>
+
+</div>

data/_includes/search_results.html

@@ -0,0 +1,8 @@
+"{{ page.url | slugify }}": {
+   "title": "{{ page.title | xml_escape }}",
+   "content": {{ page.content | markdownify | strip_newlines | strip_html | jsonify }},
+   "portal": "{{ page.portal | xml_escape }}",
+   "categories": "{{ page.categories | array_to_sentence_string: "" | xml_escape }}",
+   "url": "{{ site.url | append: page.url | xml_escape }}",
+   "path": "{{ page.url | xml_escape }}"
+}

data/_includes/wiki_sidebar.html

@@ -0,0 +1,67 @@
+<section class="entry-sidebar">
+
+   {% if page.other_projects %}
+
+      <section class="entry-other_projects">
+         View in other collections:
+         <ul>
+            {% for item in page.other_projects %}
+               <li>
+                  <a href="/{{ item }}{{ page.url | remove_first: "/wiki" }}">{{ item | capitalize }}</a>
+               </li>
+            {% endfor %}
+         </ul>
+      </section>
+
+   {% endif %}
+
+
+   {% if page.image %}
+      <figure>
+         <img src="{{ page.image }}" width=auto class="entry-image">
+         {% if page.image_caption %}
+            <figcaption>{{ page.image_caption }}</figcaption>
+         {% endif %}
+      </figure>
+   {% endif %}
+
+
+
+   {% if page.quickstats %}
+
+      <section class="entry-quickstats">
+
+         <table class="stats-table">
+            {% for stat in page.quickstats %}
+               {% if stat[0] == "colspan_2" %}
+                  <tr>
+                     <td colspan="2" class="entry-quickstats_double">
+                        {{ stat[1] | replace: "_", " " | capitalize }}
+                     </td>
+                  </tr>
+               {% else %}
+                  <tr>
+                     <td>{{ stat[0] | replace: "_", " " | capitalize }}</td>
+                     <td>{{ stat[1] }}</td>
+                  </tr>
+               {% endif %}
+            {% endfor %}
+         </table>
+
+      </section>
+
+   {% endif %}
+
+
+
+   {% if page.quicknotes %}
+
+      <section class="entry-quicknotes">
+
+         {{ page.quicknotes }}
+
+      </section>
+
+   {% endif %}
+
+<section>

data/_layouts/entry.html

@@ -4,6 +4,14 @@
 
 <nav class="entry-index">
 
+   <ul class="entry-index_return">
+      <li>
+         <a href="/{{ page.collection }}">
+            ← Return to {{ page.collection | capitalize }}
+         </a>
+      </li>
+   </ul>
+
 </nav>
 
 {{ content }}

data/_layouts/search.html

@@ -0,0 +1,12 @@
+---
+   layout: page
+---
+
+<h1>{{ page.title }}</h1>
+
+<dl id="search-results"></dl>
+
+{{ content }}
+
+<script src="/assets/js/lunr.js"></script>
+<script src="/assets/js/search.js"></script>

data/_layouts/wiki.html

@@ -4,121 +4,24 @@
 
 <article class="entry entry-wiki">
 
-
-
    <h1>
       {{ page.title }}
    </h1>
 
-
-
-   {% if page.other_projects %}
-
-      <section class="entry-other_projects">
-         View in other collections:
-         <ul>
-            {% for item in page.other_projects %}
-               <li>
-                  <a href="/{{ item }}{{ page.url | remove_first: "/wiki" }}">{{ item | capitalize }}</a>
-               </li>
-            {% endfor %}
-         </ul>
+   {% if site.entry_tags_top %}
+      <section class="entry-tags entry-tags_top">
+         {% include entry_tags.html %}
       </section>
-
    {% endif %}
 
-
-
-   <section class="entry-tags">
-
-      <div class="entry-subhead_pair">
-
-         <span class="entry-subhead_key">Portals:</span>
-         <span>
-            <a href="/wiki/portal:{{ page.portal }} class="entry-subhead_value"">
-               {{ page.portal }}
-            </a>
-         </span>
-
-      </div>
-
-      <div class="entry-subhead_pair">
-
-         <span class="entry-subhead_key">Categories:</span>
-         <span>
-            {% for item in page.categories %}
-               <a href="/wiki/category:{{ item | slugify }}" class="entry-subhead_value">
-                  {{ item }}
-               </a>
-            {% endfor %}
-         </span>
-
-      </div>
-
-      <div class="entry-subhead_pair">
-
-         <span class="entry-subhead_key">Tags:</span>
-         <span>
-            {% for item in page.tags %}
-               <a href="/wiki/tag:{{ item }}" class="entry-subhead_value">
-                  {{ item }}
-               </a>
-            {% endfor %}
-         </span>
-
-      </div>
-
-   </section>
-
    {{ content }}
 
-</article>
-
-
-
-{% if page.quickstats %}
-
-   <section class="entry-quickstats">
-
-      {% if page.image %}
-         <figure>
-            <img src="{{ page.image }}" width=auto class="stats-image">
-            <figcaption>{{ page.image_caption }}</figcaption>
-         </figure>
-      {% endif %}
-
-      <section class="stats-facts">
-
-         <table class="stats-table">
-            {% if page.type == "person" %}
-               <tr><td>Name</td><td>{{ page.fullname }}</td></tr>
-               <tr><td>Birthday</td><td>{{ page.birthday }}</td></tr>
-               <tr><td>Birthplace</td><td>{{ page.birthplace }}</td></tr>
-               <tr><td>Known for</td><td>{{ page.known_for }}</td></tr>
-            {% endif %}
-            {% if page.type == "planet" %}
-               <tr><td>Orbital period</td><td>{{ page.orbital_period }}</td></tr>
-               <tr><td>Semimajor axis</td><td>{{ page.semimajor_axis }}</td></tr>
-               <tr><td>Orbital eccentricity</td><td>{{ page.eccentricity }}</td></tr>
-               <tr><td>Aphelion</td><td>{{ page.aphelion }}</td></tr>
-               <tr><td>Perihelion</td><td>{{ page.perihelion }}</td></tr>
-               <tr><td>Orbital speed</td><td>{{ page.orbital_speed }}</td></tr>
-               <tr><td>Orbital period</td><td>{{ page.orbital_period }}</td></tr>
-               <tr><td>Orbital inclination</td><td>{{ page.orbital_inclination }}</td></tr>
-               <tr><td>Satellites</td><td>{{ page.satellites }}</td></tr>
-               <tr><td>Radius (mean)</td><td>{{ page.radius }}</td></tr>
-               <tr><td>Radius (equatorial)</td><td>{{ page.radius_equatorial }}</td></tr>
-               <tr><td>Radius (polar)</td><td>{{ page.radius_polar }}</td></tr>
-               <tr><td>Circumference</td><td>{{ page.circumference }}</td></tr>
-               <tr><td>Surface area</td><td>{{ page.surface_area }}</td></tr>
-               <tr><td>Sidereal day</td><td>{{ page.sidereal_day }}</td></tr>
-               <tr><td>Synodic day</td><td>{{ page.synodic_day }}</td></tr>
-               <tr><td>Axial tilt</td><td>{{ page.axial_tilt }}</td></tr>
-            {% endif %}
-         </table>
-
+   {% if site.entry_tags_top == false %}
+      <section class="entry-tags entry-tags_bottom">
+         {% include entry_tags.html %}
       </section>
+   {% endif %}
 
-   </section>
+</article>
 
-{% endif %}
+{% include wiki_sidebar.html %}

data/_plugins/blockquote.rb

@@ -0,0 +1,28 @@
+# usage: {% blockquote text[0] text[1] text[2]%}
+# usage: {% blockquote text[0] text[1] text[2]%}
+# text[0]: the text of the blockquote
+# text[1]: the author of the blockquote
+# text[2]: the source of the blockquote
+
+module Jekyll
+   module Tags
+      class RenderBlockquoteTag < Liquid::Tag
+
+         require "shellwords"
+
+         # initialize is called when we encounter the {% blockquote %} Liquid tag; 'blockquote' is the tag name and anything immediately after it is passed in via the second argument
+         def initialize(tag_name, text, tokens)
+            super
+            @text = text.shellsplit
+         end
+
+         def render(context)
+            "<figure><blockquote>#{@text[0]}<figcaption>#{@text[1]}, <cite>#{@text[2]}</cite></figcaption></blockquote></figure>"
+         end
+
+      end
+   end
+end
+
+# The register_tag method takes two arguments: the user-facing name of the tag [blockquote], and the class that implements it [RenderBlockquoteTag].
+Liquid::Template.register_tag("blockquote", Jekyll::Tags::RenderBlockquoteTag)

data/_plugins/gloss.rb

@@ -0,0 +1,22 @@
+module Jekyll
+   module InterlinearGlossFilter # Liquid just uses the method name as the filter name; there's no extra level of name-mapping like there is with tags and blocks
+
+      def gloss(input) # will be available as the "gloss" filter
+         @text = input
+         puts "<table><tbody><tr>"
+
+         lexemes = @text.split(" ")
+         lexemes.each do |word|
+            puts "<td class=\"gloss_item\">#{word}</td>"
+         end
+
+         puts "</tr></tbody><table>"
+
+#         morphemic_analysis
+#         morphemic_gloss
+
+      end
+   end
+end
+
+Liquid::Template.register_filter(Jekyll::InterlinearGlossFilter)

data/_plugins/interlinear.rb

@@ -0,0 +1,37 @@
+# usage:
+# {% interlinear %}
+#    sentence in object lang
+#    sentence in object lang broken down into morphemes
+#    interlinear gloss of morphemes
+#    translation into target lang
+# {% endinterlinear %}
+
+module Jekyll
+   module Tags
+      class InterlinearGlossTag < Liquid::Block
+
+         require "shellwords"
+
+         # initialize is called when we encounter the {% interlinear %} Liquid tag; 'interlinear' is the tag name and anything immediately after it is passed in via the second argument
+         def initialize(tag_name, text, tokens)
+            super
+            @text = text.shellsplit # splits the input string into individual words
+            # @wordcount = @text[0].length # counts the number of words in the string
+
+            # object_lang, morphemic_analysis, morphemic_gloss, target_lang
+         end
+
+         def render(context)
+            "<table class=\"interlinear-gloss\">
+               <tbody>
+                  <tr>
+                     <td colspan=\"#{@wordcount}\">#{@text[0]}</td>
+                  </tr>" + "<tr><td>#{@text[1]}</td></tr><tr><td>#{@text[2]}</td></tr><tr><td>#{@text[3]}</td></tr></tbody></table>"
+         end
+
+      end
+   end
+end
+
+# The register_tag method takes two arguments: the user-facing name of the tag [interlinear], and the class that implements it [InterlinearGlossTag].
+Liquid::Template.register_tag("interlinear", Jekyll::Tags::InterlinearGlossTag)

data/_plugins/ipa.rb

@@ -0,0 +1,23 @@
+# usage: {% ipa /phonemic text/%}
+# usage: {% ipa [phonetic text]%}
+
+module Jekyll
+   module Tags
+      class RenderPhoneticTag < Liquid::Tag
+
+         # initialize is called when we encounter the {% ipa %} Liquid tag; 'ipa' is the tag name and anything immediately after it is passed in via the second argument
+         def initialize(tag_name, text, tokens)
+            super
+            @text = text
+         end
+
+         def render(context)
+            "<abbr class=\"gloss\" title=\"International Phonetic Alphabet\">IPA</abbr>: <span class=\"ipa\">#{@text}</span>"
+         end
+
+      end
+   end
+end
+
+# The register_tag method takes two arguments: the user-facing name of the tag [ipa], and the class that implements it [RenderPhoneticTag].
+Liquid::Template.register_tag("ipa", Jekyll::Tags::RenderPhoneticTag)

data/_plugins/lang.rb

@@ -0,0 +1,28 @@
+# usage: {% lang text[0] text[1]     text[2]%}
+# usage: {% lang ko      바이 괕 모    iced jelly dish%}
+# text[0] = language code
+# text[1] = the text, in latin script or not
+# text[2] = the translation into english
+
+module Jekyll
+   module Tags
+      class DefineLanguageTag < Liquid::Tag
+
+         require "shellwords"
+
+         # initialize is called when we encounter the {% lang %} Liquid tag; 'lang' is the tag name and anything immediately after it is passed in via the second argument
+         def initialize(tag_name, text, tokens)
+            super
+            @text = text.shellsplit
+         end
+
+         def render(context)
+            "<abbr class=\"gloss\" title=\"#{@text[0]}\">#{@text[0]}</abbr>: <strong>#{@text[1]}</strong> <em>#{@text[2]}</em>"
+         end
+
+      end
+   end
+end
+
+# The register_tag method takes two arguments: the user-facing name of the tag [lang], and the class that implements it [DefineLanguageTag].
+Liquid::Template.register_tag('lang', Jekyll::Tags::DefineLanguageTag)

data/_plugins/sidenote.rb

@@ -0,0 +1,24 @@
+# usage: {% sidenote %}
+
+module Jekyll
+   module Tags
+      class RenderSideNoteTag < Liquid::Tag
+
+         require "shellwords"
+
+         # initialize is called when we encounter the {% sidenote %} Liquid tag; 'sidenote' is the tag name and anything immediately after it is passed in via the second argument
+         def initialize(tag_name, text, tokens)
+            super
+            @text = text.shellsplit
+         end
+
+         def render(context)
+            "<label for='#{@text[0]}' class='margin-toggle sidenote-number'></label><input type='checkbox' id='#{@text[0]}' class='margin-toggle'/><span class='sidenote'>#{@text[1]} </span>"
+         end
+
+      end
+   end
+end
+
+# The register_tag method takes two arguments: the user-facing name of the tag [sidenote], and the class that implements it [RenderSideNoteTag].
+Liquid::Template.register_tag("sidenote", Jekyll::Tags::RenderSideNoteTag)

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.4
+  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
@@ -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