weyoume · deworben · Nov 22, 2018 · Nov 22, 2018 · Nov 22, 2018 · Nov 22, 2018
diff --git a/.babelrc b/.babelrc
diff --git a/.editorconfig b/.editorconfig
diff --git a/.env b/.env
@@ -5,10 +5,10 @@ BRAND='weyoume'
 DOMAIN='io'
 # SUBDOMAIN_PARSED=$(if [ ! -z "$SUBDOMAIN" ] ; then echo $SUBDOMAIN'.' ; fi)
 # URL=$CLIENT_PROTOCOL$SUBDOMAIN_PARSED$BRAND'.'$DOMAIN
-URL=https://alpha.weyoume.io
-AUTH_API_CLIENT_ID=alpha.weyoume
+URL=https://alpha.weyoume.io 
+AUTH_API_CLIENT_ID=bendev
 # AUTH_API_REDIRECT_URL=$URL':'$SSR_PORT'/callback'
-AUTH_API_REDIRECT_URL=https://alpha.weyoume.io/callback
+AUTH_API_REDIRECT_URL=https://alpha.weyoume.io/callback 
 API_URL=https://node.weyoume.io
 WSS_API_URL=wss://node.weyoume.io
 SIGNUP_URL=https://auth.weyoume.io/register

diff --git a/.env.example b/.env.example
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.gitignore b/.gitignore
diff --git a/.prettierignore b/.prettierignore
diff --git a/.prettierrc.js b/.prettierrc.js
diff --git a/.storybook/config.js b/.storybook/config.js
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
diff --git a/CODEOWNERS b/CODEOWNERS
diff --git a/Dockerfile b/Dockerfile
diff --git a/LICENSE b/LICENSE
diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
diff --git a/app.json b/app.json
diff --git a/circle.yml b/circle.yml
diff --git a/crowdin.yaml b/crowdin.yaml
diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
diff --git a/docs/_config.yml b/docs/_config.yml
diff --git a/ecosystem.config.js b/ecosystem.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,8 +27,8 @@
     "eslint-autofix": "eslint --fix \"src/**/*.js\"",
     "heroku-prebuild": "npm i -g pm2 && pm2 install pm2-logrotate",
     "heroku-postbuild": "npm run build",
