From 43c86ff85c6f12b74f5cb6d42e5fb63725d6f755 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Oct 2021 11:20:41 -0500 Subject: [PATCH] BetterColumn: remove ColumnBackButton, fix border-bottom --- app/soapbox/features/ui/components/better_column.js | 2 -- app/styles/components/columns.scss | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/ui/components/better_column.js b/app/soapbox/features/ui/components/better_column.js index 9bcbf2783..6d7e6e609 100644 --- a/app/soapbox/features/ui/components/better_column.js +++ b/app/soapbox/features/ui/components/better_column.js @@ -2,7 +2,6 @@ import React from 'react'; import ColumnHeader from './column_header'; import PropTypes from 'prop-types'; import Column from 'soapbox/components/column'; -import ColumnBackButton from '../../../components/column_back_button_slim'; import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; // Yes, there are 3 types of columns at this point, but this one is better, I swear @@ -29,7 +28,6 @@ export default class BetterColumn extends React.PureComponent { )} - {children} diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss index bfae65e52..2748bab91 100644 --- a/app/styles/components/columns.scss +++ b/app/styles/components/columns.scss @@ -772,6 +772,11 @@ .column__top { display: flex; align-items: center; + border-bottom: 1px solid hsla(var(--primary-text-color_hsl), 0.2); + + .sub-navigation { + border-bottom: 0; + } } .column-header {