From c146860e9288b7876880a0a68d40698b9a25dff0 Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Thu, 12 Jun 2014 13:03:53 +0200 Subject: [PATCH 1/4] Fix mouse pointer for directory expander --- app/assets/stylesheets/scm.css.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/scm.css.sass b/app/assets/stylesheets/scm.css.sass index 6f30903442..82414e3502 100644 --- a/app/assets/stylesheets/scm.css.sass +++ b/app/assets/stylesheets/scm.css.sass @@ -418,6 +418,7 @@ tr.dir &.dir-expander @include icon-common margin-right: -15px + cursor: pointer &:before content: "\e089" &.loading From b516f6abbc79034c9fe5f76206b9fb64f9700244 Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Mon, 16 Jun 2014 14:14:27 +0200 Subject: [PATCH 2/4] Fix expander and directory icon padding --- app/views/repositories/_dir_list_content.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb index 1ee98a6aef..3772013339 100644 --- a/app/views/repositories/_dir_list_content.html.erb +++ b/app/views/repositories/_dir_list_content.html.erb @@ -35,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details. <% if entry.is_dir? %> - + :class => (entry.is_dir? ? 'icon-context icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%> <%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %> <% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %> From 3b90a18fe1279f61b755de9ab415b32f5a13226a Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Mon, 16 Jun 2014 14:15:38 +0200 Subject: [PATCH 3/4] Fix expander icon's left's left margin --- app/assets/stylesheets/scm.css.sass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/scm.css.sass b/app/assets/stylesheets/scm.css.sass index 82414e3502..7508c51056 100644 --- a/app/assets/stylesheets/scm.css.sass +++ b/app/assets/stylesheets/scm.css.sass @@ -417,10 +417,11 @@ tr.dir span &.dir-expander @include icon-common - margin-right: -15px cursor: pointer &:before content: "\e089" + margin-left: 5px + padding: 0 &.loading span.dir-expander:before content: "\e07a" From d37b33aca5b9f5208c65e21495c3e18e272baf24 Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Mon, 16 Jun 2014 14:16:07 +0200 Subject: [PATCH 4/4] Make filename indentation themable --- app/assets/stylesheets/default/main.css.erb | 1 - app/assets/stylesheets/global/_variables.sass | 2 ++ app/assets/stylesheets/scm.css.sass | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/default/main.css.erb b/app/assets/stylesheets/default/main.css.erb index 45cdb14c9f..f6b4dcff2b 100644 --- a/app/assets/stylesheets/default/main.css.erb +++ b/app/assets/stylesheets/default/main.css.erb @@ -101,7 +101,6 @@ tr.entry td.filename { width: 30%; } 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 span.expander {cursor: pointer;} tr.open span .expand { display:none; } diff --git a/app/assets/stylesheets/global/_variables.sass b/app/assets/stylesheets/global/_variables.sass index 0b4b2b708a..8a90e0fab1 100644 --- a/app/assets/stylesheets/global/_variables.sass +++ b/app/assets/stylesheets/global/_variables.sass @@ -167,3 +167,5 @@ $wiki_toc_header_font_size: 10px !default $wiki_toc_ul_font_size: 0.8em !default $journal_attribute_font_size: 11px !default + +$repository_entry_filename_margin_left: 24px !default diff --git a/app/assets/stylesheets/scm.css.sass b/app/assets/stylesheets/scm.css.sass index 7508c51056..59ef018661 100644 --- a/app/assets/stylesheets/scm.css.sass +++ b/app/assets/stylesheets/scm.css.sass @@ -431,3 +431,11 @@ tr.dir &.open span.dir-expander:before content: "\e082" + +tr + &.entry + &.file + td + &.filename + a + margin-left: $repository_entry_filename_margin_left