summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-14 11:47:21 +0000
committerDouwe Maan <douwe@gitlab.com>2016-01-14 11:47:21 +0000
commit642699b059f51d604f18ee57f01d8b24eb05bfa8 (patch)
treeb3a479d3a2b0e00d56ac6dc5f5eaaadb9d239dcf /app
parent4d64a32c88dd5f87621d391c0f10f6acef094073 (diff)
parent818607f0115a2c67792fa83e9b39d74c443a8856 (diff)
downloadgitlab-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 ![group-title-before](/uploads/d6c013c69f526d553555ff974c29b349/group-title-before.png) ### After ![group-title-after](/uploads/56e0bd176d12943297b5b95d20beb437/group-title-after.png) --- ## Commit title ### Before ![commit-title-before](/uploads/a9bda5212eea843ab4c92acbcf411cdd/commit-title-before.png) ### After ![commit-title-after](/uploads/e3a532460a1e7b0b2a8eb8a6af12abea/commit-title-after.png) --- ## Branch name ### Before ![branch-name-before](/uploads/9d77e39f07cd7b757d02a39f5bc57570/branch-name-before.png) ### After ![branch-name-after](/uploads/6831e9560d196d8a4da209166f224a0f/branch-name-after.png) --- ## Tags name in list ### Before ![tags-name-in-list-before](/uploads/cf0141713af751132fd29220621ea9ab/tags-name-in-list-before.png) ### After ![tags-name-in-list-after](/uploads/902c5b029dc832216ac536d2ad372b83/tags-name-in-list-after.png) --- ## Tag name ### Before ![tags-name-before](/uploads/495acb6b4bab8464a0ffeb8f703435b6/tags-name-before.png) ### After ![tags-name-after](/uploads/f86868dbad57b8226611bcb03e5a9524/tags-name-after.png) --- ## Issue title in list ### Before ![issue-title-in-list-before](/uploads/5f01450aceefdcc2f51984832a4ce6b5/issue-title-in-list-before.png) ### After ![issue-title-in-list-after](/uploads/3144fb231874d23b6b46e108da24b128/issue-title-in-list-after.png) --- ## MR title in list ### Before ![mr-title-in-list-before](/uploads/bd0239104ebf4a5090c724c3851df57c/mr-title-in-list-before.png) ### After ![mr-title-in-list-after](/uploads/16be5460dffc33ff173a6b8ff3250206/mr-title-in-list-after.png) See merge request !2422
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/branches.scss3
-rw-r--r--app/assets/stylesheets/pages/commit.scss4
-rw-r--r--app/assets/stylesheets/pages/groups.scss5
-rw-r--r--app/assets/stylesheets/pages/issues.scss2
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss2
-rw-r--r--app/assets/stylesheets/pages/tags.scss3
-rw-r--r--app/views/projects/branches/_branch.html.haml2
-rw-r--r--app/views/projects/commits/_commit.html.haml2
-rw-r--r--app/views/projects/tags/_tag.html.haml2
-rw-r--r--app/views/projects/tags/show.html.haml4
-rw-r--r--app/views/shared/groups/_group.html.haml3
11 files changed, 23 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/branches.scss b/app/assets/stylesheets/pages/branches.scss
new file mode 100644
index 00000000000..abae5c3d0a5
--- /dev/null
+++ b/app/assets/stylesheets/pages/branches.scss
@@ -0,0 +1,3 @@
+.branch-name{
+ font-weight: 600;
+}
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 17245d3be7b..05d2f306d0f 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -2,6 +2,10 @@
display: block;
}
+.commit-row-title .commit-title {
+ font-weight: 600;
+}
+
.commit-author, .commit-committer{
display: block;
color: #999;
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index 263993f59a5..3404c2631e1 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -11,3 +11,8 @@
height: 42px;
}
}
+
+.content-list .group-name {
+ font-weight: 600;
+ color: #4c4e54;
+}
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 1e1af662850..ad92cc22815 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -6,7 +6,7 @@
.issue-title {
margin-bottom: 5px;
font-size: $list-font-size;
- font-weight: bold;
+ font-weight: 600;
}
.issue-info {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 82effde0bf3..efd33df2e99 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -150,7 +150,7 @@
.merge-request-title {
margin-bottom: 5px;
font-size: $list-font-size;
- font-weight: bold;
+ font-weight: 600;
}
.merge-request-info {
diff --git a/app/assets/stylesheets/pages/tags.scss b/app/assets/stylesheets/pages/tags.scss
new file mode 100644
index 00000000000..e9cd6dc6c5e
--- /dev/null
+++ b/app/assets/stylesheets/pages/tags.scss
@@ -0,0 +1,3 @@
+.tag-name{
+ font-weight: 600;
+}
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
&nbsp;
- 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
&nbsp;
diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml
index a54c5fa8c33..f4cfa29ae56 100644
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -10,8 +10,7 @@
%i.fa.fa-sign-out
= image_tag group_icon(group), class: "avatar s46 hidden-xs"
- = link_to group, class: 'group-name' do
- %strong= group.name
+ = link_to group.name, group, class: 'group-name'
- if group_member
as