summaryrefslogtreecommitdiff
path: root/app/views/search/results
diff options
context:
space:
mode:
authorSullivan SENECHAL <soullivaneuh@gmail.com>2014-10-02 00:21:29 +0200
committerSullivan SENECHAL <soullivaneuh@gmail.com>2014-10-03 12:19:24 +0200
commit5d8be4438add1183d91e030b852c628cf09f4916 (patch)
treefc06a25a526de719d3bc9c7ba5d4ebb4fe69a828 /app/views/search/results
parent0cc30145f441a16ce513bba942ea67ede4086a7f (diff)
downloadgitlab-ce-5d8be4438add1183d91e030b852c628cf09f4916.tar.gz
Upgrade to Font Awesome v4.2
Diffstat (limited to 'app/views/search/results')
-rw-r--r--app/views/search/results/_blob.html.haml2
-rw-r--r--app/views/search/results/_empty.html.haml2
-rw-r--r--app/views/search/results/_note.html.haml2
-rw-r--r--app/views/search/results/_snippet_blob.html.haml4
-rw-r--r--app/views/search/results/_snippet_title.html.haml2
-rw-r--r--app/views/search/results/_wiki_blob.html.haml2
6 files changed, 7 insertions, 7 deletions
diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml
index f9d217e8408..b46b4832e19 100644
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
@@ -2,7 +2,7 @@
.file-holder
.file-title
= link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do
- %i.icon-file
+ %i.fa.fa-file
%strong
= blob.filename
.file-content.code.term
diff --git a/app/views/search/results/_empty.html.haml b/app/views/search/results/_empty.html.haml
index 3615f6ae52a..01fb8cd9b8e 100644
--- a/app/views/search/results/_empty.html.haml
+++ b/app/views/search/results/_empty.html.haml
@@ -1,4 +1,4 @@
.search_box
.search_glyph
- %span.icon-search
+ %span.fa.fa-search
%h4 #{message}
diff --git a/app/views/search/results/_note.html.haml b/app/views/search/results/_note.html.haml
index 6a446538574..f2327cd69cc 100644
--- a/app/views/search/results/_note.html.haml
+++ b/app/views/search/results/_note.html.haml
@@ -1,7 +1,7 @@
- project = note.project
.search-result-row
%h5.note-search-caption.str-truncated
- %i.icon-comment
+ %i.fa.fa-comment
= link_to_member(project, note.author, avatar: false)
commented on
diff --git a/app/views/search/results/_snippet_blob.html.haml b/app/views/search/results/_snippet_blob.html.haml
index a3d909d44dc..6fc2cdf6362 100644
--- a/app/views/search/results/_snippet_blob.html.haml
+++ b/app/views/search/results/_snippet_blob.html.haml
@@ -11,7 +11,7 @@
= link_to snippet_path do
.file-holder
.file-title
- %i.icon-file
+ %i.fa.fa-file
%strong= snippet_blob[:snippet_object].file_name
%span.options
.btn-group.tree-btn-group.pull-right
@@ -46,7 +46,7 @@
- offset = defined?(snippet[:start_line]) ? snippet[:start_line] : 1
- i = index + offset
= link_to snippet_path+"#L#{i}", id: "L#{i}", rel: "#L#{i}" do
- %i.icon-link
+ %i.fa.fa-link
= i
- unless snippet == snippet_blob[:snippet_chunks].last
%a
diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml
index 84abb9293b2..f7e5ee5e20e 100644
--- a/app/views/search/results/_snippet_title.html.haml
+++ b/app/views/search/results/_snippet_title.html.haml
@@ -4,7 +4,7 @@
= truncate(snippet_title.title, length: 60)
- if snippet_title.private?
%span.label.label-gray
- %i.icon-lock
+ %i.fa.fa-lock
private
%span.cgray.monospace.tiny.pull-right.term
= snippet_title.file_name
diff --git a/app/views/search/results/_wiki_blob.html.haml b/app/views/search/results/_wiki_blob.html.haml
index 75414d73b0c..e361074b6a0 100644
--- a/app/views/search/results/_wiki_blob.html.haml
+++ b/app/views/search/results/_wiki_blob.html.haml
@@ -2,7 +2,7 @@
.file-holder
.file-title
= link_to project_wiki_path(@project, wiki_blob.filename) do
- %i.icon-file
+ %i.fa.fa-file
%strong
= wiki_blob.filename
.file-content.code.term