Skip to content

Commit 8a4fe0d

Browse files
author
Carsten Behring
committed
Merge remote-tracking branch 'upstream/main'
2 parents 965dc2c + b7be8b7 commit 8a4fe0d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+18411
-1166
lines changed

‎.devcontainer/Dockerfile

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
ARG BASE_IMAGE=temurin-21-tools-deps-jammy
2+
FROM clojure:${BASE_IMAGE}
3+
4+
ARG USERNAME=vscode
5+
ARG USER_UID=1000
6+
ARG USER_GID=$USER_UID
7+
8+
# Create the user
9+
RUN groupadd --gid $USER_GID $USERNAME \
10+
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
11+
#
12+
# [Optional] Add sudo support. Omit if you don't need to install software after connecting.
13+
&& apt-get update \
14+
&& apt-get install -y sudo \
15+
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
16+
&& chmod 0440 /etc/sudoers.d/$USERNAME
17+
18+
19+
# [Optional] Set the default user. Omit if you want to keep the default as root.
20+
USER $USERNAME
21+
SHELL ["/bin/bash", "-ec"]
22+
ENTRYPOINT ["bash"]
23+
24+
25+
# Prepare clojure tools
26+
RUN clojure -Ttools list && \
27+
clojure -Ttools install io.github.seancorfield/clj-new '{:git/tag "v1.2.404" :git/sha "d4a6508"}' :as clj-new && \
28+
clojure -Ttools install-latest :lib io.github.seancorfield/deps-new :as new && \
29+
clojure -Ttools list
30+
31+
RUN sudo apt-get update && \
32+
sudo apt-get install -y lsb-release

‎.devcontainer/devcontainer.json

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/scicloj/devcontainer-templates/tree/main/src/basecloj
3+
{
4+
"name": "Base clojure dev env",
5+
"build": {
6+
"dockerfile": "Dockerfile",
7+
"args": {
8+
"BASE_IMAGE": "temurin-21-tools-deps-jammy",
9+
"USERNAME": "${localEnv:USER}"
10+
}
11+
},
12+
"remoteUser": "${localEnv:USER}",
13+
"containerUser": "${localEnv:USER}",
14+
"features": {
15+
"ghcr.io/devcontainers/features/git:1": {},
16+
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {}
17+
},
18+
"customizations": {
19+
"vscode": {
20+
"extensions": [
21+
"betterthantomorrow.calva"
22+
]
23+
}
24+
}
25+
}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ clay_files
3636
*.qmd
3737
_quarto.yml
3838

39+
.clj-kondo

‎deps.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
org.scicloj/kindly {:mvn/version "4-beta14"}
33
org.scicloj/kindly-advice {:mvn/version "1-beta12"}
44
org.scicloj/kind-portal {:mvn/version "1-beta3"}
5-
org.scicloj/clay {:mvn/version "2-beta25"}
5+
org.scicloj/clay {:mvn/version "2-beta27"}
66
org.scicloj/noj {:mvn/version "2-alpha12.1"}}
77
:paths ["src" "notebooks"]}

‎docs/emmy_viewers.html

+744
Large diffs are not rendered by default.

‎docs/emmy_viewers_files/emmy-viewers10.css

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
.MafsView {
2+
display: block;
3+
background: var(--mafs-bg);
4+
overflow: hidden;
5+
-webkit-user-select: none;
6+
user-select: none;
7+
font-family: inherit;
8+
font-variant-numeric: tabular-nums;
9+
touch-action: none;
10+
outline: 0;
11+
12+
--mafs-bg: black;
13+
--mafs-fg: white;
14+
15+
--mafs-origin-color: var(--mafs-fg);
16+
--mafs-line-color: #555;
17+
--mafs-line-stroke-dash-style: 4, 3;
18+
--mafs-axis-stroke-width: 1px;
19+
--grid-line-subdivision-color: #222;
20+
21+
--mafs-red: #f11d0e;
22+
--mafs-orange: #f14e0e;
23+
--mafs-yellow: #ffe44a;
24+
--mafs-green: #15e272;
25+
--mafs-blue: #58a6ff;
26+
--mafs-indigo: #7c58ff;
27+
--mafs-violet: #ae58ff;
28+
--mafs-pink: #ee00ab;
29+
}
30+
31+
.MafsView text {
32+
fill: var(--mafs-fg);
33+
cursor: default;
34+
}
35+
36+
.MafsView path {
37+
stroke: var(--mafs-fg);
38+
}
39+
40+
.MafsView:focus-visible {
41+
border-radius: 5px;
42+
outline: 3px solid #58a6ff;
43+
}
44+
45+
@supports not selector(:focus-visible) {
46+
.MafsView:focus {
47+
border-radius: 5px;
48+
outline: 3px solid #58a6ff;
49+
}
50+
}
51+
52+
.mafs-shadow {
53+
paint-order: stroke;
54+
stroke-width: 3px;
55+
stroke: var(--mafs-bg);
56+
stroke-opacity: 0.75;
57+
stroke-linejoin: round;
58+
}
59+
60+
.mafs-movable-point {
61+
cursor: grab;
62+
touch-action: none;
63+
}
64+
65+
.mafs-movable-point-dragging {
66+
cursor: grabbing;
67+
}
68+
69+
.mafs-movable-point:focus {
70+
outline: 0;
71+
}
72+
73+
.mafs-movable-point * {
74+
fill: none;
75+
stroke: none;
76+
}
77+
78+
.mafs-movable-point-hitbox {
79+
fill: transparent;
80+
}
81+
82+
.mafs-movable-point-focus {
83+
stroke: var(--movable-point-color);
84+
stroke-width: 2;
85+
stroke-opacity: 0;
86+
fill: none;
87+
transition: stroke-opacity 0.2s ease;
88+
}
89+
90+
.mafs-movable-point-ring {
91+
fill: var(--movable-point-color);
92+
fill-opacity: 0.25;
93+
stroke: none;
94+
transition: r 0.2s ease;
95+
}
96+
97+
.mafs-movable-point-point {
98+
fill: var(--movable-point-color);
99+
transition: r 0.2s ease;
100+
}
101+
102+
/* Hover */
103+
104+
.mafs-movable-point:hover .mafs-movable-point-point,
105+
.mafs-movable-point:focus-visible .mafs-movable-point-point {
106+
r: calc(var(--movable-point-ring-size) - 2px);
107+
}
108+
109+
.mafs-movable-point:hover .mafs-movable-point-ring,
110+
.mafs-movable-point:focus-visible .mafs-movable-point-ring {
111+
r: calc(var(--movable-point-ring-size) + 3px);
112+
}
113+
114+
.mafs-movable-point.mafs-movable-point-dragging .mafs-movable-point-ring {
115+
r: var(--movable-point-ring-size);
116+
}
117+
118+
/* Focus */
119+
120+
.mafs-movable-point:focus-visible .mafs-movable-point-focus {
121+
stroke-opacity: 1;
122+
}

‎docs/emmy_viewers_files/emmy-viewers11.css

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@import "computer-modern/cmu-serif.css";
2+
3+
.MafsView {
4+
font-family: "CMU Serif", serif;
5+
}

0 commit comments

Comments
 (0)