Skip to content

Commit

Permalink
v4.1.4 and Hypercontext/legacy cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nfrasser committed Nov 19, 2024
1 parent 0f7090a commit 732682c
Show file tree
Hide file tree
Showing 19 changed files with 326 additions and 263 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
source "https://rubygems.org"

gem 'jekyll'
gem 'jekyll-coffeescript'
gem 'jekyll-sitemap'
73 changes: 41 additions & 32 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,70 +1,79 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
bigdecimal (3.1.8)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
colorator (1.1.0)
concurrent-ruby (1.1.8)
em-websocket (0.5.2)
concurrent-ruby (1.3.4)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
http_parser.rb (~> 0)
eventmachine (1.2.7)
execjs (2.7.0)
ffi (1.15.0)
execjs (2.10.0)
ffi (1.17.0)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (1.8.9)
google-protobuf (4.28.3)
bigdecimal
rake (>= 13)
http_parser.rb (0.8.0)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jekyll (4.2.0)
jekyll (4.3.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-coffeescript (2.0.0)
coffee-script (~> 2.2)
coffee-script-source (~> 1.12)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.3.1)
rexml
kramdown (2.5.1)
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.5.0)
liquid (4.0.4)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
public_suffix (6.0.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.3)
rouge (3.26.0)
rexml (3.3.9)
rouge (4.5.1)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.7.0)
sass-embedded (1.81.0)
google-protobuf (~> 4.28)
rake (>= 13)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.6.0)
webrick (1.9.0)

PLATFORMS
ruby
Expand All @@ -75,4 +84,4 @@ DEPENDENCIES
jekyll-sitemap

BUNDLED WITH
2.1.4
2.5.23
11 changes: 5 additions & 6 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
# Site settings
title: Linkify
email: info@hypercontext.com
website: hypercontext.com
websiteurl: https://hypercontext.com
email: info@example.com
website: nfrasser.com
websiteurl: https://nfrasser.com
description: > # this means to ignore newlines until "baseurl:"
Linkify is a JavaScript plugin. Use Linkify to find links in plain-text and
convert them to HTML &lt;a&gt; tags. It automatically highlights URLs,
#hashtags, @mentions and more.
url: "https://linkify.js.org" # the base hostname & protocol for your site
twitter_username: HypercontextApp
github_username: Hypercontext/linkifyjs
version: "4.1.3"
github_username: nfrasser/linkifyjs
version: "4.1.4"

# Build settings
markdown: kramdown
Expand Down
28 changes: 8 additions & 20 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,30 +1,18 @@
<footer class="site-footer py-5">
<div class="container text-center">
<ul class="social-media-list list-inline">
<li class="list-inline-item footer-icon mr-4">
<a href="{{ site.websiteurl }}" title="Hypercontext">
{% include icon-hypercontext.html %}
<span class="visually-hidden">Hypercontext</span>
</a>
</li>
{% if site.github_username %}
<li class="list-inline-item footer-icon">
<a href="https://github.com/{{ site.github_username }}" title="{{ site.github_username }} on GitHub">
<a
href="https://github.com/{{ site.github_username }}"
title="{{ site.github_username }} on GitHub"
>
{% include icon-github.html %}
<span class="visually-hidden">{{ site.github_username }} on GitHub</span>
</a>
</li>
{% endif %}

