mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-12 05:53:14 -08:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
This commit is contained in:
Thibaut Girka 2019-03-14 17:14:05 +01:00
commit 07eb31eeac
103 changed files with 523 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/styles/mastodon/admin.scss
View file

@ -705,3 +705,11 @@ a.name-tag,
overflow: hidden;
text-overflow: ellipsis;
}
.ellipsized-ip {
display: inline-block;
max-width: 120px;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: middle;
}

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

@ -82,6 +82,10 @@
}
}
}
&--invites tbody td {
vertical-align: middle;
}
}
.table-wrapper {