replaced Glyphicon icons by Font Awesome icons

This commit is contained in:
Hauke Klement
2015-03-18 10:19:39 +01:00
parent d109663cb9
commit 9d6b79c919
7 changed files with 11 additions and 11 deletions

View File

@ -549,7 +549,7 @@ $(function() {
};
var showSpinner = function(initiator) {
$(initiator).find('i.fa, i.glyphicon').hide();
$(initiator).find('i.fa').hide();
$(initiator).find('i.fa-spin').show();
};

View File

@ -2,7 +2,7 @@ h1 {
margin-bottom: 1em;
}
i.fa, i.glyphicon {
i.fa {
margin-right: 0.5em;
}

View File

@ -29,7 +29,7 @@ module ApplicationHelper
private :label_column
def no
content_tag(:i, nil, class: 'glyphicon glyphicon-remove')
content_tag(:i, nil, class: 'fa fa-times')
end
def progress_bar(value)
@ -73,6 +73,6 @@ module ApplicationHelper
private :value_column
def yes
content_tag(:i, nil, class: 'glyphicon glyphicon-ok')
content_tag(:i, nil, class: 'fa fa-check')
end
end

View File

@ -2,7 +2,7 @@
- if current_user.internal_user?
li.dropdown
a.dropdown-toggle data-toggle='dropdown' href='#'
i.glyphicon.glyphicon-user
i.fa.fa-user
= current_user
span.caret
ul.dropdown-menu role='menu'
@ -12,7 +12,7 @@
- else
li
p.navbar-text
i.glyphicon.glyphicon-user
i.fa.fa-user
= current_user
- else
li = link_to(sign_in_path) do

View File

@ -2,8 +2,8 @@
hr
= render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-cause' => 'file'}, icon: 'glyphicon glyphicon-plus', id: 'create-file', label: t('exercises.editor.create_file'))
= render('editor_button', classes: 'btn-block btn-warning btn-sm', data: {:'data-cause' => 'file', :'data-message-confirm' => t('shared.confirm_destroy')}, icon: 'glyphicon glyphicon-trash', id: 'destroy-file', label: t('exercises.editor.destroy_file'))
= render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-cause' => 'file'}, icon: 'fa fa-plus', id: 'create-file', label: t('exercises.editor.create_file'))
= render('editor_button', classes: 'btn-block btn-warning btn-sm', data: {:'data-cause' => 'file', :'data-message-confirm' => t('shared.confirm_destroy')}, icon: 'fa fa-times', id: 'destroy-file', label: t('exercises.editor.destroy_file'))
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-download', id: 'download', label: t('exercises.editor.download'))
= render('shared/modal', id: 'modal-file', template: 'code_ocean/files/_form', title: t('exercises.editor.create_file'))

View File

@ -1,4 +1,4 @@
- if policy(model).new?
a.btn.btn-success href=(local_assigns.has_key?(:path) ? path : send(:"new_#{model.model_name.singular}_path"))
i.glyphicon.glyphicon-plus
i.fa.fa-plus
= t('shared.new_model', model: model.model_name.human)

View File

@ -37,7 +37,7 @@ describe ApplicationHelper do
describe '#no' do
it "builds an 'i' tag" do
expect(no).to have_css('i.glyphicon.glyphicon-remove')
expect(no).to have_css('i.fa.fa-times')
end
end
@ -139,7 +139,7 @@ describe ApplicationHelper do
describe '#yes' do
it "builds an 'i' tag" do
expect(yes).to have_css('i.glyphicon.glyphicon-ok')
expect(yes).to have_css('i.fa.fa-check')
end
end
end