Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
This commit is contained in:
Thibaut Girka 2019-09-18 17:25:56 +02:00
commit 5cadb47238
180 changed files with 1537 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/styles/mastodon/accounts.scss
View file

@ -224,6 +224,7 @@
}
.account__header__fields {
max-width: 100vw;
padding: 0;
margin: 15px -15px -15px;
border: 0 none;

3
app/javascript/styles/mastodon/polls.scss
View file

@ -79,6 +79,9 @@
top: -1px;
border-radius: 50%;
vertical-align: middle;
margin-top: auto;
margin-bottom: auto;
flex: 0 0 18px;
&.checkbox {
border-radius: 4px;