sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
This commit is contained in:
Thibaut Girka 2020-01-04 22:54:06 +01:00
commit 01eaeab56d
72 changed files with 708 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/styles/mastodon/components.scss
View file

@ -6399,13 +6399,13 @@ noscript {
&__links {
font-size: 14px;
color: $darker-text-color;
padding: 10px 0;
a {
display: inline-block;
color: $darker-text-color;
text-decoration: none;
padding: 10px;
padding-top: 20px;
padding: 5px 10px;
font-weight: 500;
strong {