Merge branch 'dev'

Author: Parth Shah

src/components/ActionCard/ActionCard.scss

@@ -56,8 +56,10 @@ class MessageList extends Component {
 
   componentDidMount() {
     const { scrollPosition } = this.props
+    const panelMessages = this.refs.panelMessages
+    // 145 = 60 for topbar + 45 for panel title + 20px for margin between topbar and left panel + 10px padding
+    panelMessages.style.height = (window.innerHeight - 145) + 'px'
     if (scrollPosition) {
-      const panelMessages = this.refs.panelMessages
       // We use requestAnimationFrame because this function may be executed before
       // the DOM elements are actually drawn.
       // Source: http://stackoverflow.com/a/28748160

src/components/MessageList/MessageList.jsx

@@ -2,6 +2,7 @@ import React, {PropTypes} from 'react'
 import ReactDOM from 'react-dom'
 import uncontrollable from 'uncontrollable'
 import { Avatar } from 'appirio-tech-react-components'
+import { AUTOCOMPLETE_TRIGGER_LENGTH } from '../../config/constants'
 
 class AutoCompleteInput extends React.Component {
 
@@ -52,7 +53,7 @@ class AutoCompleteInput extends React.Component {
     return (
       <div className="input-icon-group tc-file-field__inputs">
 
-        {isPopupVisible && searchMembers.length > 0 &&
+        {isPopupVisible && keyword.length >= AUTOCOMPLETE_TRIGGER_LENGTH && searchMembers.length > 0 &&
           <div className="member-dropdown">
             {searchMembers.map(renderMember)}
           </div>

src/components/TeamManagement/AutoCompleteInput.jsx

@@ -153,6 +153,7 @@ $tc-body-extra-small	: 12px;
       right: $base-unit*3;
       // @include icon('x-mark-big.svg');
       background-size: $tc-heading-extra-small;
+      overflow: hidden;
     }
     .modal-title{
       @include roboto-bold;

src/components/TeamManagement/TeamManagement.scss

@@ -211,3 +211,5 @@ export const CODER_BOT_USER_FNAME = 'Coder'
 export const CODER_BOT_USER_LNAME = 'Bot'
 
 export const PROJECT_MAX_COLORS = 5
+
+export const AUTOCOMPLETE_TRIGGER_LENGTH = 3

src/config/constants.js

@@ -61,7 +61,7 @@ const sections = [
         id: 'notes',
         fieldName: 'details.appDefinition.notes',
         title: 'Notes',
-        description: 'Add any other important information regarding your project (e.g., links to documents or existing applications, budget or timeing constraints)',
+        description: 'Add any other important information regarding your project (e.g., links to documents or existing applications, budget or timing constraints)',
         type: 'notes'
       },
       {
@@ -94,7 +94,7 @@ const sections = [
             type: 'tiled-radio-group',
             options: [
               {value: 'serif', title: 'Serif', icon: Icons.IconTcSpecTypeSerif, iconOptions: { fill: '#00000'}, desc: 'formal, old style'},
-              {value: 'sanSerif', title: 'Sans Serif', icon: Icons.IconTcSpecTypeSerif, iconOptions: { fill: '#00000'}, desc: 'clean, modern, informal'}
+              {value: 'sanSerif', title: 'Sans Serif', icon: Icons.IconTcSpecTypeSansSerif, iconOptions: { fill: '#00000'}, desc: 'clean, modern, informal'}
             ],
             fieldName: 'details.designSpecification.fontStyle'
           },

src/config/projectQuestions/topcoder.v1.js

@@ -110,7 +110,7 @@ class AppProjectForm extends Component {
 
           <TCFormFields.TextInput
             name="newProject.details.utm.code"
-            label="Invite code (optional)"
+            label="Reference code (optional)"
             type="text"
             maxLength={25}
             wrapperClass="row center"

src/projects/create/components/AppProjectForm.jsx

@@ -63,7 +63,7 @@ class GenericProjectForm extends Component {
 
         <TCFormFields.TextInput
           name="newProject.details.utm.code"
-          label="Invite code (optional)"
+          label="Reference code (optional)"
           maxLength={25}
           type="text"
           disabled={false}

src/projects/create/components/GenericProjectForm.jsx

@@ -102,7 +102,7 @@ class EditProjectForm extends Component {
         />
         <div className="section-footer section-footer-spec">
           <button className="tc-btn tc-btn-primary tc-btn-md"
-            type="submit" disabled={!this.state.canSubmit}
+            type="submit" disabled={!this.state.canSubmit || this.state.isSaving }
           >Save Changes</button>
         </div>
       </div>

src/projects/detail/components/EditProjectForm.jsx

@@ -8,7 +8,7 @@ require('./SidebarNav.scss')
 const scrollProps = {
   spy: true,
   smooth: true,
-  offset: -10,
+  offset: -70, // 60px for top bar and 10px for margin from nav bar
   duration: 500,
   activeClass: 'active'
 }