Skip to content

Commit 21c312c

Browse files
committed
Merge branch 'develop'
2 parents 73a5b5f + f81623d commit 21c312c

File tree

236 files changed

+8653
-3457
lines changed

Some content is hidden

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

236 files changed

+8653
-3457
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Forum
4+
url: https://discourse.asciinema.org/
5+
about: Ideas, feature requests, help requests, questions and general discussions should be posted here.
6+
- name: GitHub discussions
7+
url: https://github.com/orgs/asciinema/discussions
8+
about: Ideas, feature requests, help requests, questions and general discussions should be posted here.

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212

1313
jobs:
1414
publish:
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
permissions:
1717
packages: write
1818
contents: read

.github/workflows/test.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ on:
1111
- main
1212

1313
env:
14-
otp: '25.2.2'
15-
elixir: '1.14.3'
14+
otp: '26.2.5.7'
15+
elixir: '1.18.2'
1616
node: '18.x'
17-
rust: '1.71.0'
17+
rust: '1.83.0'
1818

1919
jobs:
2020
test:
21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222

2323
services:
2424
postgres:
@@ -57,12 +57,10 @@ jobs:
5757
- name: Cache Mix
5858
uses: actions/cache@v3
5959
with:
60-
path: |
61-
deps
62-
_build
63-
key: ${{ runner.os }}-mix-${{ env.elixir }}-${{ env.otp }}-${{ hashFiles('**/mix.lock') }}
60+
path: deps
61+
key: ${{ runner.os }}-mix-${{ env.elixir }}-${{ env.otp }}-${{ env.rust }}-${{ hashFiles('**/mix.lock') }}
6462
restore-keys: |
65-
${{ runner.os }}-mix-${{ env.elixir }}-${{ env.otp }}-
63+
${{ runner.os }}-mix-${{ env.elixir }}-${{ env.otp }}-${{ env.rust }}-
6664
- name: Cache npm dependencies
6765
uses: actions/cache@v3
6866
with:
@@ -78,7 +76,7 @@ jobs:
7876
~/.cargo
7977
key: ${{ runner.os }}-rust-${{ env.rust }}-${{ hashFiles('**/Cargo.lock') }}
8078
restore-keys: |
81-
${{ runner.os }}-rust-
79+
${{ runner.os }}-rust-${{ env.rust }}-
8280
- name: Install mix dependencies
8381
run: mix deps.get
8482
- name: Check formatting

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
erlang 25.2.2
2-
elixir 1.14.3-otp-25
1+
erlang 26.2.5.7
2+
elixir 1.18.2-otp-26
33
nodejs 18.14.0

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ARG ALPINE_VERSION=3.18.0
2-
ARG ERLANG_OTP_VERSION=25.2.2
3-
ARG ELIXIR_VERSION=1.14.3
1+
ARG ALPINE_VERSION=3.21.2
2+
ARG ERLANG_OTP_VERSION=26.2.5.7
3+
ARG ELIXIR_VERSION=1.18.2
44

55
## Release building image
66

77
# https://github.com/hexpm/bob#docker-images
8-
FROM docker.io/hexpm/elixir:${ELIXIR_VERSION}-erlang-${ERLANG_OTP_VERSION}-alpine-${ALPINE_VERSION} as builder
8+
FROM docker.io/hexpm/elixir:${ELIXIR_VERSION}-erlang-${ERLANG_OTP_VERSION}-alpine-${ALPINE_VERSION} AS builder
99

1010
ARG VERSION
1111
ARG MIX_ENV=prod

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Notable features:
3535
- easy [embedding](https://docs.asciinema.org/manual/server/embedding/) of the
3636
player, or linking via preview images (SVG),
3737
- privacy friendly - no tracking, no ads,
38-
- visibility control for recordings: unlisted (secret) or public,
38+
- visibility control for recordings: private, unlisted, or public,
3939
- editable recording metadata like title or long description (Markdown),
4040
- configurable terminal themes and font families,
4141
- ability to download plain text version (`.txt`) of a recording.

assets/css/_base.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ body, main {
7474
background-color: #f7f7f7;
7575
}
7676

77-
.c-page, .c-recording, .c-live-stream {
77+
.c-page, .c-recording, .c-stream {
7878
main {
7979
h1, h2, h3 {
8080
margin-top: 2rem;
@@ -101,7 +101,6 @@ body, main {
101101

102102
section.cinema {
103103
color: #fff;
104-
background-color: #222;
105104
padding: calc(min(4vh, 4vw)) 0;
106105
}
107106

@@ -162,6 +161,10 @@ form {
162161
.visibility-radios {
163162
padding-top: 0.375rem;
164163
}
164+
165+
.form-group > div > .form-checkbox {
166+
padding-top: 0.375rem;
167+
}
165168
}
166169

167170
.special-label {

assets/css/_recording_show.scss

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
.c-recording.a-show, .c-live-stream.a-show {
1+
.c-stream.a-show {
2+
section.cinema {
3+
transition: background-color 0.2s;
4+
}
5+
}
6+
7+
.c-recording.a-show, .c-stream.a-show {
8+
section.cinema {
9+
background-color: color-mix(in oklab, var(--term-color-background) 80%, black);
10+
11+
.ap-player {
12+
box-shadow: color-mix(in oklab, var(--term-color-background) 50%, black) 0px 0px 60px 5px;
13+
border: 1px solid color-mix(in oklab,var(--term-color-background) 90%, var(--term-color-foreground));
14+
}
15+
16+
div.ap-wrapper:fullscreen {
17+
background-color: inherit;
18+
}
19+
}
20+
221
section.info {
322
small {
423
font-size: 14px;
@@ -55,6 +74,10 @@
5574
margin-right: 0.5em;
5675
}
5776
}
77+
78+
.help-tooltip {
79+
cursor: help;
80+
}
5881
}
5982
}
6083

assets/css/_stream_list.scss

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
.c-stream {
2+
&.a-index {
3+
h2 {
4+
margin: 2rem 0 3rem;
5+
}
6+
7+
.create-stream {
8+
float: right;
9+
margin-right: 10px;
10+
}
11+
12+
.stream-list {
13+
table {
14+
margin-top: 3rem;
15+
table-layout: fixed;
16+
17+
th, td {
18+
white-space: nowrap;
19+
}
20+
21+
th:nth-child(3), td:nth-child(3) {
22+
overflow: hidden;
23+
text-overflow: ellipsis;
24+
}
25+
26+
th:nth-child(5), td:nth-child(5), th:nth-child(6), td:nth-child(6) {
27+
text-align: right;
28+
}
29+
}
30+
31+
.action {
32+
text-align: right;
33+
34+
> * {
35+
visibility: hidden;
36+
margin-left: 1em;
37+
}
38+
}
39+
40+
a:hover {
41+
text-decoration: none;
42+
}
43+
}
44+
45+
tr:hover {
46+
background-color: #f0f0f0;
47+
48+
.action > * {
49+
visibility: visible;
50+
}
51+
}
52+
}
53+
}

assets/css/_user_profile.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
.profile-page {
22
.cinema {
3+
background-color: #222230;
4+
padding: 3em 0;
5+
36
.user-avatar {
47
float: left;
58
width: 64px;
@@ -32,6 +35,11 @@
3235
}
3336

3437
h2 {
35-
margin-top: 30px;
38+
margin: 2em 0;
39+
40+
.action {
41+
float: right;
42+
font-size: 75%;
43+
}
3644
}
3745
}

0 commit comments

Comments
 (0)