summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-21 10:32:05 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-21 10:32:05 +0300
commit6c5fa569d78bad28fcd9d63edfc7b69715e9ac56 (patch)
treec003d4c16eba428454e55e1e8030e198af295a43
parent7210a34bc7c5d1b5d9ccaf8deb0aa4fac9058132 (diff)
downloadgitlab-ce-6c5fa569d78bad28fcd9d63edfc7b69715e9ac56.tar.gz
Reduce usage of bold font
-rw-r--r--app/assets/stylesheets/common.scss7
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/common.scss7
-rw-r--r--app/assets/stylesheets/sections/projects.scss10
-rw-r--r--app/views/dashboard/projects.html.haml11
-rw-r--r--app/views/projects/labels/_label.html.haml18
5 files changed, 25 insertions, 28 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index dc36d6f7923..2d9aacbadaf 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -86,13 +86,6 @@ span.update-author {
font-weight: bold;
}
-.label {
- padding: 1px 4px;
- font-size: 12px;
- font-style: normal;
- font-weight: normal;
-}
-
.field_with_errors {
display: inline;
}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index 0d9adcf6d94..2ca60178df7 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -88,6 +88,13 @@ pre.well-pre {
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
}
+.label {
+ padding: 2px 4px;
+ font-size: 12px;
+ font-style: normal;
+ font-weight: normal;
+}
+
/** Big Labels **/
.state-label {
font-size: 14px;
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 0491b68db57..6f6a6a4a5d4 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -81,16 +81,16 @@ ul.nav.nav-projects-tabs {
.my-projects {
li {
- .project-title {
- font-size: 14px;
- }
-
.project-info {
margin-bottom: 10px;
}
- .access-icon i {
+ .access-icon {
color: #AAA;
+ margin-left: 10px;
+ i {
+ color: #AAA;
+ }
}
}
}
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index 0dcb1a87e9a..785eb613334 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -56,13 +56,12 @@
- @projects.each do |project|
%li
%h4.project-title
- %span.access-icon
- - if project.public
- = public_icon
- - else
- = private_icon
= link_to project_path(project), class: dom_class(project) do
- %strong= project.name_with_namespace
+ = project.name_with_namespace
+ - if project.public
+ %small.access-icon
+ = public_icon
+ Public
- if project.forked_from_project
%small.pull-right
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 2b1aafc546b..6e1ca0d8f2f 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,15 +1,13 @@
- frequency = @project.issues.tagged_with(label.name).count
%li
- %strong
- %span{class: "label #{label_css_class(label.name)}"}
- %i.icon-tag
- - if frequency.zero?
- %span.light= label.name
- - else
- = label.name
+ %span{class: "label #{label_css_class(label.name)}"}
+ %i.icon-tag
+ - if frequency.zero?
+ %span.light= label.name
+ - else
+ = label.name
.pull-right
- unless frequency.zero?
= link_to project_issues_path(label_name: label.name) do
- %strong
- = pluralize(frequency, 'issue')
- = "»"
+ = pluralize(frequency, 'issue')
+ = "»"