feat(composer): add popout icon and header styles

internal_packages/composer/lib/composer-view.cjsx

@@ -118,19 +118,13 @@ ComposerView = React.createClass
         <div className="composer-action-bar-content">
           <button className="btn btn-toolbar pull-right btn-trash"
                   onClick={@_destroyDraft}><RetinaImg name="toolbar-trash.png" /></button>
-        
+
           <button className="btn btn-toolbar pull-right btn-attach"
                   onClick={@_attachFile}><RetinaImg name="toolbar-attach.png"/></button>
 
-          <div className="text-actions pull-right">
-            <span className="header-action"
+          <button className="btn btn-toolbar pull-right btn-popout"
                   style={display: (@props.mode is "fullwindow") and 'none' or 'initial'}
-                  onClick={@_popoutComposer}>Popout</span>
-            <br/>
-            <span className="header-action"
-                  style={display: @state.showsubject and 'none' or 'initial'}
-                  onClick={=> @setState {showsubject: true}}>Change Subject</span>
-          </div>
+                  onClick={@_popoutComposer}><RetinaImg name="toolbar-popout.png"/></button>
 
           <button className="btn btn-toolbar btn-send"
                   tabIndex="110"
@@ -149,6 +143,10 @@ ComposerView = React.createClass
           <span className="header-action"
                 style={display: @state.showbcc and 'none' or 'inline'}
                 onClick={=> @setState {showbcc: true}}>Bcc</span>
+
+          <span className="header-action"
+                style={display: @state.showsubject and 'none' or 'initial'}
+                onClick={=> @setState {showsubject: true}}>Subject</span>
         </div>
 
         <ParticipantsTextField

internal_packages/composer/stylesheets/composer.less

@@ -76,7 +76,7 @@
   }
 
   .tokenizing-field.to {
-    padding-right: 60px;
+    padding-right: 120px;
   }
 
   input, textarea, div[contenteditable] {

src/flux/stores/file-upload-store.coffee

@@ -38,6 +38,7 @@ FileUploadStore = Reflux.createStore
 
     # When the dialog closes, it triggers `Actions.pathsToOpen`
     atom.showOpenDialog {properties: ['openFile', 'multiSelections']}, (pathsToOpen) ->
+      return if not pathsToOpen?
       pathsToOpen = [pathsToOpen] if _.isString(pathsToOpen)
       for path in pathsToOpen
         # When this task runs, we expect to hear `uploadStateChanged` actions.

static/type.less

@@ -9,8 +9,7 @@
 // Headings
 // -------------------------
 
-h1, h2, h3, h4, h5, h6,
-.h1, .h2, .h3, .h4, .h5, .h6 {
+h1, h2, h3, h4, h5, h6 {
   font-family: @font-family-heading;
   line-height: @line-height-heading;
   color: @text-color-heading;
@@ -21,22 +20,20 @@ h1, h2, h3, h4, h5, h6,
   }
 }
 
-h1, .h1 {
+h1 {
   font-size:   @font-size-h1;
   font-weight: @font-weight-semi-bold;
 }
-h2, .h2 {
+h2 {
   font-size:   @font-size-h2;
   font-weight: @font-weight-blond;
 }
-h3, .h3 { font-size: @font-size-h3; }
-h4, .h4 { font-size: @font-size-h4; }
-h5, .h5 { font-size: @font-size-h5; }
-h6, .h6 { font-size: @font-size-h6; }
+h3 { font-size: @font-size-h3; }
+h4 { font-size: @font-size-h4; }
+h5 { font-size: @font-size-h5; }
+h6 { font-size: @font-size-h6; }
 
-h1, .h1,
-h2, .h2,
-h3, .h3 {
+h1, h2, h3{
   margin-top: @line-height-computed;
   margin-bottom: (@line-height-computed / 2);
 
@@ -45,9 +42,7 @@ h3, .h3 {
     font-size: 65%;
   }
 }
-h4, .h4,
-h5, .h5,
-h6, .h6 {
+h4, h5, h6 {
   margin-top: (@line-height-computed / 2);
   margin-bottom: (@line-height-computed / 2);