Skip to content

Commit f4f86a8

Browse files
Revert "🏗🔧:pre-empt our new dark theme #1131"
This reverts commit b15cc0e.
1 parent c99a891 commit f4f86a8

File tree

17 files changed

+82
-393
lines changed

17 files changed

+82
-393
lines changed

.rubocop.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

Gemfile

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,14 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'rubocop', require: false
6-
gem 'rubocop-rails-omakase', require: false, group: [ :development ]
5+
gem 'github-linguist', '~> 7.24'
76

8-
gem 'github-linguist'
9-
10-
gem 'jekyll'
11-
gem 'kramdown-parser-gfm'
7+
gem 'jekyll', '~> 4.3.0'
8+
gem 'kramdown-parser-gfm', '~> 1.1'
129

1310
group :jekyll_plugins do
1411
gem 'jekyll-redirect-from'
1512
gem 'jekyll-relative-links'
16-
gem 'jekyll-sitemap'
17-
gem 'jekyll-seo-tag'
18-
# gem 'jekyll-asset-path', git: 'https://github.com/OpenINF/openinf-jekyll-asset-path-plugin'
19-
# gem 'jekyll-assets', git: 'https://github.com/envygeeks/jekyll-assets'
2013
# gem 'jekyll-paginate-v2'
2114
# gem 'jekyll-auto-authors'
2215
end
@@ -30,7 +23,7 @@ gem 'dotenv'
3023

3124
gem 'rb-inotify'
3225

33-
# Dig out bundled core deps as we prep to begin Ruby 3.4.0 support.
26+
# Preparing for Ruby 3.4.0; these deps will no longer be present.
3427
gem 'csv'
3528
gem 'base64'
3629
gem 'bigdecimal'

Gemfile.lock

Lines changed: 4 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.1.3.2)
5-
base64
6-
bigdecimal
7-
concurrent-ruby (~> 1.0, >= 1.0.2)
8-
connection_pool (>= 2.2.5)
9-
drb
10-
i18n (>= 1.6, < 2)
11-
minitest (>= 5.1)
12-
mutex_m
13-
tzinfo (~> 2.0)
144
addressable (2.8.6)
155
public_suffix (>= 2.0.2, < 6.0)
16-
ast (2.4.2)
176
base64 (0.2.0)
187
bigdecimal (3.1.7)
198
cgi (0.4.1)
209
charlock_holmes (0.7.7)
2110
colorator (1.1.0)
2211
concurrent-ruby (1.2.3)
23-
connection_pool (2.4.1)
2412
csv (3.3.0)
2513
dotenv (3.1.0)
26-
drb (2.2.1)
2714
em-websocket (0.5.3)
2815
eventmachine (>= 0.12.9)
2916
http_parser.rb (~> 0)
@@ -72,76 +59,30 @@ GEM
7259
jekyll (>= 3.3, < 5.0)
7360
jekyll-sass-converter (3.0.0)
7461
sass-embedded (~> 1.54)
75-
jekyll-seo-tag (2.8.0)
76-
jekyll (>= 3.8, < 5.0)
77-
jekyll-sitemap (1.4.0)
78-
jekyll (>= 3.7, < 5.0)
7962
jekyll-watch (2.2.1)
8063
listen (~> 3.0)
81-
json (2.7.1)
8264
kramdown (2.4.0)
8365
rexml
8466
kramdown-parser-gfm (1.1.0)
8567
kramdown (~> 2.0)
86-
language_server-protocol (3.17.0.3)
8768
liquid (4.0.4)
8869
listen (3.9.0)
8970
rb-fsevent (~> 0.10, >= 0.10.3)
9071
rb-inotify (~> 0.9, >= 0.9.10)
9172
mercenary (0.4.0)
9273
mini_mime (1.1.5)
93-
minitest (5.22.3)
94-
mutex_m (0.2.0)
95-
parallel (1.24.0)
96-
parser (3.3.0.5)
97-
ast (~> 2.4.1)
98-
racc
9974
pathutil (0.16.2)
10075
forwardable-extended (~> 2.6)
10176
public_suffix (5.0.5)
10277
rake (13.2.1)
10378
rb-fsevent (0.11.2)
10479
rb-inotify (0.10.1)
10580
ffi (~> 1.0)
106-
regexp_parser (2.9.0)
10781
rexml (3.2.6)
10882
rouge (4.2.1)
109-
rubocop (1.62.1)
110-
json (~> 2.3)
111-
language_server-protocol (>= 3.17.0)
112-
parallel (~> 1.10)
113-
parser (>= 3.3.0.2)
114-
rainbow (>= 2.2.2, < 4.0)
115-
regexp_parser (>= 1.8, < 3.0)
116-
rexml (>= 3.2.5, < 4.0)
117-
rubocop-ast (>= 1.31.1, < 2.0)
118-
ruby-progressbar (~> 1.7)
119-
unicode-display_width (>= 2.4.0, < 3.0)
120-
rubocop-ast (1.31.2)
121-
parser (>= 3.3.0.4)
122-
rubocop-minitest (0.35.0)
123-
rubocop (>= 1.61, < 2.0)
124-
rubocop-ast (>= 1.31.1, < 2.0)
125-
rubocop-performance (1.20.2)
126-
rubocop (>= 1.48.1, < 2.0)
127-
rubocop-ast (>= 1.30.0, < 2.0)
128-
rubocop-rails (2.24.1)
129-
activesupport (>= 4.2.0)
130-
rack (>= 1.1)
131-
rubocop (>= 1.33.0, < 2.0)
132-
rubocop-ast (>= 1.31.1, < 2.0)
133-
rubocop-rails-omakase (1.0.0)
134-
rubocop
135-
rubocop-minitest
136-
rubocop-performance
137-
rubocop-rails
138-
ruby-progressbar (1.13.0)
13983
rugged (1.7.2)
14084
safe_yaml (1.0.5)
141-
sass-embedded (1.72.0)
142-
google-protobuf (>= 3.25, < 5.0)
143-
rake (>= 13.0.0)
144-
sass-embedded (1.72.0-aarch64-linux-android)
85+
sass-embedded (1.74.1-aarch64-linux-android)
14586
google-protobuf (>= 3.25, < 5.0)
14687
sass-embedded (1.74.1-aarch64-linux-gnu)
14788
google-protobuf (>= 3.25, < 5.0)
@@ -171,8 +112,6 @@ GEM
171112
google-protobuf (>= 3.25, < 5.0)
172113
terminal-table (3.0.2)
173114
unicode-display_width (>= 1.1.1, < 3)
174-
tzinfo (2.0.6)
175-
concurrent-ruby (~> 1.0)
176115
unicode-display_width (2.5.0)
177116
webrick (1.8.1)
178117
yaml-lint (0.1.2)
@@ -186,13 +125,11 @@ PLATFORMS
186125
arm-linux-gnueabihf
187126
arm-linux-musleabihf
188127
arm64-darwin
189-
ruby
190128
x86-linux
191129
x86-linux-android
192130
x86-linux-gnu
193131
x86-linux-musl
194132
x86_64-darwin
195-
x86_64-linux
196133
x86_64-linux-android
197134
x86_64-linux-gnu
198135
x86_64-linux-musl
@@ -202,16 +139,12 @@ DEPENDENCIES
202139
bigdecimal
203140
csv
204141
dotenv
205-
github-linguist
206-
jekyll
142+
github-linguist (~> 7.24)
143+
jekyll (~> 4.3.0)
207144
jekyll-redirect-from
208145
jekyll-relative-links
209-
jekyll-seo-tag
210-
jekyll-sitemap
211-
kramdown-parser-gfm
146+
kramdown-parser-gfm (~> 1.1)
212147
rb-inotify
213-
rubocop
214-
rubocop-rails-omakase
215148
webrick
216149
yaml-lint
217150

