Merge pull request #89 from tahnik/bugfixes

Bugfixes
tahnik · Jul 20, 2017 · 95d72f1 · 95d72f1
2 parents d664237 + 6860ed7
commit 95d72f1
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/app/src/main/js/actions/notifs.js b/app/src/main/js/actions/notifs.js
@@ -78,6 +78,7 @@ const showNotifs = notif => (dispatch, getState) => {
 
     myNotification.onclick = (e) => {
       dispatch(openModal(ITEM.RANT.NAME, e.target.data));
+      currentWindow.show();
       currentWindow.focus();
     };
   }

diff --git a/app/src/main/js/components/utilities/post_rant.js b/app/src/main/js/components/utilities/post_rant.js
@@ -24,8 +24,9 @@ class PostRant extends Component {
   onPost() {
     const { auth } = this.props;
     this.setState({ posting: true });
+    const rantText = document.getElementById('post_rant_content').innerHTML;
     rantscript
-    .postRant(this.state.rant_content, this.state.tags, auth.user.authToken)
+    .postRant(rantText, this.state.tags, auth.user.authToken)
     .then((res) => {
       if (!res.success) {
         this.setState({ limitCrossed: true });

diff --git a/app/src/main/res/css/modules/bottom_bar.sass b/app/src/main/res/css/modules/bottom_bar.sass
@@ -24,7 +24,7 @@
     align-items: center
   .upvote, .downvote
     border-radius: 100%
-    font-size: 1.3rem
+    font-size: 1.2rem
     height: 2rem
     width: 2rem
     &:hover

diff --git a/app/src/main/res/css/modules/comments.sass b/app/src/main/res/css/modules/comments.sass
@@ -29,6 +29,8 @@
     margin-right: 0.5rem
     .top_container
       padding: 1rem
+    p
+      white-space: pre-wrap
     img
       width: 100%
   .column_topbar

diff --git a/app/src/main/res/css/modules/notifs.sass b/app/src/main/res/css/modules/notifs.sass
@@ -102,14 +102,14 @@
         border-radius: 5px
         color: #fff
         text-align: right
-        padding: 0.5rem 0.5rem 1rem 0.5rem
+        padding: 0.5rem 0.5rem 1rem 1rem
         margin: 0.5rem 0
         transition: all 0.2s
         &:hover
           background-color: rgba(255, 255, 255, 0.2)
           cursor: pointer
         &:active
-          transform: scale(0.9)
+          transform: scale(0.95)
         .notif_desc
           display: flex
           align-items: center

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "devrantron",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "main": "./app/build/app.js",
   "description": "An open source cross platform desktop application for devRant",
   "scripts": {