Browse Source

integrate glitch

master
Tykayn 5 months ago committed by tykayn
parent
commit
7e3c5d1ec8
  1. BIN
      app/javascript/flavours/glitch/images/bliss/a_travers_pic_mastodon_grey.jpg
  2. BIN
      app/javascript/flavours/glitch/images/bliss/auth_background.jpg
  3. BIN
      app/javascript/flavours/glitch/images/bliss/home.jpg
  4. BIN
      app/javascript/flavours/glitch/images/bliss/home2.jpg
  5. BIN
      app/javascript/flavours/glitch/images/bliss/login.jpg
  6. BIN
      app/javascript/flavours/glitch/images/bliss/login.xcf
  7. 1
      app/javascript/flavours/glitch/images/bliss/originals/elephant_ui_greeting.svg
  8. 1
      app/javascript/flavours/glitch/images/bliss/originals/elephant_ui_plane.svg
  9. BIN
      app/javascript/flavours/glitch/images/bliss/originals/preview.jpg
  10. BIN
      app/javascript/flavours/glitch/images/bliss/preview_bliss.xcf
  11. BIN
      app/javascript/flavours/glitch/images/bliss/register.jpg
  12. BIN
      app/javascript/flavours/glitch/images/bliss/register.xcf
  13. 6
      app/javascript/styles/mastodon/_custom.scss
  14. 1
      app/models/mute.rb
  15. 5
      app/models/status.rb
  16. 4
      db/schema.rb
  17. 0
      public/android-chrome-192x192.png
  18. 0
      public/apple-touch-icon.png
  19. 0
      public/avatars/original/missing.png
  20. 0
      public/avatars/original/missing_o.png
  21. 0
      public/background-cybre.png
  22. 0
      public/badge.png
  23. 0
      public/browserconfig.xml
  24. 0
      public/clock.js
  25. 0
      public/embed.js
  26. 0
      public/emoji/1f004.svg
  27. 0
      public/emoji/1f0cf.svg
  28. 0
      public/emoji/1f170.svg
  29. 0
      public/emoji/1f171.svg
  30. 0
      public/emoji/1f17e.svg
  31. 0
      public/emoji/1f17f.svg
  32. 0
      public/emoji/1f18e.svg
  33. 0
      public/emoji/1f191.svg
  34. 0
      public/emoji/1f192.svg
  35. 0
      public/emoji/1f193.svg
  36. 0
      public/emoji/1f194.svg
  37. 0
      public/emoji/1f195.svg
  38. 0
      public/emoji/1f196.svg
  39. 0
      public/emoji/1f197.svg
  40. 0
      public/emoji/1f198.svg
  41. 0
      public/emoji/1f199.svg
  42. 0
      public/emoji/1f19a.svg
  43. 0
      public/emoji/1f1e6-1f1e8.svg
  44. 0
      public/emoji/1f1e6-1f1e9.svg
  45. 0
      public/emoji/1f1e6-1f1ea.svg
  46. 0
      public/emoji/1f1e6-1f1eb.svg
  47. 0
      public/emoji/1f1e6-1f1ec.svg
  48. 0
      public/emoji/1f1e6-1f1ee.svg
  49. 0
      public/emoji/1f1e6-1f1f1.svg
  50. 0
      public/emoji/1f1e6-1f1f2.svg
  51. 0
      public/emoji/1f1e6-1f1f4.svg
  52. 0
      public/emoji/1f1e6-1f1f6.svg
  53. 0
      public/emoji/1f1e6-1f1f7.svg
  54. 0
      public/emoji/1f1e6-1f1f8.svg
  55. 0
      public/emoji/1f1e6-1f1f9.svg
  56. 0
      public/emoji/1f1e6-1f1fa.svg
  57. 0
      public/emoji/1f1e6-1f1fc.svg
  58. 0
      public/emoji/1f1e6-1f1fd.svg
  59. 0
      public/emoji/1f1e6-1f1ff.svg
  60. 0
      public/emoji/1f1e6.svg
  61. 0
      public/emoji/1f1e7-1f1e6.svg
  62. 0
      public/emoji/1f1e7-1f1e7.svg
  63. 0
      public/emoji/1f1e7-1f1e9.svg
  64. 0
      public/emoji/1f1e7-1f1ea.svg
  65. 0
      public/emoji/1f1e7-1f1eb.svg
  66. 0
      public/emoji/1f1e7-1f1ec.svg
  67. 0
      public/emoji/1f1e7-1f1ed.svg
  68. 0
      public/emoji/1f1e7-1f1ee.svg
  69. 0
      public/emoji/1f1e7-1f1ef.svg
  70. 0
      public/emoji/1f1e7-1f1f1.svg
  71. 0
      public/emoji/1f1e7-1f1f2.svg
  72. 0
      public/emoji/1f1e7-1f1f3.svg
  73. 0
      public/emoji/1f1e7-1f1f4.svg
  74. 0
      public/emoji/1f1e7-1f1f6.svg
  75. 0
      public/emoji/1f1e7-1f1f7.svg
  76. 0
      public/emoji/1f1e7-1f1f8.svg
  77. 0
      public/emoji/1f1e7-1f1f9.svg
  78. 0
      public/emoji/1f1e7-1f1fb.svg
  79. 0
      public/emoji/1f1e7-1f1fc.svg
  80. 0
      public/emoji/1f1e7-1f1fe.svg
  81. 0
      public/emoji/1f1e7-1f1ff.svg
  82. 0
      public/emoji/1f1e7.svg
  83. 0
      public/emoji/1f1e8-1f1e6.svg
  84. 0
      public/emoji/1f1e8-1f1e8.svg
  85. 0
      public/emoji/1f1e8-1f1e9.svg
  86. 0
      public/emoji/1f1e8-1f1eb.svg
  87. 0
      public/emoji/1f1e8-1f1ec.svg
  88. 0
      public/emoji/1f1e8-1f1ed.svg
  89. 0
      public/emoji/1f1e8-1f1ee.svg
  90. 0
      public/emoji/1f1e8-1f1f0.svg
  91. 0
      public/emoji/1f1e8-1f1f1.svg
  92. 0
      public/emoji/1f1e8-1f1f2.svg
  93. 0
      public/emoji/1f1e8-1f1f3.svg
  94. 0
      public/emoji/1f1e8-1f1f4.svg
  95. 0
      public/emoji/1f1e8-1f1f5.svg
  96. 0
      public/emoji/1f1e8-1f1f7.svg
  97. 0
      public/emoji/1f1e8-1f1fa.svg
  98. 0
      public/emoji/1f1e8-1f1fb.svg
  99. 0
      public/emoji/1f1e8-1f1fc.svg
  100. 0
      public/emoji/1f1e8-1f1fd.svg
  101. Some files were not shown because too many files have changed in this diff Show More