_config.yml

Lines changed: 30 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,72 @@
1-
---
1+
# Welcome to Jekyll!
2+
3+
# This master configuration file contains global configurations and variable
4+
# definitions that are meant for settings that affect the whole microsite with
5+
# values that are expected to be set up once and that rarely need to be edited
6+
# after that, which is why they are only read once at execution time.
7+
#
8+
# For technical reasons, changes made to this file are *NOT* reloaded
9+
# automatically during automatic regeneration when using 'jekyll serve'. If
10+
# you change this file, please restart the server process as changes are not
11+
# loaded until the next execution.
12+
#
13+
# Note: Data Files _are_ included and reloaded during automatic regeneration.
14+
#
15+
# Site personalization settings accessed in templates via {{ site.myvariable }}.
216
title: OpenINF
3-
4-
description: Aggregate, curate, disseminate, and apply information derived from
5-
diverse sources.
17+
18+
description: >-
19+
Aggregate, curate, disseminate, and apply information derived from diverse
20+
sources.
621
baseurl: ''
7-
url: https://open.inf.is
22+
url: 'https://open.inf.is'
823
twitter_username: OpenINF
924
github_username: OpenINF
1025
repository: OpenINF/openinf.github.io
1126

12-
# Site build settings
27+
# Site build settings.
1328
markdown: kramdown
1429
plugins:
1530
- jekyll-redirect-from
1631
- jekyll-relative-links
17-
- jekyll-sitemap
18-
- jekyll-seo-tag
19-
# - jekyll-asset-path
20-
# - jekyll-assets
21-
compress_html:
22-
clippings: all
23-
comments:
24-
- '<!-- '
25-
- ' -->'
26-
endings: all
27-
ignore:
28-
envs:
29-
- local
30-
blanklines: false
31-
profile: false
32-
startings:
33-
- html
34-
- head
35-
- body
3632

