From 31bc2b9495edcdfcc4c70c1e4d7bff715bcd57f5 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 6 Jul 2012 16:42:13 +0300 Subject: [PATCH] Fix tree css class conflict --- app/assets/stylesheets/main.scss | 2 +- app/assets/stylesheets/{ => sections}/tree.scss | 0 app/views/refs/_tree_item.html.haml | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename app/assets/stylesheets/{ => sections}/tree.scss (100%) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index bff24dd6..5f13f301 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -136,7 +136,7 @@ $hover: #FDF5D9; /** * Code (files list) styles. Browsing project files there */ -@import "tree.scss"; +@import "sections/tree.scss"; /** * This file represent notes(comments) styles diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/sections/tree.scss similarity index 100% rename from app/assets/stylesheets/tree.scss rename to app/assets/stylesheets/sections/tree.scss diff --git a/app/views/refs/_tree_item.html.haml b/app/views/refs/_tree_item.html.haml index fe2f7293..45ea5371 100644 --- a/app/views/refs/_tree_item.html.haml +++ b/app/views/refs/_tree_item.html.haml @@ -13,10 +13,10 @@ - else = image_tag "file_dir.png" = link_to truncate(content.name, :length => 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), :remote => :true - %td.cgray + %td.tree_time_ago.cgray = time_ago_in_words(content_commit.committed_date) ago - %td.commit + %td.tree_commit - tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name) - if tm %strong= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)