From 522aab54d86b7904344afbf1300349e8cbe581ad Mon Sep 17 00:00:00 2001 From: Brian Lovin Date: Sat, 2 Mar 2019 10:14:22 -0500 Subject: [PATCH 1/6] Dont post links about new threads in private channels to watercooler --- api/mutations/thread/publishThread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/mutations/thread/publishThread.js b/api/mutations/thread/publishThread.js index bb34a8695c..ef8d1afb03 100644 --- a/api/mutations/thread/publishThread.js +++ b/api/mutations/thread/publishThread.js @@ -348,7 +348,7 @@ export default requireAuth( await createParticipantInThread(dbThread.id, user.id); // Post a new message with a link to the new thread to the watercooler thread if one exists - if (community.watercoolerId) { + if (community.watercoolerId && !channel.isPrivate) { const identifier = user.username ? `@${user.username}` : user.name; const sentence = Array.isArray(usersPreviousPublishedThreads) && From c049d085ed52368bac7e6f9c91189fe85ed7919c Mon Sep 17 00:00:00 2001 From: Brian Lovin Date: Sat, 2 Mar 2019 10:34:22 -0500 Subject: [PATCH 2/6] Hotfix bad var --- src/views/dashboard/components/inboxThread/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/dashboard/components/inboxThread/index.js b/src/views/dashboard/components/inboxThread/index.js index d967637810..1cf8848051 100644 --- a/src/views/dashboard/components/inboxThread/index.js +++ b/src/views/dashboard/components/inboxThread/index.js @@ -49,6 +49,7 @@ class InboxThread extends React.Component { active, viewContext = null, currentUser, + location, } = this.props; const isInbox = From bf1a55af3797ef50b2ffe10ed5cf1ecad33e0608 Mon Sep 17 00:00:00 2001 From: Brian Lovin Date: Sat, 2 Mar 2019 10:38:59 -0500 Subject: [PATCH 3/6] Make the composer and overlay full height --- src/components/composer/style.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/composer/style.js b/src/components/composer/style.js index e6a1f0c76c..7ba413fb3d 100644 --- a/src/components/composer/style.js +++ b/src/components/composer/style.js @@ -25,12 +25,8 @@ export const DropImageOverlay = (props: { visible: boolean }) => { export const Wrapper = styled.div` position: absolute; width: 100vw; - height: calc(100vh - 48px); + height: 100vh; bottom: 0; - - @media (max-width: 768px) { - height: 100vh; - } `; export const DropImageOverlayWrapper = styled.div` @@ -65,7 +61,7 @@ export const Overlay = styled.div` props.slider && css` position: fixed; - top: 48px; + top: 0; left: 0; right: 0; bottom: 0; @@ -87,7 +83,7 @@ export const Container = styled(FlexCol)` align-self: stretch; flex: auto; overflow: hidden; - height: ${props => (props.isSlider ? '100vh' : 'calc(100vh - 48px)')}; + height: 100vh; position: relative; z-index: ${zIndex.composer}; @@ -98,7 +94,7 @@ export const Container = styled(FlexCol)` position: absolute; width: 650px; top: 0; - height: 100%; + height: 100vh; `} @media (max-width: 768px) { From 210ed5756483b1dc81718653c4129ffd77735c80 Mon Sep 17 00:00:00 2001 From: Brian Lovin Date: Sat, 2 Mar 2019 10:40:04 -0500 Subject: [PATCH 4/6] Keep navbar height the same on desktop app --- src/views/navbar/style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/navbar/style.js b/src/views/navbar/style.js index 09b7edd44c..eed94b77a8 100644 --- a/src/views/navbar/style.js +++ b/src/views/navbar/style.js @@ -13,7 +13,7 @@ export const Nav = styled.nav` grid-template-areas: 'logo home messages explore . notifications profile'; align-items: stretch; width: 100%; - flex: 0 0 ${isDesktopApp() ? '38px' : '48px'}; + flex: 0 0 48px; padding: 0 16px; line-height: 1; box-shadow: 0 4px 8px ${({ theme }) => hexa(theme.bg.reverse, 0.15)}; From ca3d51c7552c4d24adebc6e273f580b16e5dc20e Mon Sep 17 00:00:00 2001 From: Brian Lovin Date: Sat, 2 Mar 2019 10:40:16 -0500 Subject: [PATCH 5/6] Make thread sliding header same height as inbox thread search area --- src/views/thread/style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/thread/style.js b/src/views/thread/style.js index f94b29e08b..9f023829d5 100644 --- a/src/views/thread/style.js +++ b/src/views/thread/style.js @@ -466,7 +466,7 @@ export const CommunityHeader = styled.div` display: ${props => (props.hide ? 'none' : 'flex')}; align-items: center; justify-content: space-between; - padding: 16px 32px; + padding: 11px 32px; box-shadow: ${Shadow.low} ${props => hexa(props.theme.bg.reverse, 0.15)}; flex: 0 0 64px; align-self: stretch; From 400a4bcc2e948394020493cf161eb7cec69bdf13 Mon Sep 17 00:00:00 2001 From: Brian Lovin Date: Sat, 2 Mar 2019 10:45:10 -0500 Subject: [PATCH 6/6] 2.8.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40e586c451..2fe528e05a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Spectrum", - "version": "2.8.0", + "version": "2.8.1", "license": "BSD-3-Clause", "devDependencies": { "@babel/preset-flow": "^7.0.0",