37-
## Content collections
38-
# @see https://jekyllrb.com/docs/collections
33+
# Document collections.
3934
collections_dir: collections
35+
4036
collections:
4137
authors:
4238
output: true
4339
docs:
44-
permalink: :collection/:path
40+
permalink: '/:collection/:path/'
4541
output: true
4642
posts:
47-
permalink: news/:year/:month/:day/:title
43+
permalink: '/news/:year/:month/:day/:title/'
4844
output: true
4945
defaults:
50-
- scope:
51-
path: ''
52-
type: pages
53-
values:
54-
##
55-
# @see https://github.com/OpenINF/openinf.github.io/blob/HEAD/_layouts/compress.html
56-
layout: compress
57-
locale: en
58-
- scope:
59-
path: _layouts
60-
type: pages
61-
values:
62-
##
63-
# @see https://github.com/OpenINF/openinf.github.io/blob/HEAD/_layouts/default.html
64-
layout: default
6546
- scope:
6647
path: _docs
6748
type: docs
6849
values:
69-
##
70-
# @see https://github.com/OpenINF/openinf.github.io/blob/HEAD/_layouts/docs.html
7150
layout: docs
72-
editable: true
73-
toc: true
74-
breadcrumbs: true
75-
body_classes:
76-
- hide-butterbar
7751
- scope:
7852
path: _posts
7953
type: posts
8054
values:
81-
##
82-
# @see https://github.com/OpenINF/openinf.github.io/blob/HEAD/_layouts/news_item.html
8355
layout: news_item
84-
editable: true
85-
toc: true
86-
breadcrumbs: true
87-
body_classes:
88-
- hide-butterbar
89-
sass:
90-
sass_dir: _sass
91-
style: compressed
92-
load_paths:
93-
- _includes/assets/scss
9456

95-
# Exclude from processing
57+
# Exclude from processing.
9658
exclude:
97-
- AUTHORS
9859
- build/
99-
- CNAME
10060
- Gemfile
10161
- Gemfile.lock
102-
- LICENSE
10362
- node_modules/
10463
- package.json
10564
- pnpm-lock.json
10665
- project-terms.txt
66+
- AUTHORS
67+
- CNAME
68+
- LICENSE
10769
- README.md
108-
- tmp/
10970
- tools/
71+
- tmp/
11072
- vendor/

_includes/head.html

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
crossorigin="anonymous" />
1313
<meta
1414
name="description"
15-
content="{{ site.description }}" />
15+
content="Aggregate, curate, disseminate, and apply information derived from diverse sources." />
1616
<link
1717
rel="stylesheet"
1818
href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css"
@@ -81,25 +81,9 @@
8181
{{ styles | scssify }}
8282
{% endif %}
8383
</style>
84-
{% if page.custom_css %}{% for stylesheet_hotlink in page.custom_css -%}
85-
<link rel="stylesheet" href="{{ stylesheet_hotlink }}">
86-
{%- endfor %}{% endif %}
87-
<meta name="format-detection" content="telephone=no">
88-
{% if post.status == 'unpublished' or page.status == 'unpublished' %}
89-
<meta name="robots" content="noindex, nofollow, noarchive">
90-
{% endif %}
91-
<title>{% if page.permalink == '/' %}{{ site.title }}{% else %}{{ page.title }} &middot; {{ site.title }}{% endif %}</title>
92-
<link rel="canonical" href="{{ site.url }}{{ page.url }}" />
93-
{% if page.permalink == '/' %}
94-
<script type="application/ld+json">
95-
{
96-
"@context": "http://schema.org",
97-
"@type": "WebSite",
98-
"license": "https://open.inf.is/license",
99-
"about": {
100-
"description": "{{ site.description }}"
101-
}
102-
}
103-
</script>
104-
{% endif %}
84+
<link rel="canonical" href="." />
85+
<title>
86+
{% if page.class != 'home' %}{{ page.title }} &middot; {% endif %}{{
87+
site.title }}
88+
</title>
10589
</head>

_layouts/default.html

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
---
2-
layout: compress
2+
editable: false
33
---
44

5-
<!DOCTYPE html>
6-
<html {% if page.locale.is_rtl %}dir="rtl" lang="ar"{% else %}dir="ltr" lang="{{ page.locale }}"{% endif %}>
7-
{%- include head.html -%}
5+
<!doctype html>
6+
<html lang="en">
7+
{%- include head.html -%}
88

9-
{%- assign classes = page.body_classes | join: " " | where: 'page.body_classes', empty -%}
10-
11-
<body vocab="http://schema.org/" typeof="WebPage" id="top"{% if classes %} class="{{- classes -}}"{% endif %}>
12-
{%- include header.html -%} {{- content -}} {%- include footer.html -%}
13-
</body>
9+
<body class="{{ page.class }}">
10+
{%- include header.html -%} {{- content -}} {%- include footer.html -%}
11+
</body>
1412
</html>

0 commit comments

Comments
 (0)