Fixes for scm entry to switch between folder and folder-open icons and adjusts the padding for file icons (#23980).

git-svn-id: https://svn.redmine.org/redmine/trunk@23090 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 6 insertions, 5 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4560bff09..8226f0f69 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -575,18 +575,19 @@ function expandScmEntry(id) {
 
 function scmEntryClick(id, url) {
     var el = $('#'+id);
+
     if (el.hasClass('open')) {
         collapseScmEntry(id);
         el.find('.expander').switchClass('icon-expanded', 'icon-collapsed');
         el.addClass('collapsed');
-        updateSVGIcon(el[0], 'folder')
+        updateSVGIcon(el.find('.icon-folder')[0], 'folder')
 
         return false;
     } else if (el.hasClass('loaded')) {
         expandScmEntry(id);
         el.find('.expander').switchClass('icon-collapsed', 'icon-expanded');
         el.removeClass('collapsed');
-        updateSVGIcon(el[0], 'folder-open')
+        updateSVGIcon(el.find('.icon-folder-open')[0], 'folder-open')
 
         return false;
     }
@@ -599,7 +600,7 @@ function scmEntryClick(id, url) {
       success: function(data) {
         el.after(data);
         el.addClass('open').addClass('loaded').removeClass('loading');
-        updateSVGIcon(el[0], 'folder-open')
+        updateSVGIcon(el.find('.icon-folder')[0], 'folder-open')
         el.find('.expander').switchClass('icon-collapsed', 'icon-expanded');
       }
     });
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index ddf8043d2..2f4885091 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -338,10 +338,10 @@ tr.entry td.filename_no_report {width:70%; text-align:left;}
 tr.entry td.size { text-align: right; font-size: 90%; }
 tr.entry td.revision, tr.entry td.author { text-align: center; }
 tr.entry td.age { text-align: right; }
-tr.entry.file td.filename a { margin-left: 16px; }
+tr.entry.file td.filename a { margin-left: 26px; }
 tr.entry.file td.filename_no_report a { margin-left: 16px; }
 
-tr span.expander, .gantt_subjects div > span.expander {background-position: 2px 50%; padding-left: 8px; margin-left: 0; cursor: pointer;}
+tr span.expander, .gantt_subjects div > span.expander {padding-left: 4px; margin-left: 0; cursor: pointer;}
 .gantt_subjects div > span.expander {padding-left: 12px;}
 .gantt_subjects div > span .icon-gravatar {float: none;}
 .gantt_subjects svg {margin-left: 4px; margin-right: 4px;}