Merge pull request #4785 from withspectrum/2.8.1

2.8.1

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) &&

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",

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) {

src/views/dashboard/components/inboxThread/index.js

@@ -49,6 +49,7 @@ class InboxThread extends React.Component<Props> {
       active,
       viewContext = null,
       currentUser,
+      location,
     } = this.props;
 
     const isInbox =

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)};

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;