Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tangerine UI #57

Merged
merged 24 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a4889c6
Update themes.yml
DismalShadowX Aug 28, 2024
1964d43
Update en.yml
DismalShadowX Aug 28, 2024
38151a6
Add Tangerine UI as an available theme
DismalShadowX Aug 28, 2024
bbe7c66
Merge branch 'Alpha' into tangerine-ui
DismalShadowX Aug 28, 2024
f9595d4
Merge branch 'mastodon:main' into tangerine-ui
DismalShadowX Sep 3, 2024
c532427
Merge branch 'mastodon:main' into tangerine-ui
DismalShadowX Sep 25, 2024
371b4d3
Update tangerineui-cherry.scss
DismalShadowX Sep 25, 2024
c22294d
Update tangerineui-lagoon.scss
DismalShadowX Sep 25, 2024
4aa1bd5
Update tangerineui-purple.scss
DismalShadowX Sep 25, 2024
ae03ff8
Update tangerineui.scss
DismalShadowX Sep 25, 2024
ba0ce42
Delete app/javascript/styles/mastodon-bird-ui directory
DismalShadowX Oct 1, 2024
a26f332
Delete app/javascript/styles/mastodon-bird-ui-light.scss
DismalShadowX Oct 1, 2024
424dba4
Delete app/javascript/styles/mastodon-bird-ui-accessible.scss
DismalShadowX Oct 1, 2024
433bd39
Delete app/javascript/styles/mastodon-bird-ui-contrast.scss
DismalShadowX Oct 1, 2024
82555f6
Delete app/javascript/styles/mastodon-bird-ui-dark.scss
DismalShadowX Oct 1, 2024
bee5bf2
Merge branch 'mastodon:main' into tangerine-ui
DismalShadowX Oct 1, 2024
998fc04
Update tangerineui-cherry.scss
DismalShadowX Oct 1, 2024
0bff844
Update tangerineui-lagoon.scss
DismalShadowX Oct 1, 2024
76f92c0
Update tangerineui-purple.scss
DismalShadowX Oct 1, 2024
855e753
Update tangerineui.scss
DismalShadowX Oct 1, 2024
ce3fde3
Update tangerineui-cherry.scss
DismalShadowX Oct 1, 2024
d8ba819
Update tangerineui-lagoon.scss
DismalShadowX Oct 1, 2024
37fe980
Update tangerineui-purple.scss
DismalShadowX Oct 1, 2024
0984c87
Update tangerineui.scss
DismalShadowX Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env.production.sample
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,5 @@ S3_ALIAS_HOST=files.example.com
# -----------------------
IP_RETENTION_PERIOD=31556952
SESSION_RETENTION_PERIOD=31556952

MAX_CHARS=4242
2 changes: 2 additions & 0 deletions app/javascript/styles/tangerineui-cherry.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'application';
@import 'tangerineui-cherry/tangerineui-cherry.scss';
7,817 changes: 7,817 additions & 0 deletions app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/javascript/styles/tangerineui-lagoon.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'application';
@import 'tangerineui-lagoon/tangerineui-lagoon.scss';
7,817 changes: 7,817 additions & 0 deletions app/javascript/styles/tangerineui-lagoon/tangerineui-lagoon.scss

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/javascript/styles/tangerineui-purple.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'application';
@import 'tangerineui-purple/tangerineui-purple.scss';
7,817 changes: 7,817 additions & 0 deletions app/javascript/styles/tangerineui-purple/tangerineui-purple.scss

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/javascript/styles/tangerineui.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'application';
@import 'tangerineui/tangerineui.scss';
7,817 changes: 7,817 additions & 0 deletions app/javascript/styles/tangerineui/tangerineui.scss

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/models/trends/statuses.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ class Trends::Statuses < Trends::Base
BATCH_SIZE = 100

self.default_options = {
threshold: 5,
threshold: 2,
review_threshold: 3,
score_halflife: 1.hour.freeze,
score_halflife: 12.hours.freeze,
decay_threshold: 0.3,
}

Expand Down
2 changes: 1 addition & 1 deletion app/validators/status_length_validator.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

class StatusLengthValidator < ActiveModel::Validator
MAX_CHARS = 500
MAX_CHARS = 4242
URL_PLACEHOLDER_CHARS = 23
URL_PLACEHOLDER = 'x' * 23

Expand Down
8 changes: 8 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1803,6 +1803,14 @@ en:
contrast: Mastodon (High contrast)
default: Mastodon (Dark)
mastodon-light: Mastodon (Light)
tangerineui: Tangerine UI
tangerineui-purple: Tangerine UI (Purple)
tangerineui-cherry: Tangerine UI (Cherry)
tangerineui-lagoon: Tangerine UI (Lagoon)
mastodon-bird-ui: Bagel UI (Dark)
mastodon-bird-ui-light: Bagel UI (Light)
mastodon-bird-ui-contrast: Bagel UI (High contrast)
mastodon-bird-ui-accessible: Bagel UI (Ultra accessible)
system: Automatic (use system theme)
time:
formats:
Expand Down
8 changes: 8 additions & 0 deletions config/themes.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
default: styles/application.scss
contrast: styles/contrast.scss
mastodon-light: styles/mastodon-light.scss
tangerineui: styles/tangerineui.scss
tangerineui-purple: styles/tangerineui-purple.scss
tangerineui-cherry: styles/tangerineui-cherry.scss
tangerineui-lagoon: styles/tangerineui-lagoon.scss
mastodon-bird-ui: styles/mastodon-bird-ui-dark.scss
mastodon-bird-ui-light: styles/mastodon-bird-ui-light.scss
mastodon-bird-ui-contrast: styles/mastodon-bird-ui-contrast.scss
mastodon-bird-ui-accessible: styles/mastodon-bird-ui-accessible.scss
Loading