diff --git a/_config.yml b/_config.yml index 287a33c1..348bb110 100644 --- a/_config.yml +++ b/_config.yml @@ -2,7 +2,7 @@ title: Minimal Mistakes tagline: Jekyll Theme description: A responsive Jekyll theme with editorial design tendencies. #Comment out url when working locally to resolve base urls correctly -url: http://mmistakes.github.io/minimal-mistakes +#url: http://mmistakes.github.io/minimal-mistakes # Owner/author information owner: @@ -10,7 +10,14 @@ owner: avatar: bio-photo.jpg bio: "Just another boring, time traveling, tattooed, designer from Buffalo New York." email: michael@mademistakes.com + # Social networking links are used in author-bio sidebar. Update and remove as you like. twitter: "mmistakes" + facebook: "michaelrose" + github: "mmistakes" + linkedin: "michaelrose" + instagram: "mmistakes" + lastfm: "anotherjpeg" + tumblr: "mademistakes" # For Google Authorship https://plus.google.com/authorship google_plus: "https://plus.google.com/118238196859537351707/posts" diff --git a/_includes/author-bio.html b/_includes/author-bio.html index 49d8756f..9ef2e8cc 100644 --- a/_includes/author-bio.html +++ b/_includes/author-bio.html @@ -1,4 +1,11 @@ {{ site.owner.name }} bio photo

{{ site.owner.name }}

{{ site.owner.bio }}

-

Follow @{{ site.owner.twitter }}

\ No newline at end of file +{% if site.owner.twitter %}

Twitter

{% endif %} +{% if site.owner.facebook %}

Facebook

{% endif %} +{% if site.owner.google_plus %}

Google+

{% endif %} +{% if site.owner.linkedin %}

LinkedIn

{% endif %} +{% if site.owner.instagram %}

Instagram

{% endif %} +{% if site.owner.github %}

Github

{% endif %} +{% if site.owner.lastfm %}

Last.fm

{% endif %} +{% if site.owner.tumblr %}

Tumblr

{% endif %} \ No newline at end of file diff --git a/assets/css/main.css b/assets/css/main.css index cb257b80..2de16435 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1394,12 +1394,6 @@ svg:not(:root) { font-weight: normal; font-style: normal; } -@media screen and (-webkit-min-device-pixel-ratio: 0) { - @font-face { - font-family: 'icomoon'; - src: url('../fonts/icomoon.svg#icomoon') format('svg'); - } -} /* Use the following CSS code if you want to use data attributes for inserting your icons */ [data-icon]:before { font-family: 'icomoon'; @@ -1417,11 +1411,16 @@ Instead of a list of all class selectors, you can use the generic selector below, but it's slower: [class*="icon-"] { */ -.icon-twitter, -.icon-feed, .icon-instagram, .icon-facebook, +.icon-twitter, .icon-google-plus, +.icon-feed, +.icon-feed-2, +.icon-linkedin, +.icon-tumblr, +.icon-lastfm, +.icon-mail, .icon-github { font-family: 'icomoon'; speak: none; @@ -1432,24 +1431,39 @@ you can use the generic selector below, but it's slower: line-height: 1; -webkit-font-smoothing: antialiased; } -.icon-twitter:before { - content: "\e000"; -} -.icon-feed:before { - content: "\e003"; -} .icon-instagram:before { content: "\e004"; } .icon-facebook:before { - content: "\e001"; + content: "\e003"; +} +.icon-twitter:before { + content: "\e007"; } .icon-google-plus:before { + content: "\e00a"; +} +.icon-feed:before { + content: "\e00b"; +} +.icon-feed-2:before { + content: "\e00c"; +} +.icon-linkedin:before { + content: "\e001"; +} +.icon-tumblr:before { content: "\e002"; } -.icon-github:before { +.icon-lastfm:before { content: "\e005"; } +.icon-mail:before { + content: "\e006"; +} +.icon-github:before { + content: "\e000"; +} /* Standard form controls ================================== */ form { margin: 0 0 5px 0; diff --git a/assets/fonts/icomoon.dev.svg b/assets/fonts/icomoon.dev.svg index 6c85ebd1..d90938b3 100644 --- a/assets/fonts/icomoon.dev.svg +++ b/assets/fonts/icomoon.dev.svg @@ -9,49 +9,86 @@ This is a custom SVG font generated by IcoMoon. - - - - - - + + + + + + + + + + + - \ No newline at end of file diff --git a/assets/fonts/icomoon.eot b/assets/fonts/icomoon.eot index c967e618..3542c70d 100644 Binary files a/assets/fonts/icomoon.eot and b/assets/fonts/icomoon.eot differ diff --git a/assets/fonts/icomoon.svg b/assets/fonts/icomoon.svg index c36f5331..c5eabeb9 100644 --- a/assets/fonts/icomoon.svg +++ b/assets/fonts/icomoon.svg @@ -9,49 +9,86 @@ This is a custom SVG font generated by IcoMoon. - - - - - - + + + + + + + + + + + - \ No newline at end of file diff --git a/assets/fonts/icomoon.ttf b/assets/fonts/icomoon.ttf index 693beca0..d436e090 100644 Binary files a/assets/fonts/icomoon.ttf and b/assets/fonts/icomoon.ttf differ diff --git a/assets/fonts/icomoon.woff b/assets/fonts/icomoon.woff index a6a5f357..941db0cd 100644 Binary files a/assets/fonts/icomoon.woff and b/assets/fonts/icomoon.woff differ diff --git a/assets/less/icomoon.less b/assets/less/icomoon.less index db11e6dd..3b1f1184 100644 --- a/assets/less/icomoon.less +++ b/assets/less/icomoon.less @@ -9,13 +9,6 @@ font-style: normal; } -@media screen and (-webkit-min-device-pixel-ratio:0) { - @font-face { - font-family: 'icomoon'; - src: url('../fonts/icomoon.svg#icomoon') format('svg'); - } -} - /* Use the following CSS code if you want to use data attributes for inserting your icons */ [data-icon]:before { font-family: 'icomoon'; @@ -34,7 +27,7 @@ Instead of a list of all class selectors, you can use the generic selector below, but it's slower: [class*="icon-"] { */ -.icon-twitter, .icon-feed, .icon-instagram, .icon-facebook, .icon-google-plus, .icon-github { +.icon-instagram, .icon-facebook, .icon-twitter, .icon-google-plus, .icon-feed, .icon-feed-2, .icon-linkedin, .icon-tumblr, .icon-lastfm, .icon-mail, .icon-github { font-family: 'icomoon'; speak: none; font-style: normal; @@ -44,21 +37,36 @@ you can use the generic selector below, but it's slower: line-height: 1; -webkit-font-smoothing: antialiased; } -.icon-twitter:before { - content: "\e000"; -} -.icon-feed:before { - content: "\e003"; -} .icon-instagram:before { content: "\e004"; } .icon-facebook:before { - content: "\e001"; + content: "\e003"; +} +.icon-twitter:before { + content: "\e007"; } .icon-google-plus:before { + content: "\e00a"; +} +.icon-feed:before { + content: "\e00b"; +} +.icon-feed-2:before { + content: "\e00c"; +} +.icon-linkedin:before { + content: "\e001"; +} +.icon-tumblr:before { content: "\e002"; } -.icon-github:before { +.icon-lastfm:before { content: "\e005"; -} \ No newline at end of file +} +.icon-mail:before { + content: "\e006"; +} +.icon-github:before { + content: "\e000"; +}