Fix padding around editor path, input and select box.

app/assets/stylesheets/framework/files.scss

@@ -24,7 +24,7 @@
     text-shadow: 0 1px 1px #fff;
     margin: 0;
     text-align: left;
-    padding: 10px 15px;
+    padding: 10px $gl-padding;
     .file-actions {
       float: right;

app/assets/stylesheets/pages/editor.scss

@@ -22,25 +22,35 @@
   .file-title {
     @extend .monospace;
+
+    line-height: 42px;
+    padding-top: 7px;
+    padding-bottom: 7px;
   }
   .editor-ref {
     background: $background-color;
-    padding: 11px 15px;
+    padding-right: $gl-padding;
     border-right: 1px solid $border-color;
-    display: inline-block;
-    margin: -5px -5px;
+    display: block;
+    float: left;
     margin-right: 10px;
   }
   .editor-file-name {
-    .new-file-name {
-      display: inline-block;
-      width: 450px;
-    }
-    .form-control {
-      margin-top: -3px;
-    }
+    @extend .monospace;
+    
+    float: left;
+    margin-right: 10px;
+  }
+  .new-file-name {
+    display: inline-block;
+    width: 450px;
+    float: left;
+  }
+
+  .select2 {
+    float: right;
   }
 }

app/views/projects/blob/_editor.html.haml

 .file-holder.file.append-bottom-default
-  .file-title
+  .file-title.clearfix
     .editor-ref
       %i.fa.fa-code-fork
       = ref
     %span.editor-file-name
-      - if @path
-        %span.monospace
-          = @path
-      - if current_action?(:new) || current_action?(:create)
+      = @path
+    - if current_action?(:new) || current_action?(:create)
+      %span.editor-file-name
         \/
-        = text_field_tag 'file_name', params[:file_name], placeholder: "File name",
-          required: true, class: 'form-control new-file-name js-quick-submit'
-      .pull-right
-        = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'form-control'
+      = text_field_tag 'file_name', params[:file_name], placeholder: "File name",
+        required: true, class: 'form-control new-file-name js-quick-submit'
+
+    .pull-right
+      = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2'
   .file-content.code
     %pre.js-edit-mode-pane#editor