diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 14:00:52 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 14:00:52 +0300 |
commit | 66bcf875206629c78905f276b6e8d79817a87acf (patch) | |
tree | 5ad7285180721b11505ac225038b5ca7bc54f17c | |
parent | a30d34b2e70a65d670517ab3869d8e925d6c8fc1 (diff) | |
parent | 7f6607e36f6108a78b361fc0113a3ff2e820650d (diff) |
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
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 17 | ||||
-rw-r--r-- | app/views/projects/branches/_commit.html.haml | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 59dadb6c978..9411cc62003 100644 --- 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) diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 52d6a39bd59..98a84351a3d 100644 --- 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; } diff --git a/app/views/projects/branches/_commit.html.haml b/app/views/projects/branches/_commit.html.haml index d54c76ff9c8..de607772df6 100644 --- a/app/views/projects/branches/_commit.html.haml +++ b/app/views/projects/branches/_commit.html.haml @@ -1,4 +1,6 @@ .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" · %span.str-truncated |