programming-pages 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a6b1a9b591c42fda5c74b677f67f7453cded99ce3f651a71c6f412c2005f70a
-  data.tar.gz: 3c1ce1126a5955d15147187b0d28941871d93f6412deec20c3186366743cc82d
+  metadata.gz: d57b487009256e4b0e49d71617734cf316bfa4f5704a89c3cf1171ef13b62720
+  data.tar.gz: 663ae09708451c5dda16b720ff4ede925502f186104dd38a07d6325a6486f4a9
 SHA512:
-  metadata.gz: 05772c1a109ea8a40f0b23f9918ba68e6f588379384942406df74a878ba6afe7df6600caceae6224060ba5b9d9a8b0f078d004b7e7393279b851a2be93a4f0e5
-  data.tar.gz: d260e088c3d649b4110af0a517ac9cb5f75b74034ece0ff5226b1c88b4aac1e868b67e91ead5dad9215073ff50162d6e04768d6eeeb890c312bccd9a56f6f7fe
+  metadata.gz: 7e018ffd284f4e54e37410a202e1e785e379aa9a2fc15977b7e00c801490ec821adb0578733bc41d452ea82111b412aeb57c0df9be5417ed58096d30409b6364
+  data.tar.gz: 55a2609e7492ffb36adf12d142ab3ce533229f98e0f4e2824bd2079ad33237bd508ab79c7a0f2a1abbe745066fd75a44f69b35fa750109ff0374dcb127397625

data/_includes/elements/indices.html

@@ -1,11 +1,3 @@
-<div class="ui inverted large menu">
-<div class="item" style="padding-top: 1.6em;">
-{% include elements/search.html %}
-</div>
-</div>
-
-<div class="ui fitted inverted divider"></div>
-
 {% assign collection_list = site.collections %}
 
 {% assign ordered = '' | split: '' %}
@@ -25,13 +17,6 @@
 {% assign endered = endered | sort: 'tab-order' | reverse %}
 {% assign collection_list = ordered | concat: unorder | concat: endered %}
 
-<div id="collection-tabs" class="ui inverted stackable pointing secondary menu">
-{% for collection in collection_list %}
-{% capture tab_class %}{% if forloop.first %}active {% endif %}item{% endcapture %}
-  <a class="{{ tab_class }}" data-tab="{{ collection.label | downcase }}">{{ collection.title }}</a>
-{% endfor %}
-</div>
-
 {% for collection in collection_list %}
 {% capture tab_class %}ui {% if forloop.first %}active {% endif %}inverted tab segment{% endcapture %}
 <div class="{{ tab_class }}" data-tab="{{ collection.label | downcase }}">
@@ -212,3 +197,19 @@ so our strategy is to:
 &nbsp;<br>
 </div>
 {% endfor %}
+
+
+{%- comment %} these fixed items (search & collection tabs) need to be above the tab segments {% endcomment -%}
+
+<div id="collection-tabs" class="ui inverted stackable pointing secondary fixed menu">
+{% for collection in collection_list %}
+{% capture tab_class %}{% if forloop.first %}active {% endif %}item{% endcapture %}
+  <a class="{{ tab_class }}" data-tab="{{ collection.label | downcase }}">{{ collection.title }}</a>
+{% endfor %}
+</div>
+
+<div class="ui inverted large fixed menu">
+<div class="item">
+{% include elements/search.html %}
+</div>
+</div>

data/_includes/scripts/indices.js

@@ -3,7 +3,7 @@ set_indices_scrolltop = function() {
   var active_item = $('#active-page-index').first();
   if (active_item.length < 1) return;
 
-  var y = active_item.position().top;
+  var y = active_item.position().top - 50; {% comment %} an arbitrary amount below the collection-tabs element {% endcomment %}
   $('#sidebar-fixed').scrollTop(y);
 }
 

data/_includes/scripts/search.js

@@ -1,23 +1,41 @@
+{% capture NL %}
+{% endcapture%}
+
+{% assign searchable_docs = site.pages | concat: site.documents | where_exp:'it','it.title.size > 0' %}
+
 site_search_init = function() {
   var search_content = [
-  {% for collection in site.collections %}
-  {% unless collection.label == 'posts' %}
-  {% for doc in collection.docs %}
-    {% capture url %}{{ doc.url }}#/{{ collection.label | downcase }}/{% endcapture %}
-    { title: '{{ doc.title }}', url: '{{ site.baseurl }}{{ url }}' },
-  {% endfor %}
-  {% endunless %}
+  {% for doc in searchable_docs %}
+    {% assign collection = doc.collection %}
+    {% if collection == 'posts' %}{% continue %}{% endif %}
+    {% assign url = doc.url %}{% if collection.size > 0 %}{% capture url %}{{ doc.url }}#/{{ collection | downcase }}/{% endcapture %}{% endif %}
+    {% assign title = doc.title | default: doc.name %}
+    {% assign category = doc.category | default: collection | default: '?' %}
+    {% assign tags = doc.search_tags %}
+    {% assign description = doc.description %}
+    {% comment %} placing string values in single quotes, so need to escape any within the string {% endcomment %}
+    {% if title == "'" %}{% assign title = "\'" %} {% comment %} allow title to be single char, assume other fields are not {% endcomment %}
+    {% elsif title contains "'" %}{% assign title = title | split: "'" | join: "\'" %}
+    {% endif %}
+    {% if tags contains "'" %}{% assign tags = tags | split: "'" | join: "\'" %}{% endif %}
+    {% if description.size > 0 %}{% assign description = description | split: NL | first | truncatewords: 7 | markdownify | rstrip %}{% endif %}
+    {% if description contains "'" %}{% assign description = description | split: "'" | join: "\'" %}{% endif %}
+    {% capture tags %}{% if tags.size > 0 %}, tags: '{{ tags }}'{% endif %}{% endcapture %}
+    {% capture desc %}{% if description.size > 0 %}, description: '{{ description }}'{% endif %}{% endcapture %}
+    { title: '{{ title }}', category: '{{ category }}'{{ tags }}{{ desc }}, url: '{{ site.baseurl }}{{ url }}' },
   {% endfor %}
   ];
 
   {% comment %} urls are auto-followed, so no callback needed {% endcomment %}
   $('#site-search').search({
+    type: 'category',
     source: search_content,
+    searchFields: [ 'title', 'tags', 'category', 'description' ],
     selectFirstResult: true,
   });
 
   {% comment %} set up shortut key for search input focus {% endcomment %}
-  Mousetrap.bind('s', function() { $( '#site-search .prompt' ).focus(); return false; });
+  Mousetrap.bind('s', function() { $('#site-search .prompt').focus(); return false; });
 };
 
 $(site_search_init);

