Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ondřej Hruška
2017-10-11 21:27:17 +02:00
12 changed files with 64 additions and 39 deletions

View File

@@ -29,8 +29,7 @@ body {
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", mastodon-font-sans-serif, sans-serif;
}
&.app-body,
&.error {
&.app-body {
position: fixed;
width: 100%;
height: 100%;
@@ -70,25 +69,34 @@ body {
}
&.error {
position: absolute;
text-align: center;
color: $ui-primary-color;
padding: 20px;
background: $ui-base-color;
width: 100%;
height: 100%;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
.dialog img {
display: block;
max-width: 470px;
width: 100%;
height: auto;
margin-top: -120px;
}
.dialog {
vertical-align: middle;
margin: 20px;
.dialog h1 {
font-size: 20px;
line-height: 28px;
font-weight: 400;
img {
display: block;
max-width: 470px;
width: 100%;
height: auto;
margin-top: -120px;
}
h1 {
font-size: 20px;
line-height: 28px;
font-weight: 400;
}
}
}
}