diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index dc36d6f7923b39f03f75e0c7a519a6b8d80423e9..2d9aacbadaf21c2f75cdfa7d12dc47e01aca396a 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 0d9adcf6d9452aabdde6f688d56842b7fe6c3df5..2ca60178df71e5b947b524bba37a3b435f8139fd 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 0491b68db57ddcdda5d34d89e7e72670abae4227..6f6a6a4a5d49fce968fd7fc8ad9d8fbea36f967c 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 0dcb1a87e9aaadc3a12b66302136b824c15f41f0..785eb613334d71ec8a34bf4d1a880e4ce5cc7af9 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 2b1aafc546b8e131603406dee7c74c7ec0c1251d..6e1ca0d8f2fe6e608e96a374d4b5197a1a170384 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') + = "»"