meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-02 13:49:42 +00:00
Code Issues Releases Wiki Activity

Move styles for count and private to a new class named 'badge' (#29391).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18052 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-04-09 14:45:52 +00:00
parent da2e42147b
commit 766452e841
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/issues_helper.rb
View File

@ -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)

2
app/helpers/journals_helper.rb
View File

@ -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

2
app/views/issues/_list.html.erb
View File

@ -25,7 +25,7 @@
<tr class="group open">
<td colspan="<%= query.inline_columns.size + 2 %>">
<span class="expander" onclick="toggleRowGroup(this);">&nbsp;</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>

2
app/views/timelog/_list.html.erb
View File

@ -23,7 +23,7 @@
<span class="expander" onclick="toggleRowGroup(this);">&nbsp;</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)}",

26
public/stylesheets/application.css
View File

@ -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%;