Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: glitch-soc/mastodon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: darioxmastodon/mastodon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
Loading
Showing with 5,216 additions and 26 deletions.
  1. +6 −0 README.md
  2. +2 −0 _build.sh
  3. +2 −0 _build_web.sh
  4. +6 −0 _devstart.sh
  5. +4 −0 _docker_publish.sh
  6. +10 −0 _postupdate.sh
  7. +3 −0 _restart.sh
  8. +6 −0 _update.sh
  9. +2 −0 app/javascript/flavours/glitch/features/ui/components/link_footer.jsx
  10. +241 −0 app/javascript/flavours/glitch/styles/dariox.scss
  11. +57 −0 app/javascript/flavours/glitch/styles/dariox/account.scss
  12. +89 −0 app/javascript/flavours/glitch/styles/dariox/compose.scss
  13. +18 −0 app/javascript/flavours/glitch/styles/dariox/linernotes_dark.scss
  14. +15 −0 app/javascript/flavours/glitch/styles/dariox/linernotes_dark/overrides.scss
  15. +61 −0 app/javascript/flavours/glitch/styles/dariox/linernotes_dark/palette.scss
  16. +151 −0 app/javascript/flavours/glitch/styles/dariox/mfc/0-palette.css
  17. +354 −0 app/javascript/flavours/glitch/styles/dariox/mfc/1-foreground.css
  18. +239 −0 app/javascript/flavours/glitch/styles/dariox/mfc/2-background.css
  19. +282 −0 app/javascript/flavours/glitch/styles/dariox/mfc/3-highlights.css
  20. +76 −0 app/javascript/flavours/glitch/styles/dariox/mfc/5-material.css
  21. +120 −0 app/javascript/flavours/glitch/styles/dariox/mfc/6-actions.css
  22. +18 −0 app/javascript/flavours/glitch/styles/dariox/mfc/mastodonFlat.scss
  23. +23 −0 app/javascript/flavours/glitch/styles/dariox/mfc/variables.scss
  24. +14 −0 app/javascript/flavours/glitch/styles/dariox/mods/deprecated/display_bettersearch.css
  25. +10 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_aligned-interactions.css
  26. +9 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_breakname.css
  27. +20 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_browserfont.css
  28. +15 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_circleavatar.css
  29. +37 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_collapsedinteractions.css
  30. +23 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_emojizoom.css
  31. +9 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_fadedinteractions.css
  32. +31 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_fullmedia.css
  33. +11 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_fullname.css
  34. +10 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_hidefollowcounts.css
  35. +7 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_hidereplycounts.css
  36. +16 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_starstohearts.css
  37. +10 −0 app/javascript/flavours/glitch/styles/dariox/mods/display_transparentmedia.css
  38. +14 −0 app/javascript/flavours/glitch/styles/dariox/mods/layout_1600px.css
  39. +26 −0 app/javascript/flavours/glitch/styles/dariox/mods/layout_elefriend.css
  40. +13 −0 app/javascript/flavours/glitch/styles/dariox/mods/layout_gettingstartedheight.css
  41. +17 −0 app/javascript/flavours/glitch/styles/dariox/mods/layout_hidedisabled.css
  42. +9 −0 app/javascript/flavours/glitch/styles/dariox/mods/layout_hidefiltered.css
  43. +46 −0 app/javascript/flavours/glitch/styles/dariox/mods/layout_mobile_bottombar.css
  44. +39 −0 app/javascript/flavours/glitch/styles/dariox/mods/layout_singlecolumn.css
  45. +10 −0 app/javascript/flavours/glitch/styles/dariox/mods/layout_widercolumns.css
  46. +12 −0 app/javascript/flavours/glitch/styles/dariox/mods/test_colorizedlogo.css
  47. +55 −0 app/javascript/flavours/glitch/styles/dariox/status.scss
  48. +19 −0 app/javascript/flavours/glitch/styles/dariox/vars.scss
  49. +2 −0 app/javascript/mastodon/features/ui/components/link_footer.jsx
  50. +1 −0 app/javascript/skins/glitch/dariox/common.scss
  51. +4 −0 app/javascript/skins/glitch/dariox/names.yml
  52. +1 −0 app/javascript/skins/vanilla/linernotes_dark/common.scss
  53. +4 −0 app/javascript/skins/vanilla/linernotes_dark/names.yml
  54. +4 −0 app/javascript/styles/application.scss
  55. +18 −0 app/javascript/styles/linernotes_dark.scss
  56. +15 −0 app/javascript/styles/linernotes_dark/overrides.scss
  57. +61 −0 app/javascript/styles/linernotes_dark/palette.scss
  58. +1,260 −0 app/javascript/styles/mastodon-flat.scss
  59. +127 −0 app/javascript/styles/mfc/0-palette.css
  60. +354 −0 app/javascript/styles/mfc/1-foreground.css
  61. +218 −0 app/javascript/styles/mfc/2-background.css
  62. +282 −0 app/javascript/styles/mfc/3-highlights.css
  63. +76 −0 app/javascript/styles/mfc/5-material.css
  64. +120 −0 app/javascript/styles/mfc/6-actions.css
  65. +18 −0 app/javascript/styles/mfc/mastodonFlat.scss
  66. +11 −0 app/javascript/styles/mfc/variables.scss
  67. +10 −0 app/javascript/styles/mods/deprecated/display_bettersearch.css
  68. +10 −0 app/javascript/styles/mods/display_aligned-interactions.css
  69. +9 −0 app/javascript/styles/mods/display_breakname.css
  70. +20 −0 app/javascript/styles/mods/display_browserfont.css
  71. +15 −0 app/javascript/styles/mods/display_circleavatar.css
  72. +37 −0 app/javascript/styles/mods/display_collapsedinteractions.css
  73. +23 −0 app/javascript/styles/mods/display_emojizoom.css
  74. +9 −0 app/javascript/styles/mods/display_fadedinteractions.css
  75. +31 −0 app/javascript/styles/mods/display_fullmedia.css
  76. +11 −0 app/javascript/styles/mods/display_fullname.css
  77. +10 −0 app/javascript/styles/mods/display_hidefollowcounts.css
  78. +7 −0 app/javascript/styles/mods/display_hidereplycounts.css
  79. +16 −0 app/javascript/styles/mods/display_starstohearts.css
  80. +10 −0 app/javascript/styles/mods/display_transparentmedia.css
  81. +12 −0 app/javascript/styles/mods/layout_1600px.css
  82. +20 −0 app/javascript/styles/mods/layout_elefriend.css
  83. +13 −0 app/javascript/styles/mods/layout_gettingstartedheight.css
  84. +17 −0 app/javascript/styles/mods/layout_hidedisabled.css
  85. +9 −0 app/javascript/styles/mods/layout_hidefiltered.css
  86. +29 −0 app/javascript/styles/mods/layout_mobile_bottombar.css
  87. +25 −0 app/javascript/styles/mods/layout_singlecolumn.css
  88. +10 −0 app/javascript/styles/mods/layout_widercolumns.css
  89. +12 −0 app/javascript/styles/mods/test_colorizedlogo.css
  90. +1 −0 app/models/user.rb
  91. +1 −0 app/models/webhook.rb
  92. +1 −1 app/views/admin_mailer/new_pending_account.text.erb
  93. +3 −3 config/initializers/content_security_policy.rb
  94. +2 −22 spec/presenters/instance_presenter_spec.rb
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Mastodon Glitch+DARiOX Edition

