aboutsummaryrefslogtreecommitdiff
path: root/src/App.scss
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-09-09 11:59:49 +0000
committerkaniini <nenolod@gmail.com>2018-09-09 11:59:49 +0000
commited6abeacadc2bced05f3221b2c57ba488f0ae800 (patch)
treea27025296b5f54d307b3448571260b2624c869b2 /src/App.scss
parent369fd648f6dfee51f7fec269e5f5cb530f2ca3d6 (diff)
parent5726be68307f0215470d2e5baea105718b5039fe (diff)
Merge branch 'post-polish-fixes' into 'develop'
Post polish fixes See merge request pleroma/pleroma-fe!333
Diffstat (limited to 'src/App.scss')
-rw-r--r--src/App.scss27
1 files changed, 24 insertions, 3 deletions
diff --git a/src/App.scss b/src/App.scss
index dd43c5ca..056a235e 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -248,6 +248,7 @@ nav {
justify-content: center;
flex: 0 0 auto;
z-index: -1;
+
.mask {
mask-repeat: no-repeat;
mask-position: center;
@@ -260,7 +261,10 @@ nav {
left: 0;
right: 0;
}
+
img {
+ height: 100%;
+ object-fit: contain;
display: block;
flex: 0;
}
@@ -325,18 +329,35 @@ main-router {
background-size: cover;
padding: .6em .6em;
text-align: left;
- font-size: 1.3em;
- line-height: 24px;
+ line-height: 28px;
background-color: $fallback--btn;
background-color: var(--btn, $fallback--btn);
align-items: baseline;
.title {
flex: 1 0 auto;
+ font-size: 1.3em;
+ }
+
+ .alert {
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow-x: hidden;
}
button {
- height: 100%;
+ flex-shrink: 0;
+ }
+
+ button, .alert {
+ // height: 100%;
+ line-height: 21px;
+ min-height: 0;
+ box-sizing: border-box;
+ margin: 0;
+ margin-left: .25em;
+ min-width: 1px;
+ align-self: stretch;
}
}