Skip to content

Commit

Permalink
feat: Replace font-awesome
Browse files Browse the repository at this point in the history
  • Loading branch information
alexwilson committed Oct 17, 2018
1 parent 8c4ad54 commit c529ac5
Show file tree
Hide file tree
Showing 21 changed files with 1,269 additions and 48 deletions.
6 changes: 3 additions & 3 deletions _data/social.yml
@@ -1,9 +1,9 @@
- title: "Alex's Twitter.com profile"
url: "https://twitter.com/antoligy"
glyph: "fa-twitter"
svg: "/svg/twitter.svg"
- title: "Alex's LinkedIn.com profile"
url: "https://www.linkedin.com/in/alex-"
glyph: "fa-linkedin"
svg: "/svg/linkedin.svg"
- title: "Alex's Github.com profile"
url: "https://github.com/antoligy"
glyph: "fa-github"
svg: "/svg/github.svg"
4 changes: 3 additions & 1 deletion _includes/component/footer.html
Expand Up @@ -3,7 +3,9 @@
<span class="text-muted">
&copy; Alex Wilson {{ "now"|date: '%Y' }}
{% for item in site.data.social %}
<a href="{{ item.url }}" class="fa text-muted {{ item.glyph }}"></a>
<a class="footer__social-link" href="{{ item.url }}" title="{{ item.title }}">
<img src="{{ item.svg }}" alt="{{ item.title }}" class="footer__social-link" />
</a>
{% endfor %}
</span>
</div>
Expand Down
4 changes: 3 additions & 1 deletion _includes/component/header.html
Expand Up @@ -19,7 +19,9 @@ <h1 class="alex-header__name">Alex Wilson</h1>
<li class="alex-header__nav-item alex-header__nav-item--spacer"></li>
{% for item in site.data.social %}
<li class="alex-header__nav-item">
<a href="{{ item.url }}" class="fa large {{ item.glyph }}" title="{{ item.title }}"></a>
<a title="{{ item.title }}" href="{{ item.url }}">
<img src="{{ item.svg }}" class="large" alt="{{ item.title }}" height="1em" />
</a>
</li>
{% endfor %}
</ul>
Expand Down
8 changes: 2 additions & 6 deletions _includes/component/pager.html
Expand Up @@ -5,9 +5,7 @@
{% if paginator.previous_page %}
href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' | replace: 'index.html', '' }}"
{% endif %}
>
<i class="fa fa-chevron-left"></i> Prev
</a>
>&lsaquo; Prev</a>
</li>

{% for page in (1..paginator.total_pages) %}
Expand Down Expand Up @@ -38,9 +36,7 @@
{% if paginator.next_page %}
href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' | replace: 'index.html', '' }}"
{% endif %}
>
Next <i class="fa fa-chevron-right"></i>
</a>
>Next &rsaquo;</a>
</li>

