styles work_package#show based on changes to avatar

pull/1725/head
Jens Ulferts 10 years ago
parent a12e61db51
commit ad8f19f030
  1. 20
      app/assets/stylesheets/_work_packages.scss
  2. 5
      app/assets/stylesheets/default/main.css.erb
  3. 2
      app/helpers/journals_helper.rb
  4. 3
      app/helpers/watchers_helper.rb
  5. 4
      app/helpers/work_packages_helper.rb
  6. 2
      app/views/work_packages/_show_attributes.html.erb
  7. 2
      app/views/work_packages/show.html.erb

@ -51,3 +51,23 @@ select.to-validate.ng-dirty.ng-valid, input.to-validate.ng-dirty.ng-valid { bord
select.to-validate.ng-dirty.ng-invalid, input.to-validate.ng-dirty.ng-invalid { border:1px solid Red; }
select.to-validate.ng-dirty.ng-valid ~ span.ok, input.to-validate.ng-dirty.ng-valid ~ span.ok { color:green; display:inline; }
select.to-validate.ng-dirty.ng-invalid ~ span.ko, input.to-validate.ng-dirty.ng-invalid ~ span.ko { color:red; display:inline; }
.controller-work_packages.action-show .work_package tr {
line-height: 20px;
}
.controller-work_packages.action-show .avatar-mini {
float: left;
}
.controller-work_packages.action-show .avatar-mini + a {
padding-left: 3px;
line-height: 20px;
vertical-align: sub;
}
.controller-work_packages.action-show #watchers .delete {
padding-left: 3px;
line-height: 20px;
vertical-align: sub;
}

@ -534,7 +534,7 @@ div.tooltip:hover span.tip, div.tooltip.hover span.tip {
empty-cells: show;
text-align: center;
float: left;
margin: 1px 6px 1px 0px;
margin: 3px 6px 1px 0px;
border: 1px solid #BBBBBB;
border-collapse: separate;
-moz-border-radius: 3px;
@ -953,9 +953,6 @@ div.issue hr {
#content div.issue table th {
font-weight: bold;
}
.issue p {
margin-bottom: 5px;
}
.attachments h4 {
margin-bottom: 6px;
background: url(<%= asset_path 'files-showhide.png' %>) no-repeat right bottom;

@ -51,7 +51,7 @@ module JournalsHelper
def render_journal_details(journal, header_label = :label_updated_time_by, model=nil, options={})
header = <<-HTML
<div class="profile-wrap">
#{avatar(journal.user, :size => "40")}
#{avatar(journal.user)}
</div>
<h4>
<div class="journal-link" style="float:right;">#{link_to "##{journal.anchor}", :anchor => "note-#{journal.anchor}"}</div>

@ -63,7 +63,7 @@ module WatchersHelper
lis = object.watcher_users.sort.collect do |user|
watcher = object.watchers(true).find{|u| u.user_id == user.id }
content_tag :li do
avatar(user, :size => "16") +
avatar(user, :class => 'avatar-mini') +
link_to_user(user, :class => 'user') +
if remove_allowed
' '.html_safe + link_to(icon_wrapper('icon-context icon-close delete-ctrl',
@ -71,7 +71,6 @@ module WatchersHelper
watcher_path(watcher),
:method => :delete,
:remote => true,
:style => "vertical-align: middle",
:title => l(:button_delete_watcher, name: user.name),
:class => "delete no-decoration-on-hover")
else

@ -373,7 +373,7 @@ module WorkPackagesHelper
def work_package_show_assigned_to_attribute(work_package)
work_package_show_table_row(:assigned_to) do
content = avatar(work_package.assigned_to, :size => "14").html_safe
content = avatar(work_package.assigned_to, class: 'avatar-mini').html_safe
content << (work_package.assigned_to ? link_to_user(work_package.assigned_to) : empty_element_tag)
content
end
@ -381,7 +381,7 @@ module WorkPackagesHelper
def work_package_show_responsible_attribute(work_package)
work_package_show_table_row(:responsible) do
content = avatar(work_package.responsible, :size => "14").html_safe
content = avatar(work_package.responsible, class: 'avatar-mini').html_safe
content << (work_package.responsible ? link_to_user(work_package.responsible) : empty_element_tag)
content
end

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<div class="issue details">
<div class="work_package issue details">
<div class="meta">
<% attributes = work_package_show_attributes(work_package) %>
<div id="left" style="float:left; width:50%;">

@ -39,7 +39,7 @@ See doc/COPYRIGHT.rdoc for more details.
<div class = "details">
<div class="profile-wrap">
<%= avatar(work_package.author, :size => "40") %>
<%= avatar(work_package.author) %>
</div>
<p class="author">

Loading…
Cancel
Save