From b708c0d3895664562d969e67d3605fce97ab6cc8 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Tue, 1 Nov 2016 11:15:47 +0100 Subject: [PATCH 1/2] updated styling commit SHA on branches page + added to changelog --- CHANGELOG.md | 1 + app/assets/stylesheets/pages/commits.scss | 17 ++++++++++++++++- app/views/projects/branches/_commit.html.haml | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd6b4e0ba11..641932bd48c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,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..e82b001271d 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 From 7f6607e36f6108a78b361fc0113a3ff2e820650d Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Tue, 1 Nov 2016 18:39:29 +0000 Subject: [PATCH 2/2] Update commits.scss --- app/assets/stylesheets/pages/commits.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index e82b001271d..98a84351a3d 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -176,7 +176,7 @@ } } - .commit-id{ + .commit-id { color: $gl-link-color; }