diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 19:45:53 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 19:45:53 +0000 |
commit | dd5f0762087c1c76394253d660875846d36551d7 (patch) | |
tree | e84e256edf897ca5ae91e14c225fc051dad65f4e /app/views | |
parent | d0b28cd0616e84861bc6f3ed7e0b6becb371a3f5 (diff) | |
parent | 5d0f68f26b0b6597c99d1e21d6f6978d963ea0d3 (diff) | |
download | gitlab-ce-dd5f0762087c1c76394253d660875846d36551d7.tar.gz |
Merge branch 'stylistic-changes-to-commit-title-bar' into 'master'
Added various stylistic changes to commit title area
## What does this MR do?
After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6994 was merged, there were some things left over.
## Are there points in the code the reviewer needs to double check?
Yes, in general the code.
Apart from that I couldn't get the extended commit sha to lign up correctly on smaller screens
## Why was this MR needed?
Some things weren't done yet.
- Commit description and commit sha are now bold like in the original design, and are also both visible on smaller screens
- You can now extend the commit sha on bigger screens and keep it visible truncated on smaller screens.
- options dropdown button now correctly displays on smaller screens (similar to issue/mr view)
## Screenshots (if relevant)
Before:
![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/716cb902bd20dedc705a8f81f6536736/Screen_Shot_2016-10-19_at_10.20.01_AM.png)
After:
![image](/uploads/2329c9e2c731f0fc850b4864fb216756/image.png)
![image](/uploads/d8afde519fe276c0bce2286e56ea463b/image.png)
not aligned correctly:
![image](/uploads/9006df59a1de3875b2317f14d3d20872/image.png)
## Does this MR meet the acceptance criteria?
- [ ] [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?
!6994
See merge request !7213
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index d8c95376b94..0ebc38d16cf 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -1,25 +1,25 @@ .commit-info-row.commit-info-row-header - %span.hidden-xs.hidden-sm Commit - = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace js-details-short" - = link_to("#", class: "js-details-expand hidden-xs hidden-sm") do - %span.text-expander - \... - %span.js-details-content.hide - = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace hidden-xs hidden-sm" - = clipboard_button(clipboard_text: @commit.id) - %span.hidden-xs authored - #{time_ago_with_tooltip(@commit.authored_date)} - %span by - = author_avatar(@commit, size: 24) - %strong - = commit_author_link(@commit, avatar: true, size: 24) - - if @commit.different_committer? - %span.light Committed by + .commit-meta + %strong Commit + %strong.monospace.js-details-short= @commit.short_id + = link_to("#", class: "js-details-expand hidden-xs hidden-sm") do + %span.text-expander + \... + %span.js-details-content.hide + %strong.monospace.commit-hash-full= @commit.id + = clipboard_button(clipboard_text: @commit.id) + %span.hidden-xs authored + #{time_ago_with_tooltip(@commit.authored_date)} + %span by + = author_avatar(@commit, size: 24) %strong - = commit_committer_link(@commit, avatar: true, size: 24) - #{time_ago_with_tooltip(@commit.committed_date)} - - .pull-right.commit-action-buttons + = commit_author_link(@commit, avatar: true, size: 24) + - if @commit.different_committer? + %span.light Committed by + %strong + = commit_committer_link(@commit, avatar: true, size: 24) + #{time_ago_with_tooltip(@commit.committed_date)} + .commit-action-buttons - if defined?(@notes_count) && @notes_count > 0 %span.btn.disabled.btn-grouped.hidden-xs.append-right-10 = icon('comment') @@ -28,8 +28,8 @@ Browse Files .dropdown.inline %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } } - %span.hidden-xs Options - = icon('caret-down', class: ".commit-options-dropdown-caret") + %span Options + = icon('caret-down') %ul.dropdown-menu.dropdown-menu-align-right %li.visible-xs-block.visible-sm-block = link_to namespace_project_tree_path(@project.namespace, @project, @commit) do |