Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix font awesome icon classes #1354

Merged
merged 1 commit into from
Jun 4, 2018
Merged

Fix font awesome icon classes #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/assets/v2/js/pages/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ var addTechStackKeywordFilters = function(value) {
isTechStack = true;

$('.filter-tags').append('<a class="filter-tag tech_stack"><span>' + value + '</span>' +
'<i class="fa fa-times" onclick="removeFilter(\'tech_stack\', \'' + value + '\')"></i></a>');
'<i class="fas fa-times" onclick="removeFilter(\'tech_stack\', \'' + value + '\')"></i></a>');

$('input[name="tech_stack"][value=' + value + ']').prop('checked', true);
}
Expand All @@ -154,7 +154,7 @@ var addTechStackKeywordFilters = function(value) {
}

$('.filter-tags').append('<a class="filter-tag keywords"><span>' + value + '</span>' +
'<i class="fa fa-times" onclick="removeFilter(\'keywords\', \'' + value + '\')"></i></a>');
'<i class="fas fa-times" onclick="removeFilter(\'keywords\', \'' + value + '\')"></i></a>');
}
};

Expand All @@ -167,15 +167,15 @@ var getFilters = function() {
$.each($('input[name="' + key + '"]:checked'), function() {
if ($(this).attr('val-ui')) {
_filters.push('<a class="filter-tag ' + key + '"><span>' + $(this).attr('val-ui') + '</span>' +
'<i class="fa fa-times" onclick="removeFilter(\'' + key + '\', \'' + $(this).attr('value') + '\')"></i></a>');
'<i class="fas fa-times" onclick="removeFilter(\'' + key + '\', \'' + $(this).attr('value') + '\')"></i></a>');
}
});
}

if (localStorage['keywords']) {
localStorage['keywords'].split(',').forEach(function(v, k) {
_filters.push('<a class="filter-tag keywords"><span>' + v + '</span>' +
'<i class="fa fa-times" onclick="removeFilter(\'keywords\', \'' + v + '\')"></i></a>');
'<i class="fas fa-times" onclick="removeFilter(\'keywords\', \'' + v + '\')"></i></a>');
});
}

Expand Down
8 changes: 4 additions & 4 deletions app/assets/v2/js/shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,13 +504,13 @@ var randomElement = function(array) {

var trigger_sidebar_web3_disabled = function() {
$('#upper_left').addClass('disabled');
$('#sidebar_head').html('<i class="fa fa-question"></i>');
$('#sidebar_head').html('<i class="fas fa-question"></i>');
$('#sidebar_p').html('<p>Web3 disabled</p><p>Please install <a href="https://metamask.io/?utm_source=gitcoin.co&utm_medium=referral" target="_blank" rel="noopener noreferrer">Metamask</a> <br> <a href="/web3" target="_blank" rel="noopener noreferrer">What is Metamask and why do I need it?</a>.</p>');
};

var trigger_sidebar_web3_locked = function() {
$('#upper_left').addClass('disabled');
$('#sidebar_head').html('<i class="fa fa-lock"></i>');
$('#sidebar_head').html('<i class="fas fa-lock"></i>');
$('#sidebar_p').html('<p>Web3 locked</p><p>Please unlock <a href="https://metamask.io/?utm_source=gitcoin.co&utm_medium=referral" target="_blank" rel="noopener noreferrer">Metamask</a>.<p>');
};

Expand Down Expand Up @@ -547,11 +547,11 @@ var trigger_sidebar_web3 = function(network) {

if (is_supported_network) {
$('#upper_left').removeClass('disabled');
$('#sidebar_head').html("<i class='fa fa-wifi'></i>");
$('#sidebar_head').html("<i class='fas fa-wifi'></i>");
$('#sidebar_p').html('<p>Web3 enabled<p>' + sidebar_p);
} else {
$('#upper_left').addClass('disabled');
$('#sidebar_head').html("<i class='fa fa-battery-empty'></i>");
$('#sidebar_head').html("<i class='fas fa-battery-empty'></i>");
sidebar_p += '<p>(try ' + recommended_network + ')</p>';
$('#sidebar_p').html('<p>Unsupported network</p>' + sidebar_p);
}
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/bounty_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="col-12 col-md-2 left-rails text-center" style="background: #F2F6F9;">
{% include 'shared/current_balance.html' %}
<div class="explorer font-body">
<a href="{% url 'explorer' %}"><i class="fa fa-chevron-left"></i> {% trans "Back to Issue Explorer" %}</a>
<a href="{% url 'explorer' %}"><i class="fas fa-chevron-left"></i> {% trans "Back to Issue Explorer" %}</a>
</div>
</div>

Expand Down