diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-06 16:42:13 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-06 16:42:13 +0300 |
| commit | 31bc2b9495edcdfcc4c70c1e4d7bff715bcd57f5 (patch) | |
| tree | a5e9a398069c30e2b98470d06aa96f83de208aa4 | |
| parent | 0a6b64e6a9c5858801a7af2c408416b1c98de471 (diff) | |
| download | gitlab-ce-31bc2b9495edcdfcc4c70c1e4d7bff715bcd57f5.tar.gz | |
Fix tree css class conflict
| -rw-r--r-- | app/assets/stylesheets/main.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/tree.scss (renamed from app/assets/stylesheets/tree.scss) | 0 | ||||
| -rw-r--r-- | app/views/refs/_tree_item.html.haml | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index bff24dd68b9..5f13f301f35 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 index 912c63ee16b..912c63ee16b 100644 --- a/app/assets/stylesheets/tree.scss +++ b/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 fe2f7293347..45ea53718c0 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) |