Merge branch '24022-update-styling-commit-sha-in-branches-list' into 'master'

Updated styling commit SHA on branches page ## What does this MR do? Updated styling of commit SHA on the branches page to include the commit icon and be blue ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? to make the branches page in line with upcoming update to the commit list, which also styles the commit sha, but slightly different. ## Screenshots (if relevant) before: ![image](/uploads/ce6eae30d0a07be2d76881d3c5e04e7d/image.png) after: ![image](/uploads/a10df4fe6efbb168fc9b51ae87f53da7/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24022 See merge request !7219

Merge branch '24022-update-styling-commit-sha-in-branches-list' into 'master'
66bcf875 · Fatih Acet · a30d34b2 · 7f6607e3 · 66bcf875 · 66bcf875
Commit 66bcf875 authored Nov 04, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 1 deletion

CHANGELOG.md CHANGELOG.md +1 -0

commits.scss app/assets/stylesheets/pages/commits.scss +16 -1

_commit.html.haml app/views/projects/branches/_commit.html.haml +2 -0

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ entry.
 - Improve search query parameter naming in /admin/users !7115 (YarNayar)
 - Fix table pagination to be responsive
 - Allow to search for user by secondary email address in the admin interface(/admin/users) !7115 (YarNayar)
+- Updated commit SHA styling on the branches page.

 ## 8.13.3 (2016-11-02)


--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -164,7 +164,22 @@
 .branch-commit {
  color: $gl-gray;

-  .commit-id,
+  .commit-icon {
+    text-align: center;
+    display: inline-block;
+
+    svg {
+      height: 14px;
+      width: 14px;
+      vertical-align: middle;
+      fill: $table-text-gray;
+    }
+  }
+
+  .commit-id {
+    color: $gl-link-color;
+  }
+
  .commit-row-message {
    color: $gl-gray;
  }

--- a/app/views/projects/branches/_commit.html.haml
+++ b/app/views/projects/branches/_commit.html.haml
 .branch-commit
+  .icon-container.commit-icon
+    = custom_icon("icon_commit")
  = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-id monospace"
  &middot;
  %span.str-truncated