diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-14 11:47:21 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-14 11:47:21 +0000 |
| commit | 642699b059f51d604f18ee57f01d8b24eb05bfa8 (patch) | |
| tree | b3a479d3a2b0e00d56ac6dc5f5eaaadb9d239dcf /app/views/projects | |
| parent | 4d64a32c88dd5f87621d391c0f10f6acef094073 (diff) | |
| parent | 818607f0115a2c67792fa83e9b39d74c443a8856 (diff) | |
| download | gitlab-ce-642699b059f51d604f18ee57f01d8b24eb05bfa8.tar.gz | |
Merge branch 'fix/titles-weight' into 'master'
Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
See #3956.
Following is before/after for each page:
## Group title
### Before
### After
---
## Commit title
### Before
### After
---
## Branch name
### Before
### After
---
## Tags name in list
### Before
### After
---
## Tag name
### Before
### After
---
## Issue title in list
### Before
### After
---
## MR title in list
### Before
### After
See merge request !2422
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/tags/_tag.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/tags/show.html.haml | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index a234536723e..d276e5932d1 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -6,7 +6,7 @@ %li(class="js-branch-#{branch.name}") %div = link_to namespace_project_tree_path(@project.namespace, @project, branch.name) do - %strong.str-truncated= branch.name + .branch-name.str-truncated= branch.name - if branch.name == @repository.root_ref %span.label.label-primary default diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 012825f0fdb..4d4b410ee29 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -11,7 +11,7 @@ = cache(cache_key) do %li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" } .commit-row-title - %strong.str-truncated + .commit-title.str-truncated = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message" - if commit.description? %a.text-expander.js-toggle-button ... diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml index 28b706c5c7e..56a7ced1236 100644 --- a/app/views/projects/tags/_tag.html.haml +++ b/app/views/projects/tags/_tag.html.haml @@ -3,7 +3,7 @@ %li %div = link_to namespace_project_tag_path(@project.namespace, @project, tag.name) do - %strong + .tag-name = icon('tag') = tag.name - if tag.message.present? diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml index b594d4f1f27..dbb20347860 100644 --- a/app/views/projects/tags/show.html.haml +++ b/app/views/projects/tags/show.html.haml @@ -17,8 +17,8 @@ .pull-right = link_to namespace_project_tag_path(@project.namespace, @project, @tag.name), class: 'btn btn-remove remove-row grouped has_tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{@tag.name}' tag cannot be undone. Are you sure?" } do %i.fa.fa-trash-o - .title - %strong= @tag.name + .tag-name.title + = @tag.name - if @tag.message.present? %span.light |