Skip to content

Commit bc5f989

Browse files
committed
Update bundle again, update ruby, update just-the-docs and improve syntax-coloring
1 parent 6e77dd9 commit bc5f989

File tree

6 files changed

+86
-39
lines changed

6 files changed

+86
-39
lines changed

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup Ruby
2929
uses: ruby/setup-ruby@v1
3030
with:
31-
ruby-version: '3.1' # Not needed with a .ruby-version file
31+
ruby-version: '3.2.3' # Not needed with a .ruby-version file
3232
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
3333
cache-version: 0 # Increment this number if you need to re-download cached gems
3434
- name: Setup Pages

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ source 'https://rubygems.org'
33
gem "jekyll", "~> 4.3" # installed by `gem jekyll`
44
# gem "webrick" # required when using Ruby >= 3 and Jekyll <= 4.2.2
55

6-
gem "just-the-docs", "0.4.1" # pinned to the current release
6+
gem "just-the-docs", "0.10.1" # pinned to the current release
77
# gem "just-the-docs" # always download the latest release

Gemfile.lock

Lines changed: 55 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,101 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
5-
public_suffix (>= 2.0.2, < 6.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
base64 (0.3.0)
7+
bigdecimal (3.2.2)
68
colorator (1.1.0)
7-
concurrent-ruby (1.1.10)
9+
concurrent-ruby (1.3.5)
10+
csv (3.3.5)
811
em-websocket (0.5.3)
912
eventmachine (>= 0.12.9)
1013
http_parser.rb (~> 0)
1114
eventmachine (1.2.7)
12-
ffi (1.15.5)
13-
ffi (1.15.5-x64-mingw-ucrt)
15+
ffi (1.17.2-arm64-darwin)
16+
ffi (1.17.2-x64-mingw-ucrt)
17+
ffi (1.17.2-x86_64-darwin)
18+
ffi (1.17.2-x86_64-linux-gnu)
1419
forwardable-extended (2.6.0)
20+
google-protobuf (4.31.1-arm64-darwin)
21+
bigdecimal
22+
rake (>= 13)
23+
google-protobuf (4.31.1-x64-mingw-ucrt)
24+
bigdecimal
25+
rake (>= 13)
26+
google-protobuf (4.31.1-x86_64-darwin)
27+
bigdecimal
28+
rake (>= 13)
29+
google-protobuf (4.31.1-x86_64-linux-gnu)
30+
bigdecimal
31+
rake (>= 13)
1532
http_parser.rb (0.8.0)
16-
i18n (1.12.0)
33+
i18n (1.14.7)
1734
concurrent-ruby (~> 1.0)
18-
jekyll (4.3.0)
35+
jekyll (4.4.1)
1936
addressable (~> 2.4)
37+
base64 (~> 0.2)
2038
colorator (~> 1.0)
39+
csv (~> 3.0)
2140
em-websocket (~> 0.5)
2241
i18n (~> 1.0)
2342
jekyll-sass-converter (>= 2.0, < 4.0)
2443
jekyll-watch (~> 2.0)
44+
json (~> 2.6)
2545
kramdown (~> 2.3, >= 2.3.1)
2646
kramdown-parser-gfm (~> 1.0)
2747
liquid (~> 4.0)
28-
mercenary (>= 0.3.6, < 0.5)
48+
mercenary (~> 0.3, >= 0.3.6)
2949
pathutil (~> 0.9)
3050
rouge (>= 3.0, < 5.0)
3151
safe_yaml (~> 1.0)
3252
terminal-table (>= 1.8, < 4.0)
3353
webrick (~> 1.7)
34-
jekyll-sass-converter (2.2.0)
35-
sassc (> 2.0.1, < 3.0)
54+
jekyll-include-cache (0.2.1)
55+
jekyll (>= 3.7, < 5.0)
56+
jekyll-sass-converter (3.1.0)
57+
sass-embedded (~> 1.75)
3658
jekyll-seo-tag (2.8.0)
3759
jekyll (>= 3.8, < 5.0)
3860
jekyll-watch (2.2.1)
3961
listen (~> 3.0)
40-
just-the-docs (0.4.1)
62+
json (2.13.2)
63+
just-the-docs (0.10.1)
4164
jekyll (>= 3.8.5)
65+
jekyll-include-cache
4266
jekyll-seo-tag (>= 2.0)
4367
rake (>= 12.3.1)
44-
kramdown (2.4.0)
45-
rexml
68+
kramdown (2.5.1)
69+
rexml (>= 3.3.9)
4670
kramdown-parser-gfm (1.1.0)
4771
kramdown (~> 2.0)
48-
liquid (4.0.3)
49-
listen (3.7.1)
72+
liquid (4.0.4)
73+
listen (3.9.0)
5074
rb-fsevent (~> 0.10, >= 0.10.3)
5175
rb-inotify (~> 0.9, >= 0.9.10)
5276
mercenary (0.4.0)
5377
pathutil (0.16.2)
5478
forwardable-extended (~> 2.6)
55-
public_suffix (5.0.0)
56-
rake (13.0.6)
79+
public_suffix (6.0.2)
80+
rake (13.3.0)
5781
rb-fsevent (0.11.2)
58-
rb-inotify (0.10.1)
82+
rb-inotify (0.11.1)
5983
ffi (~> 1.0)
60-
rexml (3.3.9)
61-
rouge (4.0.0)
84+
rexml (3.4.1)
85+
rouge (4.6.0)
6286
safe_yaml (1.0.5)
63-
sassc (2.4.0)
64-
ffi (~> 1.9)
87+
sass-embedded (1.89.2-arm64-darwin)
88+
google-protobuf (~> 4.31)
89+
sass-embedded (1.89.2-x64-mingw-ucrt)
90+
google-protobuf (~> 4.31)
91+
sass-embedded (1.89.2-x86_64-darwin)
92+
google-protobuf (~> 4.31)
93+
sass-embedded (1.89.2-x86_64-linux-gnu)
94+
google-protobuf (~> 4.31)
6595
terminal-table (3.0.2)
6696
unicode-display_width (>= 1.1.1, < 3)
67-
unicode-display_width (2.3.0)
68-
webrick (1.8.2)
97+
unicode-display_width (2.6.0)
98+
webrick (1.9.1)
6999

70100
PLATFORMS
71101
arm64-darwin-21
@@ -75,7 +105,7 @@ PLATFORMS
75105

76106
DEPENDENCIES
77107
jekyll (~> 4.3)
78-
just-the-docs (= 0.4.1)
108+
just-the-docs (= 0.10.1)
79109

80110
BUNDLED WITH
81111
2.3.9

_config.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,8 @@ gh_edit_branch: "master"
1818
gh_edit_view_mode: "edit"
1919

2020
exclude:
21-
- .idea/
21+
- .idea/
22+
23+
sass:
24+
quiet_deps: true # https://github.com/just-the-docs/just-the-docs/issues/1541
25+
silence_deprecations: ['import'] # https://github.com/just-the-docs/just-the-docs/issues/1607

_sass/custom/custom.scss

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,27 @@ a {
2828
.highlight {
2929
line-height: 0.75em;
3030

31-
.na, .nl, .nx {
31+
background-color: #111;
32+
33+
pre {
34+
background-color: unset;
35+
}
36+
37+
code, .err, .na, .nl, .nx, .nc, .k, .kn {
3238
color: $grey-lt-300;
39+
background-color: unset;
3340
}
34-
.c1 {
41+
.c, .c1 {
42+
color: $grey-dk-100;
43+
}
44+
.p, .se {
3545
color: $grey-dk-000;
3646
}
37-
.dl {
38-
color: #2aa198;
47+
.n, .s, .s2, .sr, .ss, .si, .nb {
48+
color: #a1ceff;
49+
}
50+
.kc, .mi, .mf, .nv {
51+
color: $blue-000;
3952
}
4053
}
4154

wiki/customization/Markers.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ All markers are grouped into marker-sets. A marker set will be visible in the me
2323
enabled or disabled at once.
2424

2525
Here is an example config for a marker-set:
26-
```yaml
26+
```hocon
2727
example-marker-set: {
2828
label: "Example Marker Set"
2929
toggleable: true
@@ -62,7 +62,7 @@ it shows its label.
6262
![qLZpKw97EU](https://user-images.githubusercontent.com/10765470/211083198-93d034fc-9d6b-4ee9-aef2-08db0958c1ee.png)
6363

6464
Here is an example config for a POI marker:
65-
```yaml
65+
```hocon
6666
example-poi-marker: {
6767
type: "poi"
6868
position: { x: 1, y: 64, z: -23 }
@@ -100,7 +100,7 @@ any image, a button or even ... embed a video ;D.
100100
![ESQgDvgzHg](https://user-images.githubusercontent.com/10765470/211083264-ca89c1b5-0051-4a82-af45-d9ebec9e9c35.png)
101101

102102
Here is an example config for a HTML Marker:
103-
```yaml
103+
```hocon
104104
example-html-marker: {
105105
type: "html"
106106
position: { x: 1, y: 64, z: -23 }
@@ -132,7 +132,7 @@ marker's `detail`.
132132
![dIZ7W6zjG2](https://user-images.githubusercontent.com/10765470/211083298-0116588c-15c8-4e84-8690-1a2936ae5c0c.png)
133133

134134
Here is an example config for a Line Marker:
135-
```yaml
135+
```hocon
136136
example-line-marker: {
137137
type: "line"
138138
position: { x: 1, y: 64, z: -25 }
@@ -179,7 +179,7 @@ If you click on the shape, it shows the marker's `detail`.
179179
![xDcmgynWv7](https://user-images.githubusercontent.com/10765470/211083324-04829ca3-515b-4b6b-8223-c9edaffbd07a.png)
180180

181181
Here is an example config for a Shape Marker:
182-
```yaml
182+
```hocon
183183
example-shape-marker: {
184184
type: "shape"
185185
position: { x: 1, y: 64, z: -23 }
@@ -228,7 +228,7 @@ areas that are limited to specific y-positions.
228228
![SqRL5ouEDS](https://user-images.githubusercontent.com/10765470/211083342-211b5d8b-81a3-407f-849b-af555707b85d.png)
229229

230230
Here is an example config for a Extrude Marker:
231-
```yaml
231+
```hocon
232232
example-extrude-marker: {
233233
type: "extrude"
234234
position: { x: 1, y: 64, z: -23 }
@@ -276,7 +276,7 @@ example-extrude-marker: {
276276

277277
Here is a full example of how it could look like in (at the end of) your map-config:
278278

279-
```yaml
279+
```hocon
280280
# Here you can define any static marker-sets with markers that should be displayed on the map.
281281
# You can change this at any time.
282282
# If you need dynamic markers, you can use any plugin that integrates with BlueMap's API.

0 commit comments

Comments
 (0)