BIN
app/javascript/flavours/glitch/images/bliss/a_travers_pic_mastodon_grey.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
app/javascript/flavours/glitch/images/bliss/auth_background.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
app/javascript/flavours/glitch/images/bliss/home.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 KiB

BIN
app/javascript/flavours/glitch/images/bliss/home2.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 KiB

BIN
app/javascript/flavours/glitch/images/bliss/login.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

BIN
app/javascript/flavours/glitch/images/bliss/login.xcf

Binary file not shown.

1
app/javascript/flavours/glitch/images/bliss/originals/elephant_ui_greeting.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 17 KiB

1
app/javascript/flavours/glitch/images/bliss/originals/elephant_ui_plane.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/javascript/flavours/glitch/images/bliss/originals/preview.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 KiB

BIN
app/javascript/flavours/glitch/images/bliss/preview_bliss.xcf

Binary file not shown.

BIN
app/javascript/flavours/glitch/images/bliss/register.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

BIN
app/javascript/flavours/glitch/images/bliss/register.xcf

Binary file not shown.

6
app/javascript/styles/mastodon/_custom.scss

@ -16,7 +16,8 @@
position: relative;
top: 0;
width: 100%;
background: url('../images/home.jpg') no-repeat fixed center;
//background: url('~flavours/glitch/bliss/images/home.jpg') no-repeat fixed center;
background: url('~flavours/glitch/images/wave-drawer.png') no-repeat fixed center;
background-size: cover;
// landing
@ -32,7 +33,8 @@
position: absolute;
top: 0;
width: 100%;
background: url('../images/bliss/auth_background.jpg') no-repeat fixed center;
//background: url('~flavours/glitch/bliss/images/auth_background.jpg') no-repeat fixed center;
background: url('~flavours/glitch/images/wave-drawer.png') no-repeat fixed center;
background-size: cover;
.form-container {

1
app/models/mute.rb

@ -9,7 +9,6 @@
# hide_notifications :boolean default(TRUE), not null
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
# hide_notifications :boolean default(TRUE), not null
# expires_at :datetime
#

5
app/models/status.rb

@ -21,11 +21,10 @@
# account_id :bigint(8) not null
# application_id :bigint(8)
# in_reply_to_account_id :bigint(8)
# local_only :boolean
# full_status_text :text default(""), not null
# poll_id :bigint(8)
# content_type :string
# deleted_at :datetime
# local_only :boolean
# content_type :string
# edited_at :datetime
#

4
db/schema.rb

@ -871,10 +871,10 @@ ActiveRecord::Schema.define(version: 2022_01_18_183123) do
t.bigint "account_id", null: false
t.bigint "application_id"
t.bigint "in_reply_to_account_id"
t.boolean "local_only"
t.bigint "poll_id"
t.string "content_type"
t.datetime "deleted_at"
t.boolean "local_only"
t.string "content_type"
t.datetime "edited_at"
t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"

0
public/android-chrome-192x192.png

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
public/apple-touch-icon.png

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
public/avatars/original/missing.png

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
public/avatars/original/missing_o.png

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
public/background-cybre.png

Before

Width:  |  Height:  |  Size: 232 KiB

After

Width:  |  Height:  |  Size: 232 KiB

0
public/badge.png

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
public/browserconfig.xml

0
public/clock.js

0
public/embed.js

0
public/emoji/1f004.svg

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
public/emoji/1f0cf.svg

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
public/emoji/1f170.svg

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 576 B

0
public/emoji/1f171.svg

Before

Width:  |  Height:  |  Size: 621 B

After

Width:  |  Height:  |  Size: 621 B

0
public/emoji/1f17e.svg

Before

Width:  |  Height:  |  Size: 495 B

After

Width:  |  Height:  |  Size: 495 B

0
public/emoji/1f17f.svg

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 456 B

0
public/emoji/1f18e.svg

Before

Width:  |  Height:  |  Size: 942 B

After

Width:  |  Height:  |  Size: 942 B

0
public/emoji/1f191.svg

Before

Width:  |  Height:  |  Size: 731 B

After

Width:  |  Height:  |  Size: 731 B

0
public/emoji/1f192.svg

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
public/emoji/1f193.svg

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
public/emoji/1f194.svg

Before

Width:  |  Height:  |  Size: 600 B

After

Width:  |  Height:  |  Size: 600 B

0
public/emoji/1f195.svg

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
public/emoji/1f196.svg

Before

Width:  |  Height:  |  Size: 877 B

After

Width:  |  Height:  |  Size: 877 B

0
public/emoji/1f197.svg

Before

Width:  |  Height:  |  Size: 860 B

After

Width:  |  Height:  |  Size: 860 B

0
public/emoji/1f198.svg

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
public/emoji/1f199.svg

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
public/emoji/1f19a.svg

Before

Width:  |  Height:  |  Size: 855 B

After

Width:  |  Height:  |  Size: 855 B

0
public/emoji/1f1e6-1f1e8.svg

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
public/emoji/1f1e6-1f1e9.svg

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
public/emoji/1f1e6-1f1ea.svg

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 309 B

0
public/emoji/1f1e6-1f1eb.svg

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
public/emoji/1f1e6-1f1ec.svg

Before

Width:  |  Height:  |  Size: 942 B

After

Width:  |  Height:  |  Size: 942 B

0
public/emoji/1f1e6-1f1ee.svg

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
public/emoji/1f1e6-1f1f1.svg

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
public/emoji/1f1e6-1f1f2.svg

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

0
public/emoji/1f1e6-1f1f4.svg

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
public/emoji/1f1e6-1f1f6.svg

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
public/emoji/1f1e6-1f1f7.svg

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
public/emoji/1f1e6-1f1f8.svg

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
public/emoji/1f1e6-1f1f9.svg

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

0
public/emoji/1f1e6-1f1fa.svg

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
public/emoji/1f1e6-1f1fc.svg

Before

Width:  |  Height:  |  Size: 794 B

After

Width:  |  Height:  |  Size: 794 B

0
public/emoji/1f1e6-1f1fd.svg

Before

Width:  |  Height:  |  Size: 410 B

After

Width:  |  Height:  |  Size: 410 B

0
public/emoji/1f1e6-1f1ff.svg

Before

Width:  |  Height:  |  Size: 740 B

After

Width:  |  Height:  |  Size: 740 B

0
public/emoji/1f1e6.svg

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 576 B

0
public/emoji/1f1e7-1f1e6.svg

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
public/emoji/1f1e7-1f1e7.svg

Before

Width:  |  Height:  |  Size: 716 B

After

Width:  |  Height:  |  Size: 716 B

0
public/emoji/1f1e7-1f1e9.svg

Before

Width:  |  Height:  |  Size: 239 B

After

Width:  |  Height:  |  Size: 239 B

0
public/emoji/1f1e7-1f1ea.svg

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

0
public/emoji/1f1e7-1f1eb.svg

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 518 B

0
public/emoji/1f1e7-1f1ec.svg

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 268 B

0
public/emoji/1f1e7-1f1ed.svg

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 316 B

0
public/emoji/1f1e7-1f1ee.svg

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
public/emoji/1f1e7-1f1ef.svg

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 279 B

0
public/emoji/1f1e7-1f1f1.svg

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
public/emoji/1f1e7-1f1f2.svg

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
public/emoji/1f1e7-1f1f3.svg

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
public/emoji/1f1e7-1f1f4.svg

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

0
public/emoji/1f1e7-1f1f6.svg

Before

Width:  |  Height:  |  Size: 948 B

After

Width:  |  Height:  |  Size: 948 B

0
public/emoji/1f1e7-1f1f7.svg

Before

Width:  |  Height:  |  Size: 682 B

After

Width:  |  Height:  |  Size: 682 B

0
public/emoji/1f1e7-1f1f8.svg

Before

Width:  |  Height:  |  Size: 478 B

After

Width:  |  Height:  |  Size: 478 B

0
public/emoji/1f1e7-1f1f9.svg

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

0
public/emoji/1f1e7-1f1fb.svg

Before

Width:  |  Height:  |  Size: 467 B

After

Width:  |  Height:  |  Size: 467 B

0
public/emoji/1f1e7-1f1fc.svg

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 282 B

0
public/emoji/1f1e7-1f1fe.svg

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
public/emoji/1f1e7-1f1ff.svg

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
public/emoji/1f1e7.svg

Before

Width:  |  Height:  |  Size: 621 B

After

Width:  |  Height:  |  Size: 621 B

0
public/emoji/1f1e8-1f1e6.svg

Before

Width:  |  Height:  |  Size: 910 B

After

Width:  |  Height:  |  Size: 910 B

0
public/emoji/1f1e8-1f1e8.svg

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
public/emoji/1f1e8-1f1e9.svg

Before

Width:  |  Height:  |  Size: 720 B

After

Width:  |  Height:  |  Size: 720 B

0
public/emoji/1f1e8-1f1eb.svg

Before

Width:  |  Height:  |  Size: 494 B

After

Width:  |  Height:  |  Size: 494 B

0
public/emoji/1f1e8-1f1ec.svg

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 372 B

0
public/emoji/1f1e8-1f1ed.svg

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 258 B

0
public/emoji/1f1e8-1f1ee.svg

Before

Width:  |  Height:  |  Size: 269 B

After

Width:  |  Height:  |  Size: 269 B

0
public/emoji/1f1e8-1f1f0.svg

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
public/emoji/1f1e8-1f1f1.svg

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 521 B

0
public/emoji/1f1e8-1f1f2.svg

Before

Width:  |  Height:  |  Size: 500 B

After

Width:  |  Height:  |  Size: 500 B

0
public/emoji/1f1e8-1f1f3.svg

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 696 B

0
public/emoji/1f1e8-1f1f4.svg

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 271 B

0
public/emoji/1f1e8-1f1f5.svg

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 270 B

0
public/emoji/1f1e8-1f1f7.svg

Before

Width:  |  Height:  |  Size: 873 B

After

Width:  |  Height:  |  Size: 873 B

0
public/emoji/1f1e8-1f1fa.svg

Before

Width:  |  Height:  |  Size: 532 B

After

Width:  |  Height:  |  Size: 532 B

0
public/emoji/1f1e8-1f1fb.svg

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
public/emoji/1f1e8-1f1fc.svg

Before

Width:  |  Height:  |  Size: 704 B

After

Width:  |  Height:  |  Size: 704 B

0
public/emoji/1f1e8-1f1fd.svg

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save