From a872c53472a46973a18808254f9d812b074bb0ee Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 24 May 2020 02:29:09 +0300 Subject: [PATCH] misc fixes --- .../tabs/mutes_and_blocks_tab.scss | 29 ++++++++++++++++ src/components/tab_switcher/tab_switcher.scss | 33 ++++++++++--------- 2 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 src/components/settings_modal/tabs/mutes_and_blocks_tab.scss diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss b/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss new file mode 100644 index 00000000..ceb64efb --- /dev/null +++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss @@ -0,0 +1,29 @@ +.mutes-and-blocks-tab { + height: 100%; + + .usersearch-wrapper { + padding: 1em; + } + + .bulk-actions { + text-align: right; + padding: 0 1em; + min-height: 28px; + } + + .bulk-action-button { + width: 10em + } + + .domain-mute-form { + padding: 1em; + display: flex; + flex-direction: column + } + + .domain-mute-button { + align-self: flex-end; + margin-top: 1em; + width: 10em + } +} diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss index c9050781..f994380f 100644 --- a/src/components/tab_switcher/tab_switcher.scss +++ b/src/components/tab_switcher/tab_switcher.scss @@ -61,14 +61,22 @@ overflow-x: hidden; flex-direction: column; &::after { - content: ''; flex: 1 1 auto; + } + &::before { + flex: 0 0 auto; + height: 0.5em; + } + &::after, &::before { + content: ''; border-right: 1px solid; border-right-color: $fallback--border; border-right-color: var(--border, $fallback--border); } .tab-wrapper { min-width: 10em; + display: flex; + flex-direction: column; &:not(.active)::after { top: 0; right: 0; @@ -77,14 +85,21 @@ border-right-color: $fallback--border; border-right-color: var(--border, $fallback--border); } + &::before { + flex: 0 0 6px; + content: ''; + border-right: 1px solid; + border-right-color: $fallback--border; + border-right-color: var(--border, $fallback--border); + } &:last-child .tab { margin-bottom: 0; } } + .tab { + flex: 1; box-sizing: content-box; - width: 100%; - margin-bottom: 5px; min-width: 10em; min-width: 1px; border-top-right-radius: 0; @@ -105,18 +120,6 @@ border-right-color: var(--border, $fallback--border); } } - .tab { - box-sizing: content-box; - width: 100%; - margin-bottom: 5px; - min-width: 10em; - min-width: 1px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - // padding-right: 200px; - // margin-right: 6px - 200px; - margin-left: 6px; - } } }