</ul>
19 changes: 12 additions & 7 deletions _includes/component/share.html
@@ -1,19 +1,24 @@
<div class="alex-share">
<ul>
<li>
<a class="fa fa-2x fa-twitter-square" href="https://twitter.com/intent/tweet?url={{site.url}}{{page.url}}&amp;text={{page.title}}&amp;related=antoligy&amp;via=antoligy"></a>
<a href="https://twitter.com/intent/tweet?url={{site.url}}{{page.url}}&amp;text={{page.title}}&amp;related=antoligy&amp;via=antoligy">
<img src="/svg/twitter.svg" title="Share on Twitter" />
</a>
</li>
<li>
<a class="fa fa-2x fa-facebook-square" href="http://www.facebook.com/sharer.php?u={{site.url}}{{page.url}}&amp;t={{page.title}}"></a>
<a href="http://www.facebook.com/sharer.php?u={{site.url}}{{page.url}}&amp;t={{page.title}}">
<img src="/svg/facebook.svg" title="Share on Twitter" />
</a>
</li>
<li>
<a class="fa fa-2x fa-linkedin-square" href="http://www.linkedin.com/shareArticle?mini=true&amp;url={{site.url}}{{page.url}}&amp;title={{page.title}}"></a>
<a href="http://www.linkedin.com/shareArticle?mini=true&amp;url={{site.url}}{{page.url}}&amp;title={{page.title}}">
<img src="/svg/linkedin.svg" title="Share on LinkedIn" />
</a>
</li>
<li>
<a class="fa fa-2x fa-google-plus-square" href="https://plus.google.com/share?url={{site.url}}{{page.url}}"></a>
</li>
<li>
<a class="fa fa-2x fa-reddit-square" href="http://reddit.com/submit?url={{site.url}}{{page.url}}&amp;title={{page.title}}"></a>
<a href="http://reddit.com/submit?url={{site.url}}{{page.url}}&amp;title={{page.title}}">
<img src="/svg/reddit.svg" title="Share on Reddit" />
</a>
</li>
</ul>
</div>
4 changes: 2 additions & 2 deletions _includes/webpack.html
@@ -1,6 +1,6 @@
<style>html { font-family: sans-serif; } .wf-loading { font-family: sans-serif !important; }</style>
<link rel="stylesheet" type="text/css" href="/dist/main.06105d36baae31b5be57.css"></link>
<script src="/dist/main.06105d36baae31b5be57.js" async="async"></script>
<link rel="stylesheet" type="text/css" href="/dist/main.6186d568ffb425a088c0.css"></link>
<script src="/dist/main.6186d568ffb425a088c0.js" async="async"></script>
<script type="text/javascript" data-no-instant>
function fire() {
document.dispatchEvent(new CustomEvent('a.load'));
Expand Down
6 changes: 0 additions & 6 deletions dist/main.06105d36baae31b5be57.css

This file was deleted.

1 change: 1 addition & 0 deletions dist/main.6186d568ffb425a088c0.css

Large diffs are not rendered by default.

File renamed without changes.
1 change: 0 additions & 1 deletion package.json
Expand Up @@ -21,7 +21,6 @@
"bootstrap": "^4.0.0-alpha.2",
"bootstrap-sass": "^3.3.7",
"file-loader": "^1.1.11",
"font-awesome": "^4.6.3",
"handlebars-loader": "^1.4.0",
"include-media": "^1.4.9",
"instantclick2": "~1.1.0",
Expand Down
9 changes: 9 additions & 0 deletions src/scss/alex/_footer.scss
@@ -0,0 +1,9 @@
.footer {
color: $grey-4;
}

.footer__social-link {
filter: brightness(2);
height: .8rem;
width: .8rem;
}
8 changes: 6 additions & 2 deletions src/scss/alex/_header.scss
Expand Up @@ -75,8 +75,12 @@
border-bottom: #AAA solid 0.5rem;
}

&.large {
font-size: 2rem;
img.large {
filter: invert(1);
height: 1.6rem;
width: 1.6rem;
padding: 0.25rem 0;
margin: -1rem 0;
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/scss/alex/_share.scss
Expand Up @@ -7,6 +7,11 @@

li {
display: inline;

img {
height: 2rem;
width: 2rem;
}
}
}
}
3 changes: 0 additions & 3 deletions src/scss/font-awesome.scss

This file was deleted.

13 changes: 1 addition & 12 deletions src/scss/main.scss
Expand Up @@ -16,6 +16,7 @@
@import "alex/typography";
@import "alex/layout";
@import "alex/header";
@import "alex/footer";
@import "alex/forms";
@import "alex/buttons";
@import "alex/pager";
Expand All @@ -25,18 +26,6 @@
@import "alex/listing";
@import "alex/cards";

// Font Awesome
@import "font-awesome";

/* Override for font-awesome :( */
.fa-inverse {
color: $orange-2 !important;
}

.text-muted {
color: #777 !important;
}

.panel {
background: $brand;
}
Expand Down
1 change: 1 addition & 0 deletions svg/facebook.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions svg/github.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions svg/linkedin.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions svg/reddit.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions svg/twitter.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c529ac5

Please sign in to comment.