Further dev on messages, error messages, reply

lincolnloop · Oct 30, 2015 · 0f26cf0 · 0f26cf0
1 parent a7b7ed1
commit 0f26cf0
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/client/app/components/MarkdownTextarea.jsx b/client/app/components/MarkdownTextarea.jsx
@@ -72,10 +72,14 @@ var MarkdownView = React.createClass({
 
   render: function() {
 
+    var textareaStyles = {
+      'borderBottom': this.state.errormsg ? '2px solid #ff733f' : ''
+    }
 
     if (!this.state.previewValue) {
       var contentArea = <section>{this.props.pre ? this.props.pre : null}
                           <textarea ref="textarea"
+                                    style={textareaStyles}
                                     placeholder={this.props.placeholder}
                                     defaultValue={this.state.rawValue}
                                     onChange={this.props.onChange}

diff --git a/client/app/messages/ForkedDiscussionLink.jsx b/client/app/messages/ForkedDiscussionLink.jsx
@@ -24,9 +24,9 @@ var ForkedDiscussionLink = React.createClass({
     var url = discussion ? urls.get('discussion:detail', team.slug, discussion.id, discussion.slug) : null;
     return (
       <div className="forked-link">
-        {this.state.discussion ? <span><span>Forked from: </span><a href={url}>
-          {this.state.discussion.title}
-        </a></span> : null}
+        {this.state.discussion ? <a href={url}>
+          <span>Forked from: </span> {this.state.discussion.title}
+        </a> : null}
       </div>
     );
   },

diff --git a/client/app/user/User.jsx b/client/app/user/User.jsx
@@ -6,9 +6,17 @@ var urls = require('../urls');
 
 var UserDetail = React.createClass({
   render: function() {
+    var imgStyles = {
+      'borderRadius': '50%',
+      'height': '24px',
+      'transition': 'all .5s cubic-bezier(0.250,0.460,0.450,0.940)'
+    }
+    var nameStyles = {
+      'display': 'none'
+    }
     return (<a href={urls.get('user:detail', {'user_id': this.props.userId})} className="user-thumbnail avatar">
-              <img src={gravatar.get(this.props.email)} />
-              <span>{this.props.name}</span>
+              <img src={gravatar.get(this.props.email)} style={imgStyles} />
+              <span style={nameStyles}>{this.props.name}</span>
         </a>)
   }
 });

diff --git a/client/scss/components/_message-forked.scss b/client/scss/components/_message-forked.scss
@@ -10,6 +10,10 @@
     border-bottom: 2px solid rgba(41, 128, 185, 0.9);
     box-shadow: inset 0px 7px 3px -3px rgba(3, 3, 3, 0.2);
     a {
+      display: block;
+      width: 20%;
+      line-height: 22px;
+      background-color: #ededed;
       color: #fff;
       font-weight: bold;
       white-space: nowrap;

diff --git a/client/scss/components/_message.scss b/client/scss/components/_message.scss
@@ -2,7 +2,7 @@
   position: relative;
   padding-left: 0;
   margin-left: 10px;
-  margin-top: 5px;
+  margin-top: 10px;
   transition: margin-left 0.4s cubic-bezier(0.25, 0.1, 0.25, 1);
   background:  rgba(12, 13, 13, 0.1);
 

diff --git a/client/scss/pages/_discussion-detail.scss b/client/scss/pages/_discussion-detail.scss
@@ -1,6 +1,6 @@
 .app.medium, .app.large {
   .discussion-detail .message:nth-child(1) {
-    margin-top: 0;
+    margin-top: 10px;
   }
 }