Merge pull request #2856 from awesomerobot/master

changes: topic title editor layout, badge alignment in scrolled header

app/assets/javascripts/discourse/templates/topic.hbs

@@ -17,10 +17,12 @@
           {{#if editingTopic}}
             {{#if isPrivateMessage}}
               <span class="private-message-glyph">{{fa-icon envelope}}</span>
+              {{text-field id='edit-title' value=newTitle maxLength=maxTitleLength}}
             {{else}}
+              {{text-field id='edit-title' value=newTitle maxLength=maxTitleLength}}
+              </br>
               {{category-chooser valueAttribute="id" value=newCategoryId source=category_id}}
             {{/if}}
-            {{text-field id='edit-title' value=newTitle maxLength=maxTitleLength}}
 
             <button class='btn btn-primary btn-small no-text' {{action "finishedEditingTopic"}}>{{fa-icon check}}</button>
             <button class='btn btn-small no-text' {{action "cancelEditingTopic"}}>{{fa-icon times}}</button>

app/assets/stylesheets/common/base/combobox.scss

@@ -8,7 +8,7 @@
     display: inline-block;
   }
   .highlighted .topic-count, .select2-highlighted .category-desc {
-    color: $secondary;
+    color: $primary;
   }
   .category-desc {
     color: scale-color($primary, $lightness: 45%);

app/assets/stylesheets/common/base/header.scss

@@ -12,7 +12,7 @@
     }
 
     .contents {
-      margin: 10px 0;
+      margin: 8px 0;
     }
 
     .title {

app/assets/stylesheets/desktop/topic-post.scss

@@ -560,7 +560,7 @@ iframe {
   }
 
   .badge-wrapper {
-    margin: 0;
+    margin: 0 0 0 2px;
     padding: 0;
 
     .badge-category {

app/assets/stylesheets/desktop/topic.scss

@@ -26,7 +26,7 @@
   }
   #edit-title { width: 500px; }
   .category-combobox {
-    width: 250px;
+    width: 350px;
     .select2-drop {
       left: -9000px;
       width: 248px;

app/assets/stylesheets/vendor/select2.scss

@@ -331,8 +331,8 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 .select2-results-dept-7 .select2-result-label { padding-left: 120px }
 
 .select2-results .select2-highlighted {
-    background: #3875d7;
-    color: #fff;
+    background: dark-light-diff($highlight, $secondary, 50%, -80%);
+    color: $primary;
 }
 
 .select2-results li em {