Merge pull request #1460 from opf/feature/10133_repository_dir_expander_mouse_icon

[Release][Fix] 10133 repository dir expander mouse icon
pull/1482/head
ulferts 11 years ago
commit 9c51533c2f
  1. 1
      app/assets/stylesheets/default/main.css.erb
  2. 2
      app/assets/stylesheets/global/_variables.sass
  3. 12
      app/assets/stylesheets/scm.css.sass
  4. 4
      app/views/repositories/_dir_list_content.html.erb

@ -101,7 +101,6 @@ tr.entry td.filename { width: 30%; }
tr.entry td.size { text-align: right; font-size: 90%; } tr.entry td.size { text-align: right; font-size: 90%; }
tr.entry td.revision, tr.entry td.author { text-align: center; } tr.entry td.revision, tr.entry td.author { text-align: center; }
tr.entry td.age { text-align: right; } tr.entry td.age { text-align: right; }
tr.entry.file td.filename a { margin-left: 16px; }
tr span.expander {cursor: pointer;} tr span.expander {cursor: pointer;}
tr.open span .expand { display:none; } tr.open span .expand { display:none; }

@ -167,3 +167,5 @@ $wiki_toc_header_font_size: 10px !default
$wiki_toc_ul_font_size: 0.8em !default $wiki_toc_ul_font_size: 0.8em !default
$journal_attribute_font_size: 11px !default $journal_attribute_font_size: 11px !default
$repository_entry_filename_margin_left: 24px !default

@ -417,9 +417,11 @@ tr.dir
span span
&.dir-expander &.dir-expander
@include icon-common @include icon-common
margin-right: -15px cursor: pointer
&:before &:before
content: "\e089" content: "\e089"
margin-left: 5px
padding: 0
&.loading &.loading
span.dir-expander:before span.dir-expander:before
content: "\e07a" content: "\e07a"
@ -429,3 +431,11 @@ tr.dir
&.open &.open
span.dir-expander:before span.dir-expander:before
content: "\e082" content: "\e082"
tr
&.entry
&.file
td
&.filename
a
margin-left: $repository_entry_filename_margin_left

@ -35,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details.
<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= h(entry.kind) %>"> <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= h(entry.kind) %>">
<td style="padding-left: <%=18 * depth%>px;" class="filename"> <td style="padding-left: <%=18 * depth%>px;" class="filename">
<% if entry.is_dir? %> <% if entry.is_dir? %>
<span class="icon dir-expander" onclick="<%= remote_function :url => {:action => 'show', :project_id => @project, :path => to_path_param(ent_path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id}, <span class="icon-context dir-expander" onclick="<%= remote_function :url => {:action => 'show', :project_id => @project, :path => to_path_param(ent_path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
:method => :get, :method => :get,
:update => { :success => tr_id }, :update => { :success => tr_id },
:position => :after, :position => :after,
@ -44,7 +44,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %> <% end %>
<%= link_to h(ent_name), <%= link_to h(ent_name),
{:action => (entry.is_dir? ? 'show' : 'changes'), :project_id => @project, :path => to_path_param(ent_path), :rev => @rev}, {:action => (entry.is_dir? ? 'show' : 'changes'), :project_id => @project, :path => to_path_param(ent_path), :rev => @rev},
:class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%> :class => (entry.is_dir? ? 'icon-context icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
</td> </td>
<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td> <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
<% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %> <% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>

Loading…
Cancel
Save