[mastodon](https://github.com/mastodon/mastodon)->[glitch-soc](https://github.com/glitch-soc/mastodon)->[dariox](https://github.com/darioxmastodon/mastodon)

## Original README

# Mastodon Glitch Edition

[![Ruby Testing](https://github.com/glitch-soc/mastodon/actions/workflows/test-ruby.yml/badge.svg)](https://github.com/glitch-soc/mastodon/actions/workflows/test-ruby.yml)
2 changes: 2 additions & 0 deletions _build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
DOCKER_BUILDKIT=1 docker-compose build
2 changes: 2 additions & 0 deletions _build_web.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
DOCKER_BUILDKIT=1 docker-compose build web
6 changes: 6 additions & 0 deletions _devstart.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
source ./.env.production
LOCAL_DOMAIN=dev.dariox.club
SMTP_FROM_ADDRESS=mastodon.dev@dariox.club
RAILS_ENV=development
bash -c "rm -f /tmp/pids/mastodon-server-dev.pid; bundle exec rails s -p 3947"
4 changes: 4 additions & 0 deletions _docker_publish.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
DOCKER_BUILDKIT=1 docker build -t mastodon-dariox:latest .
docker tag mastodon-dariox:latest ktwrd/mastodon-dariox:latest
docker push ktwrd/mastodon-dariox:latest
10 changes: 10 additions & 0 deletions _postupdate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
echo ""
echo "================ Migrating Database"
RAILS_ENV=production SKIP_POST_DEPLOYMENT_MIGRATIONS=true docker-compose run --rm web bundle exec rake db:migrate
echo ""
echo "================ Precompiling Assets"
RAILS_ENV=production docker-compose run --rm web bundle exec rake assets:precompile
echo ""
echo "================ Post-Migration Database"
RAILS_ENV=production docker-compose run --rm web bundle exec rails db:migrate
3 changes: 3 additions & 0 deletions _restart.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
docker-compose down
docker-compose up -d
6 changes: 6 additions & 0 deletions _update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
./_build.sh
./_restart.sh
./_postupdate.sh
docker-compose restart
./_postupdate.sh
Original file line number Diff line number Diff line change
@@ -71,6 +71,8 @@ class LinkFooter extends PureComponent {
)}
{DividingCircle}
<Link to='/privacy-policy' target={multiColumn ? '_blank' : undefined}><FormattedMessage id='footer.privacy_policy' defaultMessage='Privacy policy' /></Link>
{DividingCircle}
<a key='documentation' target='_blank' rel='noopener noreferrer' href='https://docs.dariox.club/'>Docs</a>
</p>

<p>
241 changes: 241 additions & 0 deletions app/javascript/flavours/glitch/styles/dariox.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
@use 'sass:math';
@import 'dariox/vars.scss';
@import 'dariox/linernotes_dark.scss';
@import 'dariox/vars.scss';
@import 'dariox/account.scss';
@import 'dariox/status.scss';
@import 'dariox/compose.scss';

body.app-body {
background-color: $bg;
}

.pillbar-button:not([disabled]).active {
background-color: $bgHead;
}
#new_user .lead {
background: transparent;
}
.reply-indicator {
&__display-name,
&__header {
background-color: $bg;
color: $text;
}
}
.conversation,
.follow_requests-unlocked_explanation {
background: $bg;
}
.card {
&__bar {
background: $bg !important;
}
}
.dashboard__counters > div > a {
background: $bg !important;
}
.table td {
background: rgba($bg, .8);
}
.table > tbody > tr:nth-child(2n+1) > td,
.table.inline-table >tbody >tr:nth-child(2n+1) > td {
background: $bg !important;
}

.batch-table__row:hover {
background: $bg !important;
}
.batch-table__row:nth-child(2n):hover {
background: $bg !important;
}
.notification__filter-bar a.active::after,
.notification__filter-bar button.active::after {
border-bottom-color: $accent !important;
}
/* ======== Emoji */
.emoji-mart-anchor-bar {
display: none;
}
.emoji-mart-anchor-icon {
width: 24px;
margin-left: -1px;
}
.emoji-mart-bar {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.emoji-mart {
border-radius: 4px !important;
}
.emoji-mart-scroll,
.emoji-mart-category-label span,
.emoji-mart-search {
background: $bg !important;
}
.emoji-mart-search-icon svg {
fill: $text !important;
}
.emoji-mart-search-icon {
opacity: 1 !important;
}
/* ======== Form */
.simple_form h4 {
margin-bottom: 14px !important;
background-color: transparent;
}
.column-header {
&__back-button {
background: transparent;
}
&__buttons:hover {
background-color: $accent;
}
}
.column-inline-form {
background: $bg;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}

/* ======== Advanced Mode */
.drawer {
&__inner {
&__mastodon {
img {
max-height: 180px !important;
}
}
}
}

/* ======== Badges */
/* Glitch-only */
.simple_form .glitch_only {
color: #ff8d8d;
background-color: rgba(255,141,141,.1);
border-color: rgba(255,141,141,.5);
}
/* Account Role */
.account-role,
.simple_form .glitch_only,
.not_recommended,
.simple_form .recommended
{
display: inline-block;
padding: 4px 6px;
cursor: default;
border-radius: 3px;
font-size: 12px;
line-height: 12px;
font-weight: 500;
color: var(--user-role-accent, #d9e1e8);
background-color: var(--user-role-background, rgba(217,225,232,.1));
border: 1px solid var(--user-role-border,
rgba(217,225,232,.5));
}

/* ======== Admin Panel */
.admin-wrapper .content h4
{
text-transform: uppercase;
font-size: 13px;
font-weight: 700;
color: $accentText;
padding-bottom: 8px;
border-bottom: 1px solid $accent;
background-color: transparent;
}
.admin-wrapper {
.content {
&__heading {
&__tabs {
a {
color: $textMuted;
}
a:hover {
color: $bg;
}
a:hover:not(.selected) {
color: $text;
}
a.selected {
background: $bgHead;
}
a:focus,
a.selected:focus {
background: $accent;
}
}
}
.directory {
&__tag {
> a:hover,
> div:hover {
background: $bg;
outline: 2px solid $accent;
}
}
}
}
}
.selected.simple-navigation-active-leaf {
background: $bgHead;
}
.selected.simple-navigation-active-leaf:hover {
background: $accent;
}
.dashboard {
&__quick-access {
background: transparent;
border: 2px solid $bg;

line-height: 28px;
height: 28px;
}
}
.sparkline {
background: $bg;
border: 2px solid $bg;
}
a.sparkline {
&:hover,
&:focus,
&:active {
background: lighten($bg, 6%);
}
}
.sparkline {
&__graph {
path:first-child {
fill: rgba($bgHead, .25) !important;
fill-opacity: 100% !important;
}
path:last-child {
stroke: $accent !important;
fill: none !important;
}
}
}
.dimension {
&__item {
&__indicator {
@for $i from 0 through 10 {
&--#{10 * $i} {
background-color: rgba($bgHead, 1 * (math.div(max(1, $i), 10))) !important;
}
}
}
}
}
.retention {
&__table {
&__box {
@for $i from 0 through 10 {
&--#{10 * $i} {
background-color: rgba($bgHead, 1 * (math.div(max(1, $i), 10))) !important;
}
}
}
}
}
57 changes: 57 additions & 0 deletions app/javascript/flavours/glitch/styles/dariox/account.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
@import './vars.scss';
.account {
background: $bg !important;
&__section-headline {
a.active::after,
button.active::after {
border-bottom-color: $accent !important;
}
}
&__header {
&__bar,
&__content,
&__fields {
background-color: $bg !important;
}
&__fields {
border-bottom-color: $accent;
dd,
dt {
background: $bg !important;
}
dl.verified {
background: $profileVerifiedBackground !important;
border-color: $profileVerifiedBorderColor !important;

dt,
dd {
background: transparent !important;
color: $profileVerifiedText !important;
}
}
}
&__bio,
&__joined {
color: $textMuted !important;
}
}
&__action-bar {
background: $bg !important;
border-top-color: $bgPage !important;
border-bottom-color: $bgPage !important;
&__tab {
.active {
border-bottom-color: $accent !important;
}
}
}
&__disclaimer {
background: $bg !important;
}
}

.account-authorize {
&__wrapper {
background: $bg;
}
}
Loading