Skip to content

Commit 1477c3e

Browse files
committed
Merge branch 'develop'
2 parents 990da58 + 39b5843 commit 1477c3e

File tree

100 files changed

+2989
-2160
lines changed

Some content is hidden

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

100 files changed

+2989
-2160
lines changed

.github/workflows/publish.yml

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,12 @@ jobs:
1818
contents: read
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

23-
- name: Build image
24-
run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
25-
26-
- name: Log in to registry
27-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
28-
29-
- name: Push image
23+
- name: Set up outputs
24+
id: vars
3025
run: |
3126
IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
32-
3327
# Change all uppercase to lowercase
3428
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
3529
# Strip git ref prefix from version
@@ -38,7 +32,26 @@ jobs:
3832
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
3933
# Use Docker `latest` tag convention
4034
[ "$VERSION" == "main" ] && VERSION=latest
41-
echo IMAGE_ID=$IMAGE_ID
42-
echo VERSION=$VERSION
43-
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
44-
docker push $IMAGE_ID:$VERSION
35+
echo IMAGE_ID=$IMAGE_ID >> $GITHUB_OUTPUT
36+
echo VERSION=$VERSION >> $GITHUB_OUTPUT
37+
38+
- name: Set up Docker Buildx
39+
uses: docker/setup-buildx-action@v3
40+
41+
- name: Login to GitHub Container Registry
42+
uses: docker/login-action@v3
43+
with:
44+
registry: ghcr.io
45+
username: ${{ github.actor }}
46+
password: ${{ secrets.GITHUB_TOKEN }}
47+
48+
- name: Build image
49+
uses: docker/build-push-action@v5
50+
with:
51+
context: .
52+
push: true
53+
tags: ${{ steps.vars.outputs.IMAGE_ID }}:${{ steps.vars.outputs.VERSION }}
54+
labels: runnumber=${{ github.run_id }}
55+
cache-from: type=gha
56+
cache-to: type=gha,mode=max
57+
platforms: linux/amd64,linux/arm64

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ npm-debug.log
4747
.iex-history
4848
.m2
4949
.projectile
50+
.direnv
5051
/.vagrant
5152
/config/custom.exs
5253
/priv/native

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ARG ELIXIR_VERSION=1.14.3
88
FROM docker.io/hexpm/elixir:${ELIXIR_VERSION}-erlang-${ERLANG_OTP_VERSION}-alpine-${ALPINE_VERSION} as builder
99

1010
ARG MIX_ENV=prod
11+
ENV ERL_FLAGS="+JPperf true"
1112

1213
WORKDIR /opt/app
1314

assets/css/_recording_card.scss

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
div.asciicast-card {
22
margin-bottom: 30px;
33
overflow: hidden;
4+
border: 1px solid #eee;
45

56
.thumbnail-link {
67
display: block;
@@ -31,6 +32,7 @@ div.asciicast-card {
3132
width: 4rem;
3233
margin-left: -2rem;
3334
margin-top: -2rem;
35+
filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 0.4));
3436
}
3537
}
3638
}
@@ -53,28 +55,24 @@ div.asciicast-card {
5355
}
5456

5557
.thumbnail {
58+
min-height: calc(1.333333 * 16em);
59+
font-size: 14px;
60+
font-family: Consolas, Menlo, 'Bitstream Vera Sans Mono', monospace, 'Powerline Symbols';
61+
overflow: hidden;
5662
padding: 0;
5763
background-color: #000;
58-
border: 0;
5964
border-radius: 3px;
6065
border-bottom-left-radius: 0;
6166
border-bottom-right-radius: 0;
62-
63-
.ap-terminal {
64-
.ap-line {
65-
height: 1.3333333333em;
66-
}
67-
}
6867
}
6968

7069
.info {
7170
background-color: #fff;
7271
padding: 10px;
7372
border-bottom-left-radius: 3px;
7473
border-bottom-right-radius: 3px;
75-
border: 1px solid #eee;
7674
border-bottom: 1px solid #ddd;
77-
border-top-width: 0;
75+
border-top: 1px solid #eee;
7876

7977
.author-avatar {
8078
float: left;

assets/css/_recording_list.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.c-recording {
2-
&.a-category {
2+
&.a-public, &.a-featured, &.a-auto {
33
main {
44
.nav {
55
.nav-link {
@@ -18,6 +18,10 @@
1818
margin-right: 0.5rem;
1919
font-size: 0.875rem;
2020
}
21+
22+
a {
23+
border-color: #d3d9df;
24+
}
2125
}
2226

2327
.pagination {

assets/css/_user_edit.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
.c-user.a-edit {
22
.user-form {
3-
margin-bottom: 3em;
3+
form {
4+
margin-bottom: 2em;
5+
}
6+
}
7+
8+
.install-ids {
9+
margin: 2em 0;
10+
11+
.revoked {
12+
opacity: 0.7;
13+
}
414
}
515
}

0 commit comments

Comments
 (0)