Fix date format, don't break out on long lines in answers

coolcrowd · Feb 10, 2016 · 69bdd06 · 69bdd06
1 parent 5ec26ff
commit 69bdd06
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/js/components/experiments/answers/AnswerList.js b/src/js/components/experiments/answers/AnswerList.js
@@ -73,26 +73,26 @@ class AnswerList extends DataComponent {
                 return (
                     <div>
                         <b>Feedback</b>
-                        <p>
+                        <p className="dont-break-out">
                             {rating.feedback}
                         </p>
                     </div>
                 );
             });
 
-            let answerTime = moment(item.time);
+            let answerTime = moment(item.time * 1000);
             let now = moment();
 
             if (now.diff(answerTime, 'days') >= 7) {
-                answerTime = answerTime.format("dddd, MMMM Do YYYY, h:mm:ss a");
+                answerTime = answerTime.format("llll");
             } else {
                 answerTime = answerTime.fromNow();
             }
 
             return (
-                <div className="answer">
+                <div className="answer dont-break-out">
                     <div className="answer-meta">
-                        <time dateTime={moment(item.time).toISOString()}>
+                        <time dateTime={moment(item.time * 1000).toISOString()} title={moment(item.time * 1000).format("llll")}>
                             {answerTime}
                         </time>
 

diff --git a/src/sass/screen.scss b/src/sass/screen.scss
@@ -155,6 +155,13 @@ pre {
   margin: 8px 16px 8px 0;
 }
 
+.dont-break-out {
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+  word-break: break-all;
+  hyphens: auto;
+}
+
 .no-display {
   display: none !important;
 }