diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js index d972cb4e4..f4a8ef051 100644 --- a/app/soapbox/features/ui/index.js +++ b/app/soapbox/features/ui/index.js @@ -656,7 +656,7 @@ class UI extends React.PureComponent { render() { const { streamingUrl } = this.props; const { draggingOver, mobile } = this.state; - const { intl, children, isComposing, location, dropdownMenuIsOpen, me, layouts } = this.props; + const { intl, children, location, dropdownMenuIsOpen, me, layouts } = this.props; if (me === null || !streamingUrl) return null; @@ -692,7 +692,6 @@ class UI extends React.PureComponent { const floatingActionButton = this.shouldHideFAB() ? null : fabElem; const classnames = classNames('ui', { - 'is-composing': isComposing, 'ui--chatroom': this.isChatRoomLocation(), }); diff --git a/app/styles/application.scss b/app/styles/application.scss index a8cf79ba9..611eef9c4 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -56,7 +56,6 @@ @import 'components/search'; @import 'components/react-toggle'; @import 'components/getting-started'; -@import 'components/navigation-bar'; @import 'components/promo-panel'; @import 'components/drawer'; @import 'components/still-image'; diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss index a48fb87d5..0beae81af 100644 --- a/app/styles/components/columns.scss +++ b/app/styles/components/columns.scss @@ -128,7 +128,6 @@ } .account__header__bar { padding: 5px 10px; } - .navigation-bar, .compose-form { padding: 15px; } diff --git a/app/styles/components/navigation-bar.scss b/app/styles/components/navigation-bar.scss deleted file mode 100644 index ebe402970..000000000 --- a/app/styles/components/navigation-bar.scss +++ /dev/null @@ -1,138 +0,0 @@ -.navigation-bar { - padding: 10px; - display: flex; - align-items: center; - flex-shrink: 0; - cursor: default; - color: var(--primary-text-color--faint); - - strong { - color: var(--primary-text-color--faint); - } - - a { - color: inherit; - } - - .permalink { - text-decoration: none; - } - - .navigation-bar__actions { - position: relative; - - .icon-button.close { - position: absolute; - pointer-events: none; - transform: scale(0, 1) translate(-100%, 0); - opacity: 0; - } - - .compose__action-bar .icon-button { - pointer-events: auto; - transform: scale(1, 1) translate(0, 0); - opacity: 1; - } - } -} - -.navigation-bar__profile { - flex: 1 1 auto; - margin-left: 8px; - line-height: 20px; - margin-top: -1px; - overflow: hidden; -} - -.navigation-bar__profile-account { - display: block; - font-weight: 500; - overflow: hidden; - text-overflow: ellipsis; -} - -.navigation-bar__profile-edit { - color: inherit; - text-decoration: none; -} - -@media screen and (max-width: 630px) and (max-height: 400px) { - $duration: 400ms; - $delay: 100ms; - - .tabs-bar, - .search { - will-change: margin-top; - transition: margin-top $duration $delay; - } - - .navigation-bar { - will-change: padding-bottom; - transition: padding-bottom $duration $delay; - } - - .navigation-bar { - & > a:first-child { - will-change: margin-top, margin-left, margin-right, width; - transition: margin-top $duration $delay, margin-left $duration ($duration + $delay), margin-right $duration ($duration + $delay); - } - - & > .navigation-bar__profile-edit { - will-change: margin-top; - transition: margin-top $duration $delay; - } - - .navigation-bar__actions { - & > .icon-button.close { - will-change: opacity transform; - transition: opacity $duration * 0.5 $delay, - transform $duration $delay; - } - - & > .compose__action-bar .icon-button { - will-change: opacity transform; - transition: opacity $duration * 0.5 $delay + $duration * 0.5, - transform $duration $delay; - } - } - } - - .is-composing { - .tabs-bar, - .search { - margin-top: -50px; - } - - .navigation-bar { - padding-bottom: 0; - - & > a:first-child { - margin: -100px 10px 0 -50px; - } - - .navigation-bar__profile { - padding-top: 2px; - } - - .navigation-bar__profile-edit { - position: absolute; - margin-top: -60px; - } - - .navigation-bar__actions { - .icon-button.close { - pointer-events: auto; - opacity: 1; - transform: scale(1, 1) translate(0, 0); - bottom: 5px; - } - - .compose__action-bar .icon-button { - pointer-events: none; - opacity: 0; - transform: scale(0, 1) translate(100%, 0); - } - } - } - } -} diff --git a/app/styles/rtl.scss b/app/styles/rtl.scss index d1351b7f1..051d0e82d 100644 --- a/app/styles/rtl.scss +++ b/app/styles/rtl.scss @@ -18,11 +18,6 @@ body.rtl { margin-left: 4px; } - .navigation-bar__profile { - margin-left: 0; - margin-right: 8px; - } - .search__input { padding-right: 10px; padding-left: 30px;