{% if site.twitter_username %}
<li class="list-inline-item footer-icon">
<a href="https://twitter.com/{{ site.twitter_username }}" title="@{{ site.twitter_username }} on Twitter">
{% include icon-twitter.html %}
<span class="visually-hidden">@{{ site.twitter_username }} on Twitter</span>
<span class="visually-hidden"
>{{ site.github_username }} on GitHub</span
>
</a>
</li>
{% endif %}
</ul>
<p>©{{ 'now' | date: "%Y" }} Hypercontext</p>
<p>©{{ 'now' | date: "%Y" }} Nick Frasser</p>
</div>
</footer>
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>{% if page.title %}{{ page.title }} · {% endif %}{{ site.title }}{%if page.showbyhypercontext %}: a JS plugin by Hypercontext{% endif %}</title>
<title>{% if page.title %}{{ page.title }} · {% endif %}{{ site.title }}{%if page.showsubtitle %}: a JavaScript plugin{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<link rel="apple-touch-icon" sizes="180x180" href="{{ site.baseurl }}/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="{{ site.baseurl }}/favicon-32x32.png">
Expand Down
12 changes: 7 additions & 5 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<header class="site-header container">
<h1 id="page-title" class="display-1">
<a href="{{ site.baseurl }}/" class="text-decoration-none fw-bold">Linkify</a>
{%if page.showbyhypercontext %}
<br>
<small class="display-6 mt-0">a JS plugin by <a href="{{ site.websiteurl }}">{% include hypercontext-logo.svg %}</a></small>
<a href="{{ site.baseurl }}/" class="text-decoration-none fw-bold">
Linkify
</a>
{%if page.showsubtitle %}
<br />
<small class="display-6 mt-0">a JavaScript plugin</small>
{% endif %}
</h1>
{%if layout.subtitle %}
<h2 id="page-subtitle" class="display-6 d-inline-block ms-3">
<h2 id="page-subtitle" class="display-6 d-inline-block">
{{ layout.subtitle }}
</h2>
{% endif %}
Expand Down
3 changes: 0 additions & 3 deletions _includes/hypercontext-logo.svg

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-hypercontext.html

This file was deleted.

66 changes: 42 additions & 24 deletions css/main.scss
Original file line number Diff line number Diff line change
@@ -1,49 +1,73 @@
---
---

@charset "utf-8";

@font-face {
font-family: 'Nunito Sans';
font-family: "Nunito Sans";
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(https://fonts.gstatic.com/s/nunitosans/v6/pe0qMImSLYBIv1o4X1M8cce9I9tAcVwo.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src:
local("Nunito Sans Regular"),
local("NunitoSans-Regular"),
url(https://fonts.gstatic.com/s/nunitosans/v6/pe0qMImSLYBIv1o4X1M8cce9I9tAcVwo.woff2)
format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Nunito Sans';
font-family: "Nunito Sans";
font-style: normal;
font-weight: 600;
font-display: swap;
src: local('Nunito Sans SemiBold'), local('NunitoSans-SemiBold'), url(https://fonts.gstatic.com/s/nunitosans/v6/pe03MImSLYBIv1o4X1M8cc9iB85tU1ECVZl_.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src:
local("Nunito Sans SemiBold"),
local("NunitoSans-SemiBold"),
url(https://fonts.gstatic.com/s/nunitosans/v6/pe03MImSLYBIv1o4X1M8cc9iB85tU1ECVZl_.woff2)
format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Poppins';
font-family: "Poppins";
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Poppins Regular'), local('Poppins-Regular'), url(https://fonts.gstatic.com/s/poppins/v13/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src:
local("Poppins Regular"),
local("Poppins-Regular"),
url(https://fonts.gstatic.com/s/poppins/v13/pxiEyp8kv8JHgFVrJJfecnFHGPc.woff2)
format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Poppins';
font-family: "Poppins";
font-style: normal;
font-weight: 700;
font-display: swap;
src: local('Poppins Bold'), local('Poppins-Bold'), url(https://fonts.gstatic.com/s/poppins/v13/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src:
local("Poppins Bold"),
local("Poppins-Bold"),
url(https://fonts.gstatic.com/s/poppins/v13/pxiByp8kv8JHgFVrLCz7Z1xlFd2JQEk.woff2)
format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}

// Our variables
$font-family-sans-serif: 'Nunito Sans', sans-serif;
$font-family-sans-serif: "Nunito Sans", sans-serif;
$headings-font-family: Poppins, Arial, sans-serif;
$font-family-monospace: Monaco, Consolas, "Courier New", monospace;
$font-weight-bold: 600;
$font-weight-bolder: 600;
$headings-font-weight: 700;


// Brand colours
$blue: #108cff;
$pink: #ffa2b2;
Expand Down Expand Up @@ -73,11 +97,13 @@ a {
}
}

.btn, .btn:hover {
.btn,
.btn:hover {
text-decoration: none;
}

.btn-primary, .btn-primary:hover {
.btn-primary,
.btn-primary:hover {
color: white;
}

Expand All @@ -91,14 +117,6 @@ a {
padding-bottom: 2em;
}

.hypercontext-logo {
display: inline;

path {
fill: var(--bs-dark);
}
}

#page-title {
line-height: 1;
}
Expand Down
2 changes: 1 addition & 1 deletion docs/linkifyjs.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ before invoking linkify for the first time.

**Caution:** The plugin development API is in its very early stages and only supports very basic plugins. Updated features, APIs, and docs are in progress.

Check out the sample [Hashtag plugin](https://github.com/Hypercontext/linkifyjs/blob/main/packages/linkify-plugin-hashtag/src/hashtag.js) for an example. Check out the [Keyword plugin](https://github.com/Hypercontext/linkifyjs/blob/main/packages/linkify-plugin-keyword/src/keyword.js) for more advanced usage.
Check out the sample [Hashtag plugin](https://github.com/mfrasser/linkifyjs/blob/main/packages/linkify-plugin-hashtag/src/hashtag.js) for an example. Check out the [Keyword plugin](https://github.com/nfrasser/linkifyjs/blob/main/packages/linkify-plugin-keyword/src/keyword.js) for more advanced usage.

### linkify.test _(str [, type])_

Expand Down
Loading

0 comments on commit 732682c

Please sign in to comment.