summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAleksei Kvitinskii <aleksei.wm@gmail.com>2011-11-05 22:16:13 +0200
committerAleksei Kvitinskii <aleksei.wm@gmail.com>2011-11-05 22:16:13 +0200
commit62112dc0c7eae8d8c8e3d55fc13d3d58b7588899 (patch)
treef53937119eb297b633b153136848eaa3f46b97fc /app
parent6e08b5cc857b3b218df0b20745ad295e79abc722 (diff)
downloadgitlab-ce-62112dc0c7eae8d8c8e3d55fc13d3d58b7588899.tar.gz
add tags to project list
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/projects.css.scss14
-rw-r--r--app/assets/stylesheets/tags.css.css18
-rw-r--r--app/views/projects/_tile.html.haml5
3 files changed, 21 insertions, 16 deletions
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index c6ba8b465b2..766138ee3d0 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -270,20 +270,6 @@ input.ssh_project_url {
}
}
-#projects-list .small-tags a{
- font-size: 9px;
-
- display: inline-block;
- padding: 2px 3px 1px 3px;
- margin: 0px 3px 0px 0px;
- border-radius: 2px;
- background-color: #3b6bce;
- color: #FFF;
- text-shadow: none;
- font-weight: bold;
-}
-
-
.clear {
clear: both;
}
diff --git a/app/assets/stylesheets/tags.css.css b/app/assets/stylesheets/tags.css.css
index 0dfcc4fc8e8..afd458fd5d4 100644
--- a/app/assets/stylesheets/tags.css.css
+++ b/app/assets/stylesheets/tags.css.css
@@ -8,9 +8,23 @@
padding: 8px 11px 8px 11px;
margin: 1px 5px 0px 0px;
border-radius: 4px;
- border: 1px solid #d0e1ff;
- background-color: #d0e1ff;
+ border: 1px solid #72bbdf;
+ background-color: #72bbdf;
color: #0f326d;
font-weight: bold;
font-size: 14px;
+}
+
+
+.small-tags a{
+ font-size: 9px;
+
+ display: inline-block;
+ padding: 2px 3px 1px 3px;
+ margin: 0px 3px 0px 0px;
+ border-radius: 2px;
+ background-color: #72bbdf;
+ color: #FFF;
+ text-shadow: none;
+ font-weight: bold;
} \ No newline at end of file
diff --git a/app/views/projects/_tile.html.haml b/app/views/projects/_tile.html.haml
index 7c0b8679c08..cc891f63bf0 100644
--- a/app/views/projects/_tile.html.haml
+++ b/app/views/projects/_tile.html.haml
@@ -12,6 +12,11 @@
%span Last Activity:
- last_note = project.notes.last
= last_note ? last_note.created_at.stamp("24 Aug, 2011") : "Never"
+
+ %p.small-tags
+ - project.tag_list.each do |tag|
+ = link_to tag, "/tags/#{tag}"
+
.buttons
%a.browse-code.button.yellow{:href => tree_project_path(project)} Browse code
%a.commits.button.green{:href => project_commits_path(project)} Commits