From d00725a17594bd4908d31397c6012b397ff1148d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Thu, 14 Jan 2016 16:05:47 +0100 Subject: Fix alignment issues after a fix on titles weight --- app/assets/stylesheets/pages/commit.scss | 2 +- app/assets/stylesheets/pages/tags.scss | 2 +- app/views/projects/commits/_commit.html.haml | 2 +- app/views/projects/tags/_tag.html.haml | 7 +++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 6ec88bdd804..3d6162d4ed4 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -2,7 +2,7 @@ display: block; } -.commit-row-title .commit-title { +.commit-row-title .title { font-weight: 600; } diff --git a/app/assets/stylesheets/pages/tags.scss b/app/assets/stylesheets/pages/tags.scss index e9cd6dc6c5e..0ef6754bf35 100644 --- a/app/assets/stylesheets/pages/tags.scss +++ b/app/assets/stylesheets/pages/tags.scss @@ -1,3 +1,3 @@ -.tag-name{ +.tag-name { font-weight: 600; } diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 4d4b410ee29..e4b54dedda8 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 - .commit-title.str-truncated + .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 56a7ced1236..94c75de2fdb 100644 --- a/app/views/projects/tags/_tag.html.haml +++ b/app/views/projects/tags/_tag.html.haml @@ -2,10 +2,9 @@ - release = @releases.find { |release| release.tag == tag.name } %li %div - = link_to namespace_project_tag_path(@project.namespace, @project, tag.name) do - .tag-name - = icon('tag') - = tag.name + = link_to namespace_project_tag_path(@project.namespace, @project, tag.name), class: 'tag-name' do + = icon('tag') + = tag.name - if tag.message.present?   = strip_gpg_signature(tag.message) -- cgit v1.2.1 From a69271374df0018b2bfa7cd96e183dedc903f36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Fri, 15 Jan 2016 11:10:55 +0100 Subject: Streamline item titles to use a single class, and add back strong tags --- app/assets/stylesheets/framework/common.scss | 2 ++ app/assets/stylesheets/pages/branches.scss | 3 --- app/assets/stylesheets/pages/groups.scss | 5 ----- app/assets/stylesheets/pages/tags.scss | 3 --- app/views/projects/branches/_branch.html.haml | 4 ++-- app/views/projects/commits/_commit.html.haml | 2 +- app/views/projects/tags/_tag.html.haml | 7 ++++--- app/views/projects/tags/show.html.haml | 2 +- app/views/shared/groups/_group.html.haml | 4 ++-- 9 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 app/assets/stylesheets/pages/branches.scss delete mode 100644 app/assets/stylesheets/pages/tags.scss diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 05645116268..585a9d83913 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -75,6 +75,8 @@ hr { @include str-truncated; } +.item-title { font-weight: 600; } + /** FLASH message **/ .author_link { color: $gl-link-color; diff --git a/app/assets/stylesheets/pages/branches.scss b/app/assets/stylesheets/pages/branches.scss deleted file mode 100644 index abae5c3d0a5..00000000000 --- a/app/assets/stylesheets/pages/branches.scss +++ /dev/null @@ -1,3 +0,0 @@ -.branch-name{ - font-weight: 600; -} diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 3404c2631e1..263993f59a5 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -11,8 +11,3 @@ height: 42px; } } - -.content-list .group-name { - font-weight: 600; - color: #4c4e54; -} diff --git a/app/assets/stylesheets/pages/tags.scss b/app/assets/stylesheets/pages/tags.scss deleted file mode 100644 index 0ef6754bf35..00000000000 --- a/app/assets/stylesheets/pages/tags.scss +++ /dev/null @@ -1,3 +0,0 @@ -.tag-name { - font-weight: 600; -} diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index d276e5932d1..d78c2dc0071 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -1,12 +1,12 @@ - commit = @repository.commit(branch.target) - bar_graph_width_factor = @max_commits > 0 ? 100.0/@max_commits : 0 -- diverging_commit_counts = @repository.diverging_commit_counts(branch) +- diverging_commit_counts = @repository.diverging_commit_counts(branch) - number_commits_behind = diverging_commit_counts[:behind] - number_commits_ahead = diverging_commit_counts[:ahead] %li(class="js-branch-#{branch.name}") %div = link_to namespace_project_tree_path(@project.namespace, @project, branch.name) do - .branch-name.str-truncated= branch.name + %strong.item-title.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 e4b54dedda8..7e1d4d10ff1 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 - .title.str-truncated + %strong.item-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 94c75de2fdb..0010bda83fc 100644 --- a/app/views/projects/tags/_tag.html.haml +++ b/app/views/projects/tags/_tag.html.haml @@ -2,9 +2,10 @@ - release = @releases.find { |release| release.tag == tag.name } %li %div - = link_to namespace_project_tag_path(@project.namespace, @project, tag.name), class: 'tag-name' do - = icon('tag') - = tag.name + = link_to namespace_project_tag_path(@project.namespace, @project, tag.name) do + %strong.item-title + = icon('tag') + = tag.name - if tag.message.present?   = strip_gpg_signature(tag.message) diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml index dbb20347860..370a214b2d9 100644 --- a/app/views/projects/tags/show.html.haml +++ b/app/views/projects/tags/show.html.haml @@ -17,7 +17,7 @@ .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 - .tag-name.title + %strong.item-title = @tag.name - if @tag.message.present? %span.light diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index f4cfa29ae56..f2882dacf47 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -10,7 +10,8 @@ %i.fa.fa-sign-out = image_tag group_icon(group), class: "avatar s46 hidden-xs" - = link_to group.name, group, class: 'group-name' + = link_to group, class: 'group-name' do + %strong.item-title= group.name - if group_member as @@ -18,4 +19,3 @@ %div.light #{pluralize(group.projects.count, "project")}, #{pluralize(group.users.count, "user")} - -- cgit v1.2.1 From 9e053decfcaa9722fce20f57114c494ee7285718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Fri, 15 Jan 2016 11:14:33 +0100 Subject: Remove unnecessary class --- app/assets/stylesheets/pages/commit.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 3d6162d4ed4..e53d6fc6bdc 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -2,10 +2,6 @@ display: block; } -.commit-row-title .title { - font-weight: 600; -} - .commit-author, .commit-committer{ display: block; color: #999; -- cgit v1.2.1 From ef3d5a2712871ab490facfc0764d24edec84a8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Fri, 15 Jan 2016 15:46:01 +0100 Subject: Replace strong by span for .item-title elements --- app/views/projects/branches/_branch.html.haml | 2 +- app/views/projects/commits/_commit.html.haml | 2 +- app/views/projects/tags/_tag.html.haml | 2 +- app/views/projects/tags/show.html.haml | 4 ++-- app/views/shared/groups/_group.html.haml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index d78c2dc0071..76a823d3828 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.item-title.str-truncated= branch.name + %span.item-title.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 7e1d4d10ff1..7f2903589a9 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.item-title.str-truncated + %span.item-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 0010bda83fc..399782273d3 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.item-title + %span.item-title = 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 370a214b2d9..8c7f93f93b6 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 - %strong.item-title - = @tag.name + .title + %span.item-title= @tag.name - if @tag.message.present? %span.light   diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index f2882dacf47..778b20fb4f2 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -11,7 +11,7 @@ = image_tag group_icon(group), class: "avatar s46 hidden-xs" = link_to group, class: 'group-name' do - %strong.item-title= group.name + %span.item-title= group.name - if group_member as -- cgit v1.2.1