data/_includes/styles/kbd.css

@@ -0,0 +1,20 @@
+/*!
+* Remixed from StackOverflow <kbd> css, user Jin
+* https://meta.superuser.com/questions/4788/css-for-the-new-kbd-style
+* https://creativecommons.org/licenses/by-sa/3.0/
+*/
+kbd {
+  background-color: #f7f7f7;
+  border-radius: 3px;
+  border: 1px solid #ccc;
+  box-shadow: 0 1px 0 rgba(0,0,0,0.2),0 0 0 2px #fff inset;
+  color: #333;
+  display: inline-block;
+  font-family: Arial,Helvetica,sans-serif;
+  font-size: 75%;
+  line-height: 140%;
+  margin: 0 .1em;
+  padding: .1em .6em;
+  text-shadow: 0 1px 0 #fff;
+  user-select: none;
+}

data/_includes/styles/tweaks.css

@@ -111,6 +111,41 @@ sup:target::before {
   font-size: /* 10 - 14px */ calc(10px + 4 * ((100vw - 320px) / (1910 - 320)));
 }
 
+/* add space underneath indices so bottom-most item can scroll into view */
+#collection-indices {
+  padding-bottom: 75vh;
+}
+#collection-indices .ui.large.fixed.menu .item {
+  padding-top: 1.4em;
+}
+
+/* for sidebar fixed, keep search and tabs fixed at top */
+#sidebar-fixed #collection-indices .ui.large.fixed.menu {
+  top: 3.5rem;
+}
+#sidebar-fixed #collection-indices .ui.tab.segment {
+  top: 5rem;
+  margin-top: 0;
+}
+#sidebar-fixed #collection-tabs {
+  top: 5.5rem;
+  background-color: #1b1c1d; /* FIXME: this should pull the semantic sass variable for inverted backgrounds: @black */
+}
+
+/* for sidebar retractable, items still need to be positioned, since they've been fixed */
+/* FIXME: this is clunky and brittle */
+#sidebar-retractable #collection-indices .ui.large.fixed.menu {
+  top: 0;
+}
+#sidebar-retractable #collection-indices .ui.tab.segment {
+  top: 8.5rem; /* TODO: use liquid to make this {{ num_collections*2.5+1 }}; */
+  margin-top: 0;
+}
+#sidebar-retractable #collection-tabs {
+  top: 2.5rem;
+  background-color: rgba(255,255,255,.08); /* FIXME: this should pull the semantic sass variable for .ui.inverted.menu a.item:hover: @invertedHoverBackground */
+}
+
 /* tweaks to existing semantic-ui rules */
 #sidebar-retractable.ui.push.sidebar {
   z-index: 100; /* underneath top fixed menu */
@@ -167,7 +202,7 @@ blockquote {
 blockquote p {
   display: inline;
 }
-code, kbd, pre, samp {
+code, pre, samp {
   font-family: Consolas,'Lucida Console','Andale Mono',monospace;
 }
 code.highlighter-rouge {

data/_layouts/layout.html

@@ -27,7 +27,7 @@ layout: page
 {% endif %}
 
 <div class="ui basic segment"><span class="anchor" id="description">&nbsp;</span>
-  {% assign lines = page.description | split: newline %}
+  {% assign lines = page.description | newline_to_br | split: '<br />' %}
   <p class="larger text">
   {{ lines.first | markdownify | remove: '<p>' | remove: '</p>' }}
   </p>

data/_layouts/page.html

@@ -1,6 +1,6 @@
 ---
 layout: base
-theme_version: 0.5.12
+theme_version: 0.5.13
 theme_url: https://github.com/pixeldroid/programming-pages
 ---
 

data/assets/site.css

@@ -30,6 +30,7 @@ layout: compress
 {% include styles/semantic-ui/transition.min.css %}
 
 {% capture _css %}
+{% include styles/kbd.css %}
 {% include styles/svg-icons.css %}
 {% include styles/tweaks.css %}
 {% include themes/syntax.css %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: programming-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - pixeldroid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-27 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-pages
@@ -92,6 +92,7 @@ files:
 - _includes/scripts/semantic-ui/sticky.min.js
 - _includes/scripts/semantic-ui/tab.min.js
 - _includes/scripts/semantic-ui/transition.min.js
+- _includes/styles/kbd.css
 - _includes/styles/semantic-ui/_version.css
 - _includes/styles/semantic-ui/breadcrumb.min.css
 - _includes/styles/semantic-ui/container.min.css