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.

Sign up for GitHub

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

lint #1155

Merged
merged 4 commits into from
Feb 9, 2023
Merged

lint #1155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15d46f3
lint
pinfort Feb 7, 2023
84748e2
lint
pinfort Feb 7, 2023
53ec501
lint
pinfort Feb 7, 2023
ddca072
add mastodon japan
pinfort Feb 9, 2023
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
Prev Previous commit
add mastodon japan
  • Loading branch information
@pinfort
pinfort committed Feb 9, 2023
commit ddca0726ee084cb347a99241b6eb618d89aad2d4
6 changes: 6 additions & 0 deletions app/javascript/area_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@
"instance-name": "fedibird",
"instance-short-name": "FD",
"instance-eng-name": "remote-fedibird"
},

"mastodon-japan.net": {
"instance-name": "mastodon-japan",
"instance-short-name": "MJ",
"instance-eng-name": "remote-mastodon-japan"
}
},
"instance-areas":
Expand Down
15 changes: 15 additions & 0 deletions app/javascript/styles/custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@
color: #000000;
}

.account__header__area-remote-mastodon-japan {
@include header-2eng-area;

background-color: rgba(200, 200, 200, 90%);
color: #000000;
}

@mixin avatar-area() {
will-change: transform;
font-size: 15px;
Expand Down Expand Up @@ -307,6 +314,14 @@
color: #000000;
}

.account__avatar__area-remote-mastodon-japan {
@include avatar-2eng-area;

margin: 0;
background-color: rgba(200, 200, 200, 90%);
color: #000000;
}

.setting-select {
color: $primary-text-color;
border: none;
Expand Down