diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-04-07 17:40:07 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-04-07 17:40:07 +0000 |
| commit | 8b96ea93776fd1eb462a7c54822d4f8ad6a9e776 (patch) | |
| tree | 002a88cdb6e25ea3177b712bc3cdc05a085f19e5 /src/App.scss | |
| parent | 4e3c4ec1dbbf88b09a84a80519f4ccced5a4dc2c (diff) | |
| parent | 5c064ccf553ffcd3286ad1b3305633c5c4c4c0c4 (diff) | |
Merge branch 'settings-import-export' into 'develop'
Settings backup/restore + small fixes
See merge request pleroma/pleroma-fe!1372
Diffstat (limited to 'src/App.scss')
| -rw-r--r-- | src/App.scss | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/App.scss b/src/App.scss index f860c16d..7cb92fc9 100644 --- a/src/App.scss +++ b/src/App.scss @@ -547,9 +547,21 @@ main-router { border-radius: var(--panelRadius, $fallback--panelRadius); } -.panel-footer { +/* TODO Should remove timeline-footer from here when we refactor panels into + * separate component and utilize slots + */ +.panel-footer, .timeline-footer { + display: flex; border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius; border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius); + flex: none; + padding: 0.6em 0.6em; + text-align: left; + line-height: 28px; + align-items: baseline; + border-width: 1px 0 0 0; + border-style: solid; + border-color: var(--border, $fallback--border); .faint { color: $fallback--faint; @@ -871,16 +883,10 @@ nav { } .new-status-notification { - position:relative; - margin-top: -1px; + position: relative; font-size: 1.1em; - border-width: 1px 0 0 0; - border-style: solid; - border-color: var(--border, $fallback--border); - padding: 10px; z-index: 1; - background-color: $fallback--fg; - background-color: var(--panel, $fallback--fg); + flex: 1; } .chat-layout { |