Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
31bc2b94
Commit
31bc2b94
authored
Jul 06, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tree css class conflict
parent
0a6b64e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+1
-1
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+0
-0
app/views/refs/_tree_item.html.haml
app/views/refs/_tree_item.html.haml
+2
-2
No files found.
app/assets/stylesheets/main.scss
View file @
31bc2b94
...
...
@@ -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
...
...
app/assets/stylesheets/tree.scss
→
app/assets/stylesheets/
sections/
tree.scss
View file @
31bc2b94
File moved
app/views/refs/_tree_item.html.haml
View file @
31bc2b94
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment