From 42a7a61ce78fb690b7961e834dfc8e1bc18465ca Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Mon, 10 Aug 2020 15:05:24 -0500 Subject: [PATCH] border radius fixes --- .../status/components/detailed_status.js | 4 +++- app/styles/application.scss | 1 + app/styles/components/account-header.scss | 2 +- app/styles/overflow_hacks.scss | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 app/styles/overflow_hacks.scss diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index 4da17ba99..0564ed617 100644 --- a/app/soapbox/features/status/components/detailed_status.js +++ b/app/soapbox/features/status/components/detailed_status.js @@ -189,7 +189,9 @@ export default class DetailedStatus extends ImmutablePureComponent { - + { profileCardVisible && + + } {status.get('group') && ( diff --git a/app/styles/application.scss b/app/styles/application.scss index c42cff3e4..7c2cd14b8 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -27,6 +27,7 @@ @import 'dyslexic'; @import 'demetricator'; @import 'pro'; +@import 'overflow_hacks'; // COMPONENTS @import 'components/buttons'; diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss index 930a1fd3f..0a112f469 100644 --- a/app/styles/components/account-header.scss +++ b/app/styles/components/account-header.scss @@ -201,7 +201,7 @@ @media screen and (max-width: 895px) { .account-mobile-container { display: block; - background: var(--accent-color--faint); + background: var(--background-color); margin-top: 10px; position: relative; padding: 10px 10px 0; diff --git a/app/styles/overflow_hacks.scss b/app/styles/overflow_hacks.scss new file mode 100644 index 000000000..049d44157 --- /dev/null +++ b/app/styles/overflow_hacks.scss @@ -0,0 +1,16 @@ +// This is a file dedicated to fixing the css we broke by introducing the hover +// card and `overflow:visible` on drawer.scss line 23. If we ever figure out how +// to pop the hover card out while keeping `overflow:hidden`, feel free to delete +// this entire file. + +button.column-header__button.active { + border-radius: 0 10px 0 0; +} + +.column-back-button.column-back-button--slim-button { + border-radius: 0 10px 0 0; +} + +.detailed-status__wrapper .detailed-status__action-bar { + border-radius: 0; +}