diff options
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/journals_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/issues/_list.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/_list.html.erb | 2 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 26 |
5 files changed, 27 insertions, 7 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index b49fe8983..cecd9a482 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -82,7 +82,7 @@ module IssuesHelper s << '<div>' subject = h(issue.subject) if issue.is_private? - subject = subject + ' ' + content_tag('span', l(:field_is_private), :class => 'private') + subject = subject + ' ' + content_tag('span', l(:field_is_private), :class => 'badge badge-private private') end s << content_tag('h3', subject) s << '</div>' * (ancestors.size + 1) diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index c711d0fdd..aea8fd70a 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -64,7 +64,7 @@ module JournalsHelper def render_private_notes_indicator(journal) content = journal.private_notes? ? l(:field_is_private) : '' - css_classes = journal.private_notes? ? 'private' : '' + css_classes = journal.private_notes? ? 'badge badge-private private' : '' content_tag('span', content.html_safe, :id => "journal-#{journal.id}-private_notes", :class => css_classes) end end diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 99d9cbceb..0c3062650 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -25,7 +25,7 @@ <tr class="group open"> <td colspan="<%= query.inline_columns.size + 2 %>"> <span class="expander" onclick="toggleRowGroup(this);"> </span> - <span class="name"><%= group_name %></span> <span class="count"><%= group_count %></span> <span class="totals"><%= group_totals %></span> + <span class="name"><%= group_name %></span> <span class="badge badge-count count"><%= group_count %></span> <span class="totals"><%= group_totals %></span> <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %> </td> diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb index 019ddbb53..6bdd5b89a 100644 --- a/app/views/timelog/_list.html.erb +++ b/app/views/timelog/_list.html.erb @@ -23,7 +23,7 @@ <span class="expander" onclick="toggleRowGroup(this);"> </span> <span class="name"><%= group_name %></span> <% if group_count %> - <span class="count"><%= group_count %></span> + <span class="badge badge-count count"><%= group_count %></span> <% end %> <span class="totals"><%= group_totals %></span> <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index b94f210bf..5d6c62cf2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -345,8 +345,8 @@ table.plugins span.url { display: block; font-size: 0.9em; } table.list.enumerations {table-layout: fixed; margin-bottom: 2em;} tr.group td { padding: 0.8em 0 0.5em 0.3em; border-bottom: 1px solid #ccc; text-align:left; background-color: #fff;} -tr.group span.name {font-weight:bold;} -tr.group span.count {font-weight:bold; position:relative; top:-1px; color:#fff; font-size:10px; background:#9DB9D5; padding:0px 6px 1px 6px; border-radius:3px; margin-left:4px;} +tr.group span.count {top:-1px;} +tr.group span.name {font-weight:bold;}} tr.group span.totals {color: #aaa; font-size: 80%;} tr.group span.totals .value {font-weight:bold; color:#777;} tr.group a.toggle-all { color: #aaa; font-size: 80%; display:none; float:right; margin-right:4px;} @@ -474,7 +474,7 @@ div.issue div.subject p {margin: 0; margin-bottom: 0.1em; font-size: 90%; color: div.issue div.subject>div>p { margin-top: 0.5em; } div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;} div.issue p.author {margin-top:0.5em;} -div.issue span.private, div.journal span.private { position:relative; bottom: 2px; text-transform: uppercase; background: #d22; color: #fff; font-weight:bold; padding: 0px 2px 0px 2px; font-size: 60%; margin-right: 2px; border-radius: 2px;} +div.issue span.private, div.journal span.private {font-size: 60%;} div.issue .next-prev-links {color:#999;} div.issue .attributes {margin-top: 2em;} div.issue .attributes .attribute {padding-left:180px; clear:left; min-height: 1.8em;} @@ -1280,6 +1280,26 @@ div.wiki img {vertical-align:middle; max-width:100%;} .version-behind-schedule a, .issue-behind-schedule a {color: #f66914;} .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;} +/***** Badges *****/ +.badge { + position:relative; + font-weight:bold; + font-size: 10px; + bottom: 2px; + padding: 0px 2px 0px 2px; + margin-right: 2px; + border-radius: 2px; + text-transform: uppercase; + text-decoration: none; +} +.badge-private { + background: #d22; + color: #fff; +} +.badge-count { + color: #fff; + background:#9DB9D5; +} /***** Icons *****/ .icon { background-position: 0% 50%; |