-    "push": "git add . ; git commit -m 'ready' ; git push origin master",
-    "pull": "git pull origin master"
+    "push": "git add . ; git commit -m 'ready' ; git push origin devBen",
+    "pull": "git pull origin devBen"
   },
   "husky": {
     "hooks": {}
@@ -80,7 +80,6 @@
     "react-dropzone": "^4.1.3",
     "react-helmet": "^5.0.2",
     "react-highcharts": "^15.0.0",
-    "react-hot-loader": "^4.1.2",
     "react-hotkeys": "^0.10.0",
     "react-image-lightbox": "^4.0.0",
     "react-infinite-scroller": "^1.0.15",
@@ -144,6 +143,7 @@
     "minimatch": "^3.0.4",
     "postcss-loader": "^2.1.4",
     "prettier": "^1.9.2",
+    "react-hot-loader": "^4.5.1",
     "start-server-webpack-plugin": "^2.2.5",
     "style-loader": "^0.21.0",
     "sw-precache-webpack-plugin": "^0.11.5",

diff --git a/public/.DS_Store b/public/.DS_Store
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/fonts/SourceSansPro-Regular.otf.woff b/public/fonts/SourceSansPro-Regular.otf.woff
diff --git a/public/fonts/Whitney.woff b/public/fonts/Whitney.woff
diff --git a/public/fonts/WhitneyBold.woff b/public/fonts/WhitneyBold.woff
diff --git a/public/fonts/WhitneyMedium.woff b/public/fonts/WhitneyMedium.woff
diff --git a/public/images/.DS_Store b/public/images/.DS_Store
diff --git a/public/images/banner.svg b/public/images/banner.svg
diff --git a/public/images/dollar.png b/public/images/dollar.png
diff --git a/public/images/email-icon.svg b/public/images/email-icon.svg
diff --git a/public/images/hero-1.svg b/public/images/hero-1.svg
diff --git a/public/images/hero-2.svg b/public/images/hero-2.svg
diff --git a/public/images/hero-3.svg b/public/images/hero-3.svg
diff --git a/public/images/icons/.DS_Store b/public/images/icons/.DS_Store
diff --git a/public/images/icons/icon-128x128.png b/public/images/icons/icon-128x128.png
diff --git a/public/images/icons/icon-144x144.png b/public/images/icons/icon-144x144.png
diff --git a/public/images/icons/icon-152x152.png b/public/images/icons/icon-152x152.png
diff --git a/public/images/icons/icon-192x192.png b/public/images/icons/icon-192x192.png
diff --git a/public/images/icons/icon-384x384.png b/public/images/icons/icon-384x384.png
diff --git a/public/images/icons/icon-512x512.png b/public/images/icons/icon-512x512.png
diff --git a/public/images/icons/icon-72x72.png b/public/images/icons/icon-72x72.png
diff --git a/public/images/icons/icon-96x96.png b/public/images/icons/icon-96x96.png
diff --git a/public/images/logo-brand.png b/public/images/logo-brand.png
diff --git a/public/images/logo.png b/public/images/logo.png
diff --git a/public/index.html b/public/index.html
diff --git a/public/manifest.json b/public/manifest.json
diff --git a/scripts/build.js b/scripts/build.js
diff --git a/scripts/dev.js b/scripts/dev.js
diff --git a/scripts/eslint/eslintrc.js b/scripts/eslint/eslintrc.js
diff --git a/scripts/eslint/index.js b/scripts/eslint/index.js
diff --git a/scripts/paths.js b/scripts/paths.js
diff --git a/scripts/prettier/findFiles.js b/scripts/prettier/findFiles.js
diff --git a/scripts/prettier/index.js b/scripts/prettier/index.js
diff --git a/scripts/prettier/tasks/checkFiles.js b/scripts/prettier/tasks/checkFiles.js
diff --git a/scripts/prettier/tasks/formatFile.js b/scripts/prettier/tasks/formatFile.js
diff --git a/scripts/prettier/tasks/formatFiles.js b/scripts/prettier/tasks/formatFiles.js
diff --git a/scripts/utils/getChangedFiles.js b/scripts/utils/getChangedFiles.js
diff --git a/scripts/utils/intersect.js b/scripts/utils/intersect.js
diff --git a/setupTests.js b/setupTests.js
diff --git a/src/client/AppHost.js b/src/client/AppHost.js
diff --git a/src/client/Wrapper.js b/src/client/Wrapper.js
@@ -239,7 +239,7 @@ export default class Wrapper extends React.PureComponent {
               <Transfer />
               <PowerUpOrDown />
               <NotificationPopup />
-              <BBackTop className="primary-modal" />
+              {/* <BBackTop className="primary-modal" /> */}
             </div>
           </Layout>
         </LocaleProvider>

diff --git a/src/client/activity/Activity.js b/src/client/activity/Activity.js
diff --git a/src/client/activity/AuthorRewardMessage.js b/src/client/activity/AuthorRewardMessage.js
diff --git a/src/client/activity/CommentActionMessage.js b/src/client/activity/CommentActionMessage.js
diff --git a/src/client/activity/CustomJSONMessage.js b/src/client/activity/CustomJSONMessage.js
diff --git a/src/client/activity/UserAction.js b/src/client/activity/UserAction.js
diff --git a/src/client/activity/UserActionContents.js b/src/client/activity/UserActionContents.js
diff --git a/src/client/activity/UserActionIcon.js b/src/client/activity/UserActionIcon.js
diff --git a/src/client/activity/UserActionMessage.js b/src/client/activity/UserActionMessage.js
diff --git a/src/client/activity/UserActivity.js b/src/client/activity/UserActivity.js
diff --git a/src/client/activity/UserActivityActions-nightmode.less b/src/client/activity/UserActivityActions-nightmode.less
diff --git a/src/client/activity/UserActivityActions.js b/src/client/activity/UserActivityActions.js
diff --git a/src/client/activity/UserActivityActions.less b/src/client/activity/UserActivityActions.less
diff --git a/src/client/activity/UserActivityActionsList.js b/src/client/activity/UserActivityActionsList.js
diff --git a/src/client/activity/UserActivityActionsLoader.js b/src/client/activity/UserActivityActionsLoader.js
diff --git a/src/client/activity/UserActivitySearch-nightmode.less b/src/client/activity/UserActivitySearch-nightmode.less
diff --git a/src/client/activity/UserActivitySearch.js b/src/client/activity/UserActivitySearch.js
diff --git a/src/client/activity/UserActivitySearch.less b/src/client/activity/UserActivitySearch.less
diff --git a/src/client/activity/UserActivitySearchMessage.js b/src/client/activity/UserActivitySearchMessage.js
diff --git a/src/client/activity/VoteActionMessage.js b/src/client/activity/VoteActionMessage.js
diff --git a/src/client/app/Notification/notificationActions.js b/src/client/app/Notification/notificationActions.js
diff --git a/src/client/app/Notification/notificationReducers.js b/src/client/app/Notification/notificationReducers.js
diff --git a/src/client/app/Reblog/reblogActions.js b/src/client/app/Reblog/reblogActions.js
diff --git a/src/client/app/Reblog/reblogReducers.js b/src/client/app/Reblog/reblogReducers.js
diff --git a/src/client/app/Sidebar/LeftSidebar.js b/src/client/app/Sidebar/LeftSidebar.js
diff --git a/src/client/app/Sidebar/Navigation.js b/src/client/app/Sidebar/Navigation.js
@@ -16,7 +16,7 @@ const Navigation = ({ authenticatedUser, trendingTopicsLoading, trendingTopics }
     {/* <Topics loading={trendingTopicsLoading} topics={trendingTopics} /> */}
   </div>
 );
-
+//test
 Navigation.propTypes = {
   authenticatedUser: PropTypes.shape().isRequired,
   trendingTopicsLoading: PropTypes.bool.isRequired,

diff --git a/src/client/app/Sidebar/RightSidebar.js b/src/client/app/Sidebar/RightSidebar.js
diff --git a/src/client/app/Sidebar/UserInfo.js b/src/client/app/Sidebar/UserInfo.js
diff --git a/src/client/app/appActions.js b/src/client/app/appActions.js
diff --git a/src/client/app/appReducer.js b/src/client/app/appReducer.js
diff --git a/src/client/auth/__tests__/authReducers.js b/src/client/auth/__tests__/authReducers.js
diff --git a/src/client/auth/authActions.js b/src/client/auth/authActions.js
diff --git a/src/client/auth/authReducer.js b/src/client/auth/authReducer.js
diff --git a/src/client/auth/requiresLogin.js b/src/client/auth/requiresLogin.js
diff --git a/src/client/auth/withAuthActions.js b/src/client/auth/withAuthActions.js
diff --git a/src/client/blockchainAPI.js b/src/client/blockchainAPI.js
diff --git a/src/client/bookmarks/Bookmarks.js b/src/client/bookmarks/Bookmarks.js
diff --git a/src/client/bookmarks/bookmarksActions.js b/src/client/bookmarks/bookmarksActions.js
diff --git a/src/client/bookmarks/bookmarksReducer.js b/src/client/bookmarks/bookmarksReducer.js
diff --git a/src/client/comments/Comments.js b/src/client/comments/Comments.js
diff --git a/src/client/comments/Comments.less b/src/client/comments/Comments.less
diff --git a/src/client/comments/__tests__/commentsReducer.js b/src/client/comments/__tests__/commentsReducer.js
diff --git a/src/client/comments/commentsActions.js b/src/client/comments/commentsActions.js
diff --git a/src/client/comments/commentsReducer.js b/src/client/comments/commentsReducer.js
diff --git a/src/client/components/Avatar-nightmode.less b/src/client/components/Avatar-nightmode.less
diff --git a/src/client/components/Avatar.js b/src/client/components/Avatar.js
@@ -79,8 +79,9 @@ class Avatar extends React.Component {
 
   render(){
 		let { username, size } = this.props;
-		let { profilePicture } = this.state
+		let { profilePicture } = this.state;
 		// let json = JSON.parse()
+
 		let style = {
 			minWidth: `${size}px`,
 			width: `${size}px`,

diff --git a/src/client/components/Avatar.less b/src/client/components/Avatar.less
diff --git a/src/client/components/AvatarLightbox.js b/src/client/components/AvatarLightbox.js
diff --git a/src/client/components/BBackTop.js b/src/client/components/BBackTop.js
@@ -12,9 +12,11 @@ export default function BBackTop({ className, isModal, ...otherProps }) {
           'BBackTop__container--shifted': isModal,
         })}
       >
+
         <BackTop className="BBackTop_button" {...otherProps}>
           <i className="iconfont icon-back-top" />
-        </BackTop>
+        </BackTop> 
+
       </div>
     </div>
   );

diff --git a/src/client/components/BBackTop.less b/src/client/components/BBackTop.less
@@ -13,6 +13,7 @@
     position: relative;
     margin: 0 auto;
     max-width: @container-width;
+
     @media @large {
       padding: 0;
     }

diff --git a/src/client/components/BTooltip.js b/src/client/components/BTooltip.js
diff --git a/src/client/components/Button/Action.js b/src/client/components/Button/Action.js
diff --git a/src/client/components/Button/Action.less b/src/client/components/Button/Action.less
diff --git a/src/client/components/Button/ActionLink.js b/src/client/components/Button/ActionLink.js
diff --git a/src/client/components/Button/EmailShare.js b/src/client/components/Button/EmailShare.js
diff --git a/src/client/components/Button/FacebookShare.js b/src/client/components/Button/FacebookShare.js
diff --git a/src/client/components/Button/Follow.js b/src/client/components/Button/Follow.js
diff --git a/src/client/components/Button/Follow.less b/src/client/components/Button/Follow.less
diff --git a/src/client/components/Button/ShareButton.less b/src/client/components/Button/ShareButton.less
diff --git a/src/client/components/Button/Topic.js b/src/client/components/Button/Topic.js
diff --git a/src/client/components/Button/Topic.less b/src/client/components/Button/Topic.less
diff --git a/src/client/components/Button/TwitterShare.js b/src/client/components/Button/TwitterShare.js
diff --git a/src/client/components/Button/__tests__/Action.js b/src/client/components/Button/__tests__/Action.js
diff --git a/src/client/components/Button/__tests__/Follow.js b/src/client/components/Button/__tests__/Follow.js
diff --git a/src/client/components/Button/__tests__/Topic.js b/src/client/components/Button/__tests__/Topic.js
diff --git a/src/client/components/Button/__tests__/__snapshots__/Action.js.snap b/src/client/components/Button/__tests__/__snapshots__/Action.js.snap
diff --git a/src/client/components/Button/__tests__/__snapshots__/Follow.js.snap b/src/client/components/Button/__tests__/__snapshots__/Follow.js.snap
diff --git a/src/client/components/Button/__tests__/__snapshots__/Topic.js.snap b/src/client/components/Button/__tests__/__snapshots__/Topic.js.snap
diff --git a/src/client/components/Chin/Chin.js b/src/client/components/Chin/Chin.js
diff --git a/src/client/components/CommentFooter/Buttons.js b/src/client/components/CommentFooter/Buttons.js
diff --git a/src/client/components/CommentFooter/CommentFooter.js b/src/client/components/CommentFooter/CommentFooter.js
diff --git a/src/client/components/CommentFooter/CommentFooter.less b/src/client/components/CommentFooter/CommentFooter.less
diff --git a/src/client/components/CommentFooter/Confirmation.js b/src/client/components/CommentFooter/Confirmation.js
diff --git a/src/client/components/CommentFooter/ConfirmationComment.less b/src/client/components/CommentFooter/ConfirmationComment.less
diff --git a/src/client/components/Comments/Comment.js b/src/client/components/Comments/Comment.js
diff --git a/src/client/components/Comments/Comment.less b/src/client/components/Comments/Comment.less
diff --git a/src/client/components/Comments/CommentForm.js b/src/client/components/Comments/CommentForm.js
diff --git a/src/client/components/Comments/CommentForm.less b/src/client/components/Comments/CommentForm.less
diff --git a/src/client/components/Comments/Comments.js b/src/client/components/Comments/Comments.js
diff --git a/src/client/components/Comments/Comments.less b/src/client/components/Comments/Comments.less
diff --git a/src/client/components/Comments/EmbeddedCommentForm.js b/src/client/components/Comments/EmbeddedCommentForm.js
diff --git a/src/client/components/Comments/EmbeddedCommentForm.less b/src/client/components/Comments/EmbeddedCommentForm.less
diff --git a/src/client/components/Comments/HiddenCommentMessage.js b/src/client/components/Comments/HiddenCommentMessage.js
diff --git a/src/client/components/Comments/MoreCommentsButton.js b/src/client/components/Comments/MoreCommentsButton.js
diff --git a/src/client/components/Comments/MoreCommentsButton.less b/src/client/components/Comments/MoreCommentsButton.less
diff --git a/src/client/components/Editor/Editor-nightmode.less b/src/client/components/Editor/Editor-nightmode.less
diff --git a/src/client/components/Editor/Editor.js b/src/client/components/Editor/Editor.js
diff --git a/src/client/components/Editor/Editor.less b/src/client/components/Editor/Editor.less
diff --git a/src/client/components/Editor/EditorInput.js b/src/client/components/Editor/EditorInput.js
diff --git a/src/client/components/Editor/EditorInput.less b/src/client/components/Editor/EditorInput.less
diff --git a/src/client/components/Editor/EditorToolbar-nightmode.less b/src/client/components/Editor/EditorToolbar-nightmode.less
diff --git a/src/client/components/Editor/EditorToolbar.js b/src/client/components/Editor/EditorToolbar.js
diff --git a/src/client/components/Editor/EditorToolbar.less b/src/client/components/Editor/EditorToolbar.less
diff --git a/src/client/components/Editor/withEditor.js b/src/client/components/Editor/withEditor.js
diff --git a/src/client/components/FavoriteButton.js b/src/client/components/FavoriteButton.js
diff --git a/src/client/components/FavoriteButton.less b/src/client/components/FavoriteButton.less
diff --git a/src/client/components/Hero.js b/src/client/components/Hero.js
diff --git a/src/client/components/Hero.less b/src/client/components/Hero.less
diff --git a/src/client/components/HeroBanner.js b/src/client/components/HeroBanner.js
diff --git a/src/client/components/HeroBanner.less b/src/client/components/HeroBanner.less
diff --git a/src/client/components/HeroBannerSlider.less b/src/client/components/HeroBannerSlider.less
diff --git a/src/client/components/HorizontalBarChart.js b/src/client/components/HorizontalBarChart.js
diff --git a/src/client/components/HorizontalBarChart.less b/src/client/components/HorizontalBarChart.less
diff --git a/src/client/components/Icon/Loading.js b/src/client/components/Icon/Loading.js
diff --git a/src/client/components/Icon/Loading.less b/src/client/components/Icon/Loading.less
diff --git a/src/client/components/LoginModal.js b/src/client/components/LoginModal.js
diff --git a/src/client/components/LoginModal.less b/src/client/components/LoginModal.less
diff --git a/src/client/components/Navigation/LanguageSettings.js b/src/client/components/Navigation/LanguageSettings.js
diff --git a/src/client/components/Navigation/LanguageSettings.less b/src/client/components/Navigation/LanguageSettings.less
diff --git a/src/client/components/Navigation/Notifications/Notification-nightmode.less b/src/client/components/Navigation/Notifications/Notification-nightmode.less
diff --git a/src/client/components/Navigation/Notifications/Notification.less b/src/client/components/Navigation/Notifications/Notification.less
diff --git a/src/client/components/Navigation/Notifications/NotificationFollowing.js b/src/client/components/Navigation/Notifications/NotificationFollowing.js
diff --git a/src/client/components/Navigation/Notifications/NotificationMention.js b/src/client/components/Navigation/Notifications/NotificationMention.js
diff --git a/src/client/components/Navigation/Notifications/NotificationReblog.js b/src/client/components/Navigation/Notifications/NotificationReblog.js
diff --git a/src/client/components/Navigation/Notifications/NotificationReply.js b/src/client/components/Navigation/Notifications/NotificationReply.js
diff --git a/src/client/components/Navigation/Notifications/NotificationTransfer.js b/src/client/components/Navigation/Notifications/NotificationTransfer.js
diff --git a/src/client/components/Navigation/Notifications/NotificationVote.js b/src/client/components/Navigation/Notifications/NotificationVote.js
diff --git a/src/client/components/Navigation/Notifications/NotificationVoteWitness.js b/src/client/components/Navigation/Notifications/NotificationVoteWitness.js
diff --git a/src/client/components/Navigation/Notifications/Notifications-nightmode.less b/src/client/components/Navigation/Notifications/Notifications-nightmode.less
diff --git a/src/client/components/Navigation/Notifications/Notifications.js b/src/client/components/Navigation/Notifications/Notifications.js
diff --git a/src/client/components/Navigation/Notifications/Notifications.less b/src/client/components/Navigation/Notifications/Notifications.less
diff --git a/src/client/components/Navigation/Sidenav-nightmode.less b/src/client/components/Navigation/Sidenav-nightmode.less
diff --git a/src/client/components/Navigation/Sidenav.js b/src/client/components/Navigation/Sidenav.js
@@ -6,6 +6,7 @@ import './Sidenav.less';
 
 const isTrending = (match, location) => location.pathname.match(/trending/);
 const isNew = (match, location) => location.pathname.match(/created/);
+const isVids = (match, location) => location.pathname.match(/vids/);
 const isWallet = (match, location) => location.pathname.match(/wallet/);
 const isHot = (match, location) => location.pathname.match(/hot/);
 const isReplies = (match, location) => location.pathname.match(/replies/);
@@ -30,6 +31,12 @@ const Sidenav = ({ username }) =>
 				<FormattedMessage id="new" defaultMessage="New" />
 			</NavLink>
 		</li>
+		<li>
+			<NavLink to="/vids" activeClassName="Sidenav__item--active" isActive={isVids}>
+				<i className="iconfont icon-video" />
+				<FormattedMessage id="vids" defaultMessage="Videos" />
+			</NavLink>
+		</li>
 		{/* <li>
 			<NavLink to="/active" activeClassName="Sidenav__item--active" isActive={isTrending}>
 			<i className="iconfont icon-emoji_fill" />

diff --git a/src/client/components/Navigation/Sidenav.less b/src/client/components/Navigation/Sidenav.less
diff --git a/src/client/components/Navigation/SidenavUser.js b/src/client/components/Navigation/SidenavUser.js
diff --git a/src/client/components/Navigation/Topnav-nightmode.less b/src/client/components/Navigation/Topnav-nightmode.less
diff --git a/src/client/components/Navigation/Topnav.js b/src/client/components/Navigation/Topnav.js
diff --git a/src/client/components/Navigation/Topnav.less b/src/client/components/Navigation/Topnav.less
diff --git a/src/client/components/PayoutDetail.js b/src/client/components/PayoutDetail.js
diff --git a/src/client/components/Popover.js b/src/client/components/Popover.js
diff --git a/src/client/components/PopoverMenu/PopoverMenu.js b/src/client/components/PopoverMenu/PopoverMenu.js
diff --git a/src/client/components/PopoverMenu/PopoverMenu.less b/src/client/components/PopoverMenu/PopoverMenu.less
diff --git a/src/client/components/PopoverMenu/PopoverMenuItem.js b/src/client/components/PopoverMenu/PopoverMenuItem.js
diff --git a/src/client/components/PopoverMenu/PopoverMenuItem.less b/src/client/components/PopoverMenu/PopoverMenuItem.less
diff --git a/src/client/components/QuickPostEditor/QuickPostEditor-nightmode.less b/src/client/components/QuickPostEditor/QuickPostEditor-nightmode.less
diff --git a/src/client/components/QuickPostEditor/QuickPostEditor.js b/src/client/components/QuickPostEditor/QuickPostEditor.js
@@ -74,7 +74,7 @@ class QuickPostEditor extends React.Component {
       this.input.setSelectionRange(pos, pos);
     }
   };
-
+  
   getQuickPostData = () => {
     const currentPaths = this.props.location.pathname.split('/');
     const nativeTag = 'weyoume';
@@ -266,7 +266,9 @@ class QuickPostEditor extends React.Component {
             <Avatar username={user.name} size={40} />
           </div>
           <div className="QuickPostEditor__dropzone-base">
-            <Dropzone
+
+
+          <Dropzone
               disableClick
               style={{ flex: 1 }}
               accept="image/*"
@@ -276,16 +278,19 @@ class QuickPostEditor extends React.Component {
               onDragEnter={this.handleDragEnter}
               onDragLeave={this.handleDragLeave}
             >
-              {this.state.dropzoneActive && (
+
+            {this.state.dropzoneActive && (
                 <div className="QuickPostEditor__dropzone">
                   <div>
                     <i className="iconfont icon-picture" />
                     <FormattedMessage id="drop_image" defaultMessage="Drop your images here" />
                   </div>
                 </div>
               )}
+
               <Input.TextArea
                 autosize={{ minRows: inputMinRows, maxRows: 12 }}
+                imageUploading={imageUploading}
                 onChange={this.handleUpdateCurrentInputValue}
                 onFocus={this.handleFocusInput}
                 onBlur={this.handleUnfocusInput}
@@ -297,12 +302,16 @@ class QuickPostEditor extends React.Component {
                 value={this.state.currentInputValue}
                 maxLength="255"
               />
+
             </Dropzone>
+
+
+
           </div>
         </div>
-        {focusedInput && (
+        {(
           <QuickPostEditorFooter
-            imageUploading={imageUploading}
+
             postCreationLoading={postCreationLoading}
             handleCreatePost={this.handleCreatePost}
             handleImageChange={this.handleImageChange}

diff --git a/src/client/components/QuickPostEditor/QuickPostEditor.less b/src/client/components/QuickPostEditor/QuickPostEditor.less
diff --git a/src/client/components/QuickPostEditor/QuickPostEditorFooter.js b/src/client/components/QuickPostEditor/QuickPostEditorFooter.js
diff --git a/src/client/components/Reactions/ReactionsList.js b/src/client/components/Reactions/ReactionsList.js
diff --git a/src/client/components/Reactions/ReactionsList.less b/src/client/components/Reactions/ReactionsList.less
diff --git a/src/client/components/Reactions/ReactionsModal.js b/src/client/components/Reactions/ReactionsModal.js
diff --git a/src/client/components/ReputationTag.js b/src/client/components/ReputationTag.js
diff --git a/src/client/components/Sidebar/CryptoChart.js b/src/client/components/Sidebar/CryptoChart.js
diff --git a/src/client/components/Sidebar/CryptoTrendingCharts-nightmode.less b/src/client/components/Sidebar/CryptoTrendingCharts-nightmode.less
diff --git a/src/client/components/Sidebar/CryptoTrendingCharts.js b/src/client/components/Sidebar/CryptoTrendingCharts.js
diff --git a/src/client/components/Sidebar/CryptoTrendingCharts.less b/src/client/components/Sidebar/CryptoTrendingCharts.less
diff --git a/src/client/components/Sidebar/FeedSidebar.js b/src/client/components/Sidebar/FeedSidebar.js
diff --git a/src/client/components/Sidebar/InterestingPeople.js b/src/client/components/Sidebar/InterestingPeople.js
diff --git a/src/client/components/Sidebar/InterestingPeople.less b/src/client/components/Sidebar/InterestingPeople.less
diff --git a/src/client/components/Sidebar/InterestingPeopleWithAPI.js b/src/client/components/Sidebar/InterestingPeopleWithAPI.js
diff --git a/src/client/components/Sidebar/LastDrafts-nightmode.less b/src/client/components/Sidebar/LastDrafts-nightmode.less
diff --git a/src/client/components/Sidebar/LastDrafts.js b/src/client/components/Sidebar/LastDrafts.js
diff --git a/src/client/components/Sidebar/LastDrafts.less b/src/client/components/Sidebar/LastDrafts.less
diff --git a/src/client/components/Sidebar/LatestComments.js b/src/client/components/Sidebar/LatestComments.js
diff --git a/src/client/components/Sidebar/LatestComments.less b/src/client/components/Sidebar/LatestComments.less
diff --git a/src/client/components/Sidebar/PostRecommendation-nightmode.less b/src/client/components/Sidebar/PostRecommendation-nightmode.less
diff --git a/src/client/components/Sidebar/PostRecommendation.js b/src/client/components/Sidebar/PostRecommendation.js
diff --git a/src/client/components/Sidebar/PostRecommendation.less b/src/client/components/Sidebar/PostRecommendation.less
diff --git a/src/client/components/Sidebar/PostRecommendationLink.js b/src/client/components/Sidebar/PostRecommendationLink.js
diff --git a/src/client/components/Sidebar/SidebarBlock.less b/src/client/components/Sidebar/SidebarBlock.less
diff --git a/src/client/components/Sidebar/SidebarContentBlock-nightmode.less b/src/client/components/Sidebar/SidebarContentBlock-nightmode.less
diff --git a/src/client/components/Sidebar/SidebarContentBlock.less b/src/client/components/Sidebar/SidebarContentBlock.less
diff --git a/src/client/components/Sidebar/SidebarWidget.js b/src/client/components/Sidebar/SidebarWidget.js
diff --git a/src/client/components/Sidebar/SidebarWidget.less b/src/client/components/Sidebar/SidebarWidget.less
diff --git a/src/client/components/Sidebar/SignUp.js b/src/client/components/Sidebar/SignUp.js
diff --git a/src/client/components/Sidebar/StartNow.js b/src/client/components/Sidebar/StartNow.js
diff --git a/src/client/components/Sidebar/Topics.js b/src/client/components/Sidebar/Topics.js
diff --git a/src/client/components/Sidebar/Topics.less b/src/client/components/Sidebar/Topics.less
diff --git a/src/client/components/Sidebar/User-nightmode.less b/src/client/components/Sidebar/User-nightmode.less
diff --git a/src/client/components/Sidebar/User.js b/src/client/components/Sidebar/User.js
diff --git a/src/client/components/Sidebar/User.less b/src/client/components/Sidebar/User.less
diff --git a/src/client/components/Sidebar/WalletSidebar.js b/src/client/components/Sidebar/WalletSidebar.js
diff --git a/src/client/components/Sidebar/WalletSidebar.less b/src/client/components/Sidebar/WalletSidebar.less
diff --git a/src/client/components/Sidebar/__tests__/InterestingPeople.js b/src/client/components/Sidebar/__tests__/InterestingPeople.js
diff --git a/src/client/components/Sidebar/__tests__/LatestComments.js b/src/client/components/Sidebar/__tests__/LatestComments.js
diff --git a/src/client/components/Sidebar/__tests__/Topics.js b/src/client/components/Sidebar/__tests__/Topics.js
diff --git a/src/client/components/Sidebar/__tests__/__snapshots__/InterestingPeople.js.snap b/src/client/components/Sidebar/__tests__/__snapshots__/InterestingPeople.js.snap
diff --git a/src/client/components/Sidebar/__tests__/__snapshots__/LatestComments.js.snap b/src/client/components/Sidebar/__tests__/__snapshots__/LatestComments.js.snap
diff --git a/src/client/components/Sidebar/__tests__/__snapshots__/Topics.js.snap b/src/client/components/Sidebar/__tests__/__snapshots__/Topics.js.snap
diff --git a/src/client/components/Slider/RawSlider.js b/src/client/components/Slider/RawSlider.js
diff --git a/src/client/components/Slider/RawSlider.less b/src/client/components/Slider/RawSlider.less
diff --git a/src/client/components/Slider/Slider.js b/src/client/components/Slider/Slider.js
diff --git a/src/client/components/Slider/Slider.less b/src/client/components/Slider/Slider.less
diff --git a/src/client/components/SocialLink.js b/src/client/components/SocialLink.js
diff --git a/src/client/components/SocialLinks.js b/src/client/components/SocialLinks.js
diff --git a/src/client/components/SortSelector/SortSelector.js b/src/client/components/SortSelector/SortSelector.js
diff --git a/src/client/components/SortSelector/SortSelector.less b/src/client/components/SortSelector/SortSelector.less
diff --git a/src/client/components/Story/Body-nightmode.less b/src/client/components/Story/Body-nightmode.less
diff --git a/src/client/components/Story/Body.js b/src/client/components/Story/Body.js
diff --git a/src/client/components/Story/Body.less b/src/client/components/Story/Body.less
diff --git a/src/client/components/Story/BodyShort.js b/src/client/components/Story/BodyShort.js
diff --git a/src/client/components/Story/DMCARemovedMessage.js b/src/client/components/Story/DMCARemovedMessage.js
diff --git a/src/client/components/Story/HiddenStoryPreviewMessage.js b/src/client/components/Story/HiddenStoryPreviewMessage.js
diff --git a/src/client/components/Story/NSFWStoryPreviewMessage.js b/src/client/components/Story/NSFWStoryPreviewMessage.js
diff --git a/src/client/components/Story/PostFeedEmbed.js b/src/client/components/Story/PostFeedEmbed.js
diff --git a/src/client/components/Story/PostFeedEmbed.less b/src/client/components/Story/PostFeedEmbed.less
diff --git a/src/client/components/Story/PostedFrom.js b/src/client/components/Story/PostedFrom.js
diff --git a/src/client/components/Story/PostedFrom.less b/src/client/components/Story/PostedFrom.less
diff --git a/src/client/components/Story/Story-nightmode.less b/src/client/components/Story/Story-nightmode.less
diff --git a/src/client/components/Story/Story.js b/src/client/components/Story/Story.js
diff --git a/src/client/components/Story/Story.less b/src/client/components/Story/Story.less
@@ -2,12 +2,18 @@
 @import (reference) '../../styles/modules/variables.less';
 
 .Story {
-  background-color: @story-bg-color;
+  background-color: @white;
   color: #353535;
-	border: @base-border;
+  // border: @base-border;
+  border: @border-width-base @border-style-base @border-color-base;
+
+  border-left: 0.01px @border-style-base @border-color-base;
+  border-bottom: 0px @border-style-base @border-color-base;
+
   @media @small {
-    border-radius: 4px;
-    border: @base-border;
+    // border-radius: 4px; <- makes the corners straight
+    order: @base-border;
+
   }
 
   &__content {
@@ -31,7 +37,7 @@
   }
 
   &:not(:first-child) {
-    margin-top: 12px;
+    // margin-top: 12px;
   }
 
   &:last-child {

diff --git a/src/client/components/Story/StoryDeleted.js b/src/client/components/Story/StoryDeleted.js
diff --git a/src/client/components/Story/StoryDeleted.less b/src/client/components/Story/StoryDeleted.less
diff --git a/src/client/components/Story/StoryFull-nightmode.less b/src/client/components/Story/StoryFull-nightmode.less
diff --git a/src/client/components/Story/StoryFull.js b/src/client/components/Story/StoryFull.js
diff --git a/src/client/components/Story/StoryFull.less b/src/client/components/Story/StoryFull.less
diff --git a/src/client/components/Story/StoryHelper.js b/src/client/components/Story/StoryHelper.js
diff --git a/src/client/components/Story/StoryLoading-nightmode.less b/src/client/components/Story/StoryLoading-nightmode.less
diff --git a/src/client/components/Story/StoryLoading.js b/src/client/components/Story/StoryLoading.js
diff --git a/src/client/components/Story/StoryLoading.less b/src/client/components/Story/StoryLoading.less
diff --git a/src/client/components/Story/StoryPreview.js b/src/client/components/Story/StoryPreview.js
diff --git a/src/client/components/StoryFooter/Buttons.js b/src/client/components/StoryFooter/Buttons.js
@@ -472,6 +472,9 @@ export default class Buttons extends React.Component {
 						{post.children > 0 && <FormattedNumber value={post.children} />}
 					</span>
 				</div>
+
+
+
 				{showReblogLink && (
 					<div className="button__group">
 						<BTooltip

diff --git a/src/client/components/StoryFooter/Buttons.less b/src/client/components/StoryFooter/Buttons.less
diff --git a/src/client/components/StoryFooter/Confirmation.js b/src/client/components/StoryFooter/Confirmation.js
diff --git a/src/client/components/StoryFooter/Confirmation.less b/src/client/components/StoryFooter/Confirmation.less
diff --git a/src/client/components/StoryFooter/Payout.js b/src/client/components/StoryFooter/Payout.js
diff --git a/src/client/components/StoryFooter/Payout.less b/src/client/components/StoryFooter/Payout.less
diff --git a/src/client/components/StoryFooter/StoryFooter.js b/src/client/components/StoryFooter/StoryFooter.js
diff --git a/src/client/components/StoryFooter/StoryFooter.less b/src/client/components/StoryFooter/StoryFooter.less
diff --git a/src/client/components/TopicSelector.js b/src/client/components/TopicSelector.js
diff --git a/src/client/components/TopicSelector.less b/src/client/components/TopicSelector.less
@@ -5,6 +5,7 @@
   justify-content: space-between;
   align-items: center;
   margin-bottom: 24px;
+  margin-top: 15px;
   padding: 0 @mobile-padding;
 
   @media @small {

diff --git a/src/client/components/TrendingTagsMenu.js b/src/client/components/TrendingTagsMenu.js
diff --git a/src/client/components/TrendingTagsMenu.less b/src/client/components/TrendingTagsMenu.less
diff --git a/src/client/components/UserCard-nightmode.less b/src/client/components/UserCard-nightmode.less
diff --git a/src/client/components/UserCard.js b/src/client/components/UserCard.js
diff --git a/src/client/components/UserCard.less b/src/client/components/UserCard.less
diff --git a/src/client/components/UserHeader-nightmode.less b/src/client/components/UserHeader-nightmode.less
diff --git a/src/client/components/UserHeader.js b/src/client/components/UserHeader.js
@@ -68,10 +68,10 @@ const UserHeader = ({
 									'UserHeader__user__button-follows-you': isFollowing && !isSameUser,
 								})}
 							>
-								<Action className="send-money" onClick={onTransferClick}>
-									<FormattedMessage id="send" defaultMessage="Send" />
-									<img src="/images/dollar.png" className="send-dollar on-right"/>
-								</Action>
+				  	  <Action className="send-money" onClick={onTransferClick}>
+						   <FormattedMessage id="send" defaultMessage="Send" />
+								<img src="/images/dollar.png" className="send-dollar on-right"/>
+              </Action> 
 							</div>
 						)}
 					</div>

diff --git a/src/client/components/UserHeader.less b/src/client/components/UserHeader.less
diff --git a/src/client/components/UserHeaderLoading-nightmode.less b/src/client/components/UserHeaderLoading-nightmode.less
diff --git a/src/client/components/UserHeaderLoading.js b/src/client/components/UserHeaderLoading.js
diff --git a/src/client/components/UserHeaderLoading.less b/src/client/components/UserHeaderLoading.less
diff --git a/src/client/components/UserMenu-nightmode.less b/src/client/components/UserMenu-nightmode.less