Update file hader styles; remove and relocate more commits css

11 files changed, 119 insertions, 172 deletions

diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 88ed0a4a17e..c51912b4ac4 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -182,3 +182,52 @@ span.idiff {
     border-bottom-right-radius: 2px;
   }
 }
+
+.file-stats {
+  ul {
+    list-style: none;
+    margin: 0;
+    padding: 10px 0;
+
+    li {
+      padding: 3px 0;
+      line-height: 20px;
+    }
+  }
+
+  .new-file {
+    a {
+      color: $gl-text-green;
+    }
+  }
+
+  .renamed-file {
+    a {
+      color: $gl-text-orange;
+    }
+  }
+
+  .deleted-file {
+    a {
+      color: $gl-text-red;
+    }
+  }
+
+  .edit-file {
+    a {
+      color: $gl-text-color;
+    }
+  }
+
+  a {
+    text-decoration: none;
+
+    .new-file {
+      color: $notify-new-file;
+    }
+
+    .deleted-file {
+      color: $notify-deleted-file;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index b0c4a6edf57..dc211fc55a7 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -376,7 +376,6 @@ $callout-success-color: #3c763d;
 /*
 * Commit Page
 */
-$commit-committer-color: #999;
 $commit-max-width-marker-color: rgba(0, 0, 0, 0.0);
 $commit-message-text-area-bg: rgba(0, 0, 0, 0.0);
 
diff --git a/app/assets/stylesheets/notify.scss b/app/assets/stylesheets/notify.scss
index ddc382362f7..a81e5eb5ebf 100644
--- a/app/assets/stylesheets/notify.scss
+++ b/app/assets/stylesheets/notify.scss
@@ -18,15 +18,3 @@ p.details {
 pre.commit-message {
   white-space: pre-wrap;
 }
-
-.file-stats > a {
-  text-decoration: none;
-
-  > .new-file {
-    color: $notify-new-file;
-  }
-
-  > .deleted-file {
-    color: $notify-deleted-file;
-  }
-}
diff --git a/app/assets/stylesheets/pages/branches.scss b/app/assets/stylesheets/pages/branches.scss
new file mode 100644
index 00000000000..8d671585b7a
--- /dev/null
+++ b/app/assets/stylesheets/pages/branches.scss
@@ -0,0 +1,55 @@
+.divergence-graph {
+  padding: 12px 12px 0 0;
+  float: right;
+
+  .graph-side {
+    position: relative;
+    width: 80px;
+    height: 22px;
+    padding: 5px 0 13px;
+    float: left;
+
+    .bar {
+      position: absolute;
+      height: 4px;
+      background-color: $divergence-graph-bar-bg;
+    }
+
+    .bar-behind {
+      right: 0;
+      border-radius: 3px 0 0 3px;
+    }
+
+    .bar-ahead {
+      left: 0;
+      border-radius: 0 3px 3px 0;
+    }
+
+    .count {
+      padding-top: 6px;
+      padding-bottom: 0;
+      font-size: 12px;
+      color: $gl-title-color;
+      display: block;
+    }
+
+    .count-behind {
+      padding-right: 4px;
+      text-align: right;
+    }
+
+    .count-ahead {
+      padding-left: 4px;
+      text-align: left;
+    }
+  }
+
+  .graph-separator {
+    position: relative;
+    width: 1px;
+    height: 18px;
+    margin: 5px 0 0;
+    float: left;
+    background-color: $divergence-graph-separator-bg;
+  }
+}
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index feaa04136a9..d890cf3502b 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -1,25 +1,6 @@
-.commit-title {
-  display: block;
-}
-
-.commit-author,
-.commit-committer {
-  display: block;
-  color: $commit-committer-color;
-  font-weight: normal;
-  font-style: italic;
-}
-
-.commit-author strong,
-.commit-committer strong {
-  font-weight: bold;
-  font-style: normal;
-}
-
 .commit-description {
   background: none;
   border: none;
-  margin: 0;
   padding: 0;
   margin-top: 10px;
   word-break: normal;
@@ -32,19 +13,12 @@
   }
 }
 
-.ci-status-link {
-  svg {
-    overflow: visible;
-  }
-}
-
 .commit-box {
   border-top: 1px solid $border-color;
   padding: $gl-padding 0;
 
   .commit-title {
     margin: 0;
-    font-size: 23px;
     color: $gl-gray-dark;
   }
 
@@ -64,43 +38,6 @@
   }
 }
 
-.file-stats {
-  ul {
-    list-style: none;
-    margin: 0;
-    padding: 10px 0;
-
-    li {
-      padding: 3px 0;
-      line-height: 20px;
-    }
-  }
-
-  .new-file {
-    a {
-      color: $gl-text-green;
-    }
-  }
-
-  .renamed-file {
-    a {
-      color: $gl-text-orange;
-    }
-  }
-
-  .deleted-file {
-    a {
-      color: $gl-text-red;
-    }
-  }
-
-  .edit-file {
-    a {
-      color: $gl-text-color;
-    }
-  }
-}
-
 /*
  * Commit message textarea for web editor and
  * custom merge request message
@@ -122,7 +59,7 @@
     z-index: 1;
   }
 
-  > textarea {
+  textarea {
     background-color: $commit-message-text-area-bg;
     font-family: inherit;
     padding-left: $left;
@@ -133,8 +70,6 @@
 
 
 .commits-compare-switch {
-  @include btn-default;
-  @include btn-white;
   float: left;
   margin-right: 9px;
 }
@@ -151,7 +86,6 @@
 }
 
 .commit-row-title {
-
   .notes_count {
     float: right;
     margin-right: 10px;
@@ -164,7 +98,6 @@
   .commit-row-message {
     color: $gl-dark-link-color;
   }
-
 }
 
 .text-expander {
@@ -217,12 +150,6 @@
 
 .commit,
 .generic_commit_status {
-  padding: 10px 0;
-  position: relative;
-
-  @media (min-width: $screen-sm-min) {
-    padding-left: 46px;
-  }
 
   a,
   button {
@@ -253,19 +180,6 @@
     }
   }
 
-  .commit-row-info {
-    color: $gl-gray;
-    line-height: 1.35;
-
-    a {
-      color: $gl-gray;
-    }
-
-    .avatar {
-      margin-right: 8px;
-    }
-  }
-
   &.inline-commit {
     .commit-row-title {
       font-size: 13px;
@@ -301,59 +215,3 @@
     color: $gl-gray;
   }
 }
-
-.divergence-graph {
-  padding: 12px 12px 0 0;
-  float: right;
-
-  .graph-side {
-    position: relative;
-    width: 80px;
-    height: 22px;
-    padding: 5px 0 13px;
-    float: left;
-
-    .bar {
-      position: absolute;
-      height: 4px;
-      background-color: $divergence-graph-bar-bg;
-    }
-
-    .bar-behind {
-      right: 0;
-      border-radius: 3px 0 0 3px;
-    }
-
-    .bar-ahead {
-      left: 0;
-      border-radius: 0 3px 3px 0;
-    }
-
-    .count {
-      padding-top: 6px;
-      padding-bottom: 0;
-      font-size: 12px;
-      color: $gl-title-color;
-      display: block;
-    }
-
-    .count-behind {
-      padding-right: 4px;
-      text-align: right;
-    }
-
-    .count-ahead {
-      padding-left: 4px;
-      text-align: left;
-    }
-  }
-
-  .graph-separator {
-    position: relative;
-    width: 1px;
-    height: 18px;
-    margin: 5px 0 0;
-    float: left;
-    background-color: $divergence-graph-separator-bg;
-  }
-}
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4cb53ab6fce..0e3da7d7163 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -310,10 +310,6 @@
       left: 0;
       top: 2px;
     }
-
-    .commit-row-info {
-      line-height: 20px;
-    }
   }
 
   .btn-clipboard {
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index 4acd17360c1..2f6f03e9877 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -135,3 +135,9 @@
     left: 5px;
   }
 }
+
+.ci-status-link {
+  svg {
+    overflow: visible;
+  }
+}
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index cad4e149845..fe4f08e4749 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -134,21 +134,18 @@
 
 .blob-commit-info {
   list-style: none;
-  padding: $gl-padding;
   background: $gray-light;
+  padding: 6px 0;
   border: 1px solid $border-color;
   border-bottom: none;
   margin: 0;
 
-  .commit {
-    padding-top: 0;
-    padding-bottom: 0;
+  .table-list-cell {
+    border-bottom: none;
+  }
 
-    .commit-row-title {
-      .commit-row-message {
-        font-weight: normal;
-      }
-    }
+  .commit-actions {
+    width: 200px;
   }
 }
 
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml
index 149ee7c59d6..cafd25753d1 100644
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
@@ -18,7 +18,7 @@
         - else
           = link_to title, '#'
 
-%ul.blob-commit-info.hidden-xs
+%ul.blob-commit-info.table-list.hidden-xs
   - blob_commit = @repository.last_commit_for_path(@commit.id, blob.path)
   = render blob_commit, project: @project, ref: @ref
 
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index 7bde20c3286..33f65158c85 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -2,7 +2,7 @@
   .clearfix
     - if params[:to] && params[:from]
       .compare-switch-container
-        = link_to icon('exchange'), {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip', title: 'Switch base of comparison'}
+        = link_to icon('exchange'), {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip btn btn-white', title: 'Switch base of comparison'}
     .form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
       .input-group.inline-input-group
         %span.input-group-addon from
diff --git a/app/views/projects/diffs/_stats.html.haml b/app/views/projects/diffs/_stats.html.haml
index 66d6254aa1e..3c7b319f522 100644
--- a/app/views/projects/diffs/_stats.html.haml
+++ b/app/views/projects/diffs/_stats.html.haml
@@ -34,4 +34,3 @@
               %a{href: "##{file_hash}"}
                 %i.fa.fa-adjust
                 = diff_file.new_path
-