Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiger Ton
mastodon
Commits
64ee565b
Commit
64ee565b
authored
2 years ago
by
Yamagishi Kazutoshi
Browse files
Options
Download
Email Patches
Plain Diff
Replace to shakapacker from webpacker
parent
0aacf00f
Changes
78
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
app/javascript/share.js
+5
-5
app/javascript/share.js
app/javascript/styles/mastodon/about.scss
+1
-1
app/javascript/styles/mastodon/about.scss
app/javascript/styles/mastodon/components.scss
+2
-2
app/javascript/styles/mastodon/components.scss
app/javascript/two_factor_authentication.js
+3
-3
app/javascript/two_factor_authentication.js
app/serializers/manifest_serializer.rb
+1
-1
app/serializers/manifest_serializer.rb
app/serializers/rest/instance_serializer.rb
+1
-1
app/serializers/rest/instance_serializer.rb
app/views/about/more.html.haml
+2
-2
app/views/about/more.html.haml
app/views/about/show.html.haml
+1
-1
app/views/about/show.html.haml
app/views/application/_sidebar.html.haml
+1
-1
app/views/application/_sidebar.html.haml
app/views/layouts/application.html.haml
+3
-3
app/views/layouts/application.html.haml
app/views/layouts/mailer.html.haml
+2
-2
app/views/layouts/mailer.html.haml
app/views/notification_mailer/favourite.html.haml
+1
-1
app/views/notification_mailer/favourite.html.haml
app/views/notification_mailer/follow.html.haml
+1
-1
app/views/notification_mailer/follow.html.haml
app/views/notification_mailer/follow_request.html.haml
+1
-1
app/views/notification_mailer/follow_request.html.haml
app/views/notification_mailer/mention.html.haml
+1
-1
app/views/notification_mailer/mention.html.haml
app/views/notification_mailer/reblog.html.haml
+1
-1
app/views/notification_mailer/reblog.html.haml
app/views/shared/_og.html.haml
+1
-1
app/views/shared/_og.html.haml
app/views/user_mailer/appeal_approved.html.haml
+1
-1
app/views/user_mailer/appeal_approved.html.haml
app/views/user_mailer/appeal_rejected.html.haml
+1
-1
app/views/user_mailer/appeal_rejected.html.haml
app/views/user_mailer/backup_ready.html.haml
+1
-1
app/views/user_mailer/backup_ready.html.haml
with
31 additions
and
31 deletions
+31
-31
app/javascript/
packs/
share.js
→
app/javascript/share.js
+
5
-
5
View file @
64ee565b
import
'
.
/public-path
'
;
import
loadPolyfills
from
'
../
mastodon/load_polyfills
'
;
import
{
start
}
from
'
../
mastodon/common
'
;
import
'
mastodon
/public-path
'
;
import
loadPolyfills
from
'
mastodon/load_polyfills
'
;
import
{
start
}
from
'
mastodon/common
'
;
start
();
function
loaded
()
{
const
ComposeContainer
=
require
(
'
../
mastodon/containers/compose_container
'
).
default
;
const
ComposeContainer
=
require
(
'
mastodon/containers/compose_container
'
).
default
;
const
React
=
require
(
'
react
'
);
const
ReactDOM
=
require
(
'
react-dom
'
);
const
mountNode
=
document
.
getElementById
(
'
mastodon-compose
'
);
...
...
@@ -17,7 +17,7 @@ function loaded() {
}
function
main
()
{
const
ready
=
require
(
'
../
mastodon/ready
'
).
default
;
const
ready
=
require
(
'
mastodon/ready
'
).
default
;
ready
(
loaded
);
}
...
...
This diff is collapsed.
Click to expand it.
app/javascript/styles/mastodon/about.scss
+
1
-
1
View file @
64ee565b
...
...
@@ -164,7 +164,7 @@ $small-breakpoint: 960px;
td
{
padding
:
8px
;
align-self
:
start
;
align-items
:
start
;
align-items
:
flex-
start
;
word-break
:
break-all
;
&
.nowrap
{
...
...
This diff is collapsed.
Click to expand it.
app/javascript/styles/mastodon/components.scss
+
2
-
2
View file @
64ee565b
...
...
@@ -1758,7 +1758,7 @@ a.account__display-name {
width
:
100%
;
height
:
100%
;
display
:
flex
;
align-items
:
center
;
align-items
:
flex-
center
;
justify-content
:
center
;
flex-direction
:
column
;
scrollbar-width
:
none
;
/* Firefox */
...
...
@@ -2619,7 +2619,7 @@ a.account__display-name {
.column-actions
{
display
:
flex
;
align-items
:
start
;
align-items
:
flex-
start
;
justify-content
:
center
;
padding
:
40px
;
padding-top
:
40px
;
...
...
This diff is collapsed.
Click to expand it.
app/javascript/
packs/
two_factor_authentication.js
→
app/javascript/two_factor_authentication.js
+
3
-
3
View file @
64ee565b
import
axios
from
'
axios
'
;
import
*
as
WebAuthnJSON
from
'
@github/webauthn-json
'
;
import
ready
from
'
../mastodon/ready
'
;
import
'
regenerator-runtime/runtime
'
;
import
*
as
WebAuthnJSON
from
'
@github/webauthn-json
'
;
import
axios
from
'
axios
'
;
import
ready
from
'
mastodon/ready
'
;
function
getCSRFToken
()
{
var
CSRFSelector
=
document
.
querySelector
(
'
meta[name="csrf-token"]
'
);
...
...
This diff is collapsed.
Click to expand it.
app/serializers/manifest_serializer.rb
+
1
-
1
View file @
64ee565b
...
...
@@ -32,7 +32,7 @@ class ManifestSerializer < ActiveModel::Serializer
def
icons
ICON_SIZES
.
map
do
|
size
|
{
src:
full_pack_url
(
"
media/icons
/android-chrome-
#{
size
}
x
#{
size
}
.png"
),
src:
full_pack_url
(
"
static
/android-chrome-
#{
size
}
x
#{
size
}
.png"
),
sizes:
"
#{
size
}
x
#{
size
}
"
,
type:
'image/png'
,
}
...
...
This diff is collapsed.
Click to expand it.
app/serializers/rest/instance_serializer.rb
+
1
-
1
View file @
64ee565b
...
...
@@ -39,7 +39,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
end
def
thumbnail
instance_presenter
.
thumbnail
?
full_asset_url
(
instance_presenter
.
thumbnail
.
file
.
url
)
:
full_pack_url
(
'
media/images
/preview.png'
)
instance_presenter
.
thumbnail
?
full_asset_url
(
instance_presenter
.
thumbnail
.
file
.
url
)
:
full_pack_url
(
'
static
/preview.png'
)
end
def
stats
...
...
This diff is collapsed.
Click to expand it.
app/views/about/more.html.haml
+
2
-
2
View file @
64ee565b
...
...
@@ -9,7 +9,7 @@
.column-0
.public-account-header.public-account-header--no-bar
.public-account-header__image
=
image_tag
@instance_presenter
.
hero
&
.
file
&
.
url
||
@instance_presenter
.
thumbnail
&
.
file
&
.
url
||
asset_pack_path
(
'
media/images
/preview.png'
),
alt:
@instance_presenter
.
site_title
,
class:
'parallax'
=
image_tag
@instance_presenter
.
hero
&
.
file
&
.
url
||
@instance_presenter
.
thumbnail
&
.
file
&
.
url
||
asset_pack_path
(
'
static
/preview.png'
),
alt:
@instance_presenter
.
site_title
,
class:
'parallax'
.column-1
.landing-page__call-to-action
{
dir:
'ltr'
}
...
...
@@ -25,7 +25,7 @@
%span
=
t
'about.status_count_after'
,
count:
@instance_presenter
.
status_count
.row__mascot
.landing-page__mascot
=
image_tag
@instance_presenter
.
mascot
&
.
file
&
.
url
||
asset_pack_path
(
'
media/images
/elephant_ui_plane.svg'
),
alt:
''
=
image_tag
@instance_presenter
.
mascot
&
.
file
&
.
url
||
asset_pack_path
(
'
static
/elephant_ui_plane.svg'
),
alt:
''
.column-2
.contact-widget
...
...
This diff is collapsed.
Click to expand it.
app/views/about/show.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -53,7 +53,7 @@
.hero-widget
.hero-widget__img
=
image_tag
@instance_presenter
.
hero
&
.
file
&
.
url
||
@instance_presenter
.
thumbnail
&
.
file
&
.
url
||
asset_pack_path
(
'
media/images
/preview.png'
),
alt:
@instance_presenter
.
site_title
=
image_tag
@instance_presenter
.
hero
&
.
file
&
.
url
||
@instance_presenter
.
thumbnail
&
.
file
&
.
url
||
asset_pack_path
(
'
static
/preview.png'
),
alt:
@instance_presenter
.
site_title
.hero-widget__text
%p
...
...
This diff is collapsed.
Click to expand it.
app/views/application/_sidebar.html.haml
+
1
-
1
View file @
64ee565b
.hero-widget
.hero-widget__img
=
image_tag
@instance_presenter
.
hero
&
.
file
&
.
url
||
@instance_presenter
.
thumbnail
&
.
file
&
.
url
||
asset_pack_path
(
'
media/images
/preview.png'
),
alt:
@instance_presenter
.
site_title
=
image_tag
@instance_presenter
.
hero
&
.
file
&
.
url
||
@instance_presenter
.
thumbnail
&
.
file
&
.
url
||
asset_pack_path
(
'
static
/preview.png'
),
alt:
@instance_presenter
.
site_title
.hero-widget__text
%p
=
@instance_presenter
.
site_short_description
.
html_safe
.
presence
||
t
(
'about.about_mastodon_html'
)
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/application.html.haml
+
3
-
3
View file @
64ee565b
...
...
@@ -14,12 +14,12 @@
%link
{
rel:
'icon'
,
href:
'/favicon.ico'
,
type:
'image/x-icon'
}
/
-
%w(16 32 48)
.
each
do
|
size
|
%link
{
rel:
'icon'
,
sizes:
"#{size}x#{size}"
,
href:
asset_pack_path
(
"
media/icons
/favicon-#{size}x#{size}.png"
),
type:
'image/png'
}
/
%link
{
rel:
'icon'
,
sizes:
"#{size}x#{size}"
,
href:
asset_pack_path
(
"
static
/favicon-#{size}x#{size}.png"
),
type:
'image/png'
}
/
-
%w(57 60 72 76 114 120 144 152 167 180 1024)
.
each
do
|
size
|
%link
{
rel:
'apple-touch-icon'
,
sizes:
"#{size}x#{size}"
,
href:
asset_pack_path
(
"
media/icons
/apple-touch-icon-#{size}x#{size}.png"
)
}
/
%link
{
rel:
'apple-touch-icon'
,
sizes:
"#{size}x#{size}"
,
href:
asset_pack_path
(
"
static
/apple-touch-icon-#{size}x#{size}.png"
)
}
/
%link
{
rel:
'mask-icon'
,
href:
asset_pack_path
(
'
media/images
/logo-symbol-icon.svg'
),
color:
'#6364FF'
}
/
%link
{
rel:
'mask-icon'
,
href:
asset_pack_path
(
'
static
/logo-symbol-icon.svg'
),
color:
'#6364FF'
}
/
%link
{
rel:
'manifest'
,
href:
manifest_path
(
format: :json
)
}
/
%meta
{
name:
'theme-color'
,
content:
'#6364FF'
}
/
%meta
{
name:
'apple-mobile-web-app-capable'
,
content:
'yes'
}
/
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/mailer.html.haml
+
2
-
2
View file @
64ee565b
...
...
@@ -24,7 +24,7 @@
%tr
%td
.column-cell
=
link_to
root_url
do
=
image_tag
full_pack_url
(
'
media/images
/mailer/wordmark.png'
),
alt:
'Mastodon'
,
height:
34
,
class:
'logo'
=
image_tag
full_pack_url
(
'
static
/mailer/wordmark.png'
),
alt:
'Mastodon'
,
height:
34
,
class:
'logo'
=
yield
...
...
@@ -49,4 +49,4 @@
%p
=
link_to
t
(
'application_mailer.notification_preferences'
),
settings_preferences_notifications_url
%td
.column-cell.text-right
=
link_to
root_url
do
=
image_tag
full_pack_url
(
'
media/images
/mailer/logo.png'
),
alt:
'Mastodon'
,
height:
24
=
image_tag
full_pack_url
(
'
static
/mailer/logo.png'
),
alt:
'Mastodon'
,
height:
24
This diff is collapsed.
Click to expand it.
app/views/notification_mailer/favourite.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -17,7 +17,7 @@
%tbody
%tr
%td
=
image_tag
full_pack_url
(
'
media/images
/mailer/icon_grade.png'
),
alt
:''
=
image_tag
full_pack_url
(
'
static
/mailer/icon_grade.png'
),
alt
:''
%h1
=
t
'notification_mailer.favourite.title'
%p
.lead
=
t
(
'notification_mailer.favourite.body'
,
name:
@account
.
pretty_acct
)
...
...
This diff is collapsed.
Click to expand it.
app/views/notification_mailer/follow.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -17,7 +17,7 @@
%tbody
%tr
%td
=
image_tag
full_pack_url
(
'
media/images
/mailer/icon_person_add.png'
),
alt:
''
=
image_tag
full_pack_url
(
'
static
/mailer/icon_person_add.png'
),
alt:
''
%h1
=
t
'notification_mailer.follow.title'
%p
.lead
=
t
(
'notification_mailer.follow.body'
,
name:
@account
.
pretty_acct
)
...
...
This diff is collapsed.
Click to expand it.
app/views/notification_mailer/follow_request.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -17,7 +17,7 @@
%tbody
%tr
%td
=
image_tag
full_pack_url
(
'
media/images
/mailer/icon_person_add.png'
),
alt:
''
=
image_tag
full_pack_url
(
'
static
/mailer/icon_person_add.png'
),
alt:
''
%h1
=
t
'notification_mailer.follow_request.title'
%p
.lead
=
t
(
'notification_mailer.follow_request.body'
,
name:
@account
.
pretty_acct
)
...
...
This diff is collapsed.
Click to expand it.
app/views/notification_mailer/mention.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -17,7 +17,7 @@
%tbody
%tr
%td
=
image_tag
full_pack_url
(
'
media/images
/mailer/icon_reply.png'
),
alt:
''
=
image_tag
full_pack_url
(
'
static
/mailer/icon_reply.png'
),
alt:
''
%h1
=
t
'notification_mailer.mention.title'
%p
.lead
=
t
(
'notification_mailer.mention.body'
,
name:
@status
.
account
.
pretty_acct
)
...
...
This diff is collapsed.
Click to expand it.
app/views/notification_mailer/reblog.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -17,7 +17,7 @@
%tbody
%tr
%td
=
image_tag
full_pack_url
(
'
media/images
/mailer/icon_cached.png'
),
alt:
''
=
image_tag
full_pack_url
(
'
static
/mailer/icon_cached.png'
),
alt:
''
%h1
=
t
'notification_mailer.reblog.title'
%p
.lead
=
t
(
'notification_mailer.reblog.body'
,
name:
@account
.
pretty_acct
)
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/_og.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -8,7 +8,7 @@
=
opengraph
'og:type'
,
'website'
=
opengraph
'og:title'
,
@instance_presenter
.
site_title
=
opengraph
'og:description'
,
description
=
opengraph
'og:image'
,
full_asset_url
(
thumbnail
&
.
file
&
.
url
||
asset_pack_path
(
'
media/images
/preview.png'
,
protocol: :request
))
=
opengraph
'og:image'
,
full_asset_url
(
thumbnail
&
.
file
&
.
url
||
asset_pack_path
(
'
static
/preview.png'
,
protocol: :request
))
=
opengraph
'og:image:width'
,
thumbnail
?
thumbnail
.
meta
[
'width'
]
:
'1200'
=
opengraph
'og:image:height'
,
thumbnail
?
thumbnail
.
meta
[
'height'
]
:
'630'
=
opengraph
'twitter:card'
,
'summary_large_image'
This diff is collapsed.
Click to expand it.
app/views/user_mailer/appeal_approved.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -17,7 +17,7 @@
%tbody
%tr
%td
=
image_tag
full_pack_url
(
'
media/images
/mailer/icon_done.png'
),
alt:
''
=
image_tag
full_pack_url
(
'
static
/mailer/icon_done.png'
),
alt:
''
%h1
=
t
'user_mailer.appeal_approved.title'
...
...
This diff is collapsed.
Click to expand it.
app/views/user_mailer/appeal_rejected.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -17,7 +17,7 @@
%tbody
%tr
%td
=
image_tag
full_pack_url
(
'
media/images
/mailer/icon_warning.png'
),
alt:
''
=
image_tag
full_pack_url
(
'
static
/mailer/icon_warning.png'
),
alt:
''
%h1
=
t
'user_mailer.appeal_rejected.title'
...
...
This diff is collapsed.
Click to expand it.
app/views/user_mailer/backup_ready.html.haml
+
1
-
1
View file @
64ee565b
...
...
@@ -17,7 +17,7 @@
%tbody
%tr
%td
=
image_tag
full_pack_url
(
'
media/images
/mailer/icon_file_download.png'
),
alt:
''
=
image_tag
full_pack_url
(
'
static
/mailer/icon_file_download.png'
),
alt:
''
%h1
=
t
'user_mailer.backup_ready.title'
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment