Commit 1c509124 authored by Naveen jain's avatar Naveen jain

Merge branch 'dev' into 'master'

Update contact-us page and Upgrade font-awesome to v5

See merge request !304
parents 1e88a683 fe93b287
Pipeline #52886312 passed with stage
in 2 minutes and 31 seconds
......@@ -41,7 +41,7 @@
<a href="#tileModal5" class="tile-link" data-toggle="modal">
<div class="tile-hover">
<div class="tile-hover-content">
<i class="fa fa-plus fa-3x"></i>
<i class="fas fa-plus fa-3x"></i>
</div>
</div>
<!-- Source: https://www.123freevectors.com/free-tree-vector-collection/ -->
......@@ -57,7 +57,7 @@
<a href="#tileModal6" class="tile-link" data-toggle="modal">
<div class="tile-hover">
<div class="tile-hover-content">
<i class="fa fa-plus fa-3x"></i>
<i class="fas fa-plus fa-3x"></i>
</div>
</div>
<!-- Source: http://www.freepik.com/free-vector/social-media-icons_761444.htm -->
......
......@@ -330,6 +330,8 @@ section h3.section-subheading {
.tile-modal .modal-content img {
margin-bottom: 30px;
margin-left: auto;
margin-right: auto;
}
.tile-modal .close-modal {
......@@ -443,10 +445,6 @@ body {
}
/* Accordian Panel */
#accordion {
/*background-color: var(--primary-color);*/;
}
.panel {
border: none;
box-shadow: none;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
......@@ -7,7 +7,7 @@
"firefox" : {
"storeName" : "Firefox Add-On Gallery",
"storeLink" : "https://addons.mozilla.org/en-US/firefox/addon/carbon-footprint/",
"badge" : "./img/firefoxBadge.png"
"badge" : "./img/firefoxQuantumBadge.png"
},
"safari" : {
"storeName" : "Safari Extensions",
......
......@@ -116,7 +116,7 @@ gulp.task('coreFirefox', function() {
$('#rating-link')
.attr('href', variables['firefox']['storeLink'])
.html(
`<i class="fa fa-external-link" aria-hidden="true"></i> ${variables[
`<i class="fas fa-external-link-alt" aria-hidden="true"></i> ${variables[
'firefox'
]['storeName']}`
);
......@@ -221,7 +221,7 @@ gulp.task('coreChrome', function() {
$('#rating-link')
.attr('href', variables['chrome']['storeLink'])
.html(
`<i class="fa fa-external-link" aria-hidden="true"></i> ${variables[
`<i class="fas fa-external-link-alt" aria-hidden="true"></i> ${variables[
'chrome'
]['storeName']}`
);
......@@ -286,7 +286,7 @@ gulp.task('coreSafari', function() {
$('#rating-link')
.attr('href', variables['safari']['storeLink'])
.html(
`<i class="fa fa-external-link" aria-hidden="true"></i> ${variables[
`<i class="fas fa-external-link-alt" aria-hidden="true"></i> ${variables[
'safari'
]['storeName']}`
);
......@@ -382,7 +382,7 @@ gulp.task('coreWebExt', function() {
$('#rating-link')
.attr('href', variables['firefox']['storeLink'])
.html(
`<i class="fa fa-external-link" aria-hidden="true"></i> ${variables[
`<i class="fas fa-external-link-alt" aria-hidden="true"></i> ${variables[
'firefox'
]['storeName']}`
);
......
{
"name": "carbon-footprint",
"version": "6.0.1",
"version": "6.0.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -4462,12 +4462,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -4487,7 +4489,8 @@
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
......@@ -4635,6 +4638,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment