Commit 6c5fa569d78bad28fcd9d63edfc7b69715e9ac56
1 parent
7210a34b
Exists in
master
and in
4 other branches
Reduce usage of bold font
Showing
5 changed files
with
25 additions
and
28 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -86,13 +86,6 @@ span.update-author { | @@ -86,13 +86,6 @@ span.update-author { | ||
| 86 | font-weight: bold; | 86 | font-weight: bold; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | -.label { | ||
| 90 | - padding: 1px 4px; | ||
| 91 | - font-size: 12px; | ||
| 92 | - font-style: normal; | ||
| 93 | - font-weight: normal; | ||
| 94 | -} | ||
| 95 | - | ||
| 96 | .field_with_errors { | 89 | .field_with_errors { |
| 97 | display: inline; | 90 | display: inline; |
| 98 | } | 91 | } |
app/assets/stylesheets/gitlab_bootstrap/common.scss
| @@ -88,6 +88,13 @@ pre.well-pre { | @@ -88,6 +88,13 @@ pre.well-pre { | ||
| 88 | @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); | 88 | @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | +.label { | ||
| 92 | + padding: 2px 4px; | ||
| 93 | + font-size: 12px; | ||
| 94 | + font-style: normal; | ||
| 95 | + font-weight: normal; | ||
| 96 | +} | ||
| 97 | + | ||
| 91 | /** Big Labels **/ | 98 | /** Big Labels **/ |
| 92 | .state-label { | 99 | .state-label { |
| 93 | font-size: 14px; | 100 | font-size: 14px; |
app/assets/stylesheets/sections/projects.scss
| @@ -81,16 +81,16 @@ ul.nav.nav-projects-tabs { | @@ -81,16 +81,16 @@ ul.nav.nav-projects-tabs { | ||
| 81 | 81 | ||
| 82 | .my-projects { | 82 | .my-projects { |
| 83 | li { | 83 | li { |
| 84 | - .project-title { | ||
| 85 | - font-size: 14px; | ||
| 86 | - } | ||
| 87 | - | ||
| 88 | .project-info { | 84 | .project-info { |
| 89 | margin-bottom: 10px; | 85 | margin-bottom: 10px; |
| 90 | } | 86 | } |
| 91 | 87 | ||
| 92 | - .access-icon i { | 88 | + .access-icon { |
| 93 | color: #AAA; | 89 | color: #AAA; |
| 90 | + margin-left: 10px; | ||
| 91 | + i { | ||
| 92 | + color: #AAA; | ||
| 93 | + } | ||
| 94 | } | 94 | } |
| 95 | } | 95 | } |
| 96 | } | 96 | } |
app/views/dashboard/projects.html.haml
| @@ -56,13 +56,12 @@ | @@ -56,13 +56,12 @@ | ||
| 56 | - @projects.each do |project| | 56 | - @projects.each do |project| |
| 57 | %li | 57 | %li |
| 58 | %h4.project-title | 58 | %h4.project-title |
| 59 | - %span.access-icon | ||
| 60 | - - if project.public | ||
| 61 | - = public_icon | ||
| 62 | - - else | ||
| 63 | - = private_icon | ||
| 64 | = link_to project_path(project), class: dom_class(project) do | 59 | = link_to project_path(project), class: dom_class(project) do |
| 65 | - %strong= project.name_with_namespace | 60 | + = project.name_with_namespace |
| 61 | + - if project.public | ||
| 62 | + %small.access-icon | ||
| 63 | + = public_icon | ||
| 64 | + Public | ||
| 66 | 65 | ||
| 67 | - if project.forked_from_project | 66 | - if project.forked_from_project |
| 68 | %small.pull-right | 67 | %small.pull-right |
app/views/projects/labels/_label.html.haml
| 1 | - frequency = @project.issues.tagged_with(label.name).count | 1 | - frequency = @project.issues.tagged_with(label.name).count |
| 2 | %li | 2 | %li |
| 3 | - %strong | ||
| 4 | - %span{class: "label #{label_css_class(label.name)}"} | ||
| 5 | - %i.icon-tag | ||
| 6 | - - if frequency.zero? | ||
| 7 | - %span.light= label.name | ||
| 8 | - - else | ||
| 9 | - = label.name | 3 | + %span{class: "label #{label_css_class(label.name)}"} |
| 4 | + %i.icon-tag | ||
| 5 | + - if frequency.zero? | ||
| 6 | + %span.light= label.name | ||
| 7 | + - else | ||
| 8 | + = label.name | ||
| 10 | .pull-right | 9 | .pull-right |
| 11 | - unless frequency.zero? | 10 | - unless frequency.zero? |
| 12 | = link_to project_issues_path(label_name: label.name) do | 11 | = link_to project_issues_path(label_name: label.name) do |
| 13 | - %strong | ||
| 14 | - = pluralize(frequency, 'issue') | ||
| 15 | - = "»" | 12 | + = pluralize(frequency, 'issue') |
| 13 | + = "»" |