aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhiming Wang <zmwangx@gmail.com>2015-08-08 14:04:53 -0700
committerZhiming Wang <zmwangx@gmail.com>2015-08-08 14:04:53 -0700
commit0876e9769e162988cebd0a42b12f8892d00166ab (patch)
tree8f5d949e7d164c38d8018ea2e2e4fe6d09225b5d
parent037b1aaf8b68fc6c32df3be3737fd27761d0a952 (diff)
downloadmy_new_personal_website-0876e9769e162988cebd0a42b12f8892d00166ab.tar.xz
my_new_personal_website-0876e9769e162988cebd0a42b12f8892d00166ab.zip
rfooter icons: switch to Font Awesome
Use web font to draw icons.
-rw-r--r--source/css/theme.css28
-rw-r--r--source/img/README.rst18
-rw-r--r--source/img/cc-16.pngbin559 -> 0 bytes
-rw-r--r--source/img/cc-32.pngbin989 -> 0 bytes
-rw-r--r--source/img/cc.svg27
-rw-r--r--source/img/favicon-152.pngbin10289 -> 0 bytes
-rw-r--r--source/img/feed-16.pngbin558 -> 0 bytes
-rw-r--r--source/img/feed-256.pngbin2611 -> 0 bytes
-rw-r--r--source/img/feed-32.pngbin948 -> 0 bytes
-rw-r--r--source/img/icon-100.pngbin6910 -> 0 bytes
-rw-r--r--source/img/icon-150.pngbin10234 -> 0 bytes
-rw-r--r--source/img/icon-200.pngbin13909 -> 0 bytes
-rw-r--r--source/img/icon-2048.pngbin190023 -> 0 bytes
-rw-r--r--source/img/icon-300.pngbin21348 -> 0 bytes
-rw-r--r--source/img/icon-400.pngbin28850 -> 0 bytes
-rw-r--r--source/img/rss-16.pngbin558 -> 0 bytes
-rw-r--r--source/img/rss-32.pngbin938 -> 0 bytes
-rw-r--r--templates/template.html11
18 files changed, 14 insertions, 70 deletions
diff --git a/source/css/theme.css b/source/css/theme.css
index 24c82383..5eb94e9d 100644
--- a/source/css/theme.css
+++ b/source/css/theme.css
@@ -208,32 +208,18 @@ noscript a {
}
.rss-icon, .atom-icon, .cc-icon {
- width: 16px;
- height: 16px;
- margin: 0 2px;
- display: inline-block;
- background-repeat: no-repeat;
- background-position: center;
- background-size: 16px;
- vertical-align: middle;
- font-size: 0;
-}
-
-.rss-icon {
- background-image: url("/img/rss-16.png");
- background-image: -webkit-image-set( url("/img/rss-16.png") 1x, url("/img/rss-32.png") 2x );
- background-size: 14px;
+ position: relative;
+ text-decoration: none;
}
-.atom-icon {
- background-image: url("/img/feed-16.png");
- background-image: -webkit-image-set( url("/img/feed-16.png") 1x, url("/img/feed-32.png") 2x );
- background-size: 14px;
+.rss-icon, .atom-icon {
+ font-size: 16px;
+ margin: 0 2px;
+ top: 1px;
}
.cc-icon {
- background-image: url("/img/cc-16.png");
- background-image: -webkit-image-set( url("/img/cc-16.png") 1x, url("/img/cc-32.png") 2x );
+ margin: 0 1px;
}
/* blog index */
diff --git a/source/img/README.rst b/source/img/README.rst
index 6f300dbe..715d1a90 100644
--- a/source/img/README.rst
+++ b/source/img/README.rst
@@ -3,26 +3,10 @@ The icon and favicon files are generated via the following commands: ::
cd source/img
xelatex icon.tex
xelatex icon-square.tex
- for size in 100 150 200 300 400 2048; do convert icon.pdf -density 400 -resize $sizex$size icon-$size.png; done
for size in 16 32 48 144; do convert icon.pdf -density 400 -resize $sizex$size favicon-$size.png; done
convert icon-square.pdf -density 400 -resize 152x152 apple-touch-icon-152.png
- optipng favicon-*.png icon-*.png apple-touch-icon-152.png
+ optipng favicon-*.png apple-touch-icon-152.png
convert favicon-16.png favicon-32.png favicon-48.png ../favicon.ico
rm favicon-16.png favicon-32.png favicon-48.png
Credit to `audreyr/favicon-cheat-sheet <https://github.com/audreyr/favicon-cheat-sheet>`_ for favicon handling tips.
-
-The feed icon isn't so easy to create with TikZ (I don't know the necessary parameters), so I downloaed one (256x256) from `IconFinder <https://www.iconfinder.com/icons/49861/feed_rss_icon>`_. The original PNG can be found `here <http://i.imgur.com/4XE3iL3.png>`_. Then I processed the PNG with ``optipng``, the result of which is ``feed-256.png``. The smaller ``feed-14.png`` is generated through::
-
- for size in 16 32; do convert feed-256.png -resize $sizex$size feed-$size.png; done
- optipng feed-*.png
-
-Next, the horizontal mirror ``rss-14.png`` is generated through::
-
- for size in 16 32; do convert feed-$size.png -flop rss-$size.png; done
- optipng rss-*.png
-
-The CreativeCommons icon ``cc.svg`` is pulled from `the official downloads page <https://creativecommons.org/about/downloads>`_ and converted to 16x16 PNG through::
-
- for size in 16 32; do convert cc.svg -resize $sizex$size cc-$size.png; done
- optipng cc-*.png
diff --git a/source/img/cc-16.png b/source/img/cc-16.png
deleted file mode 100644
index f1e8da59..00000000
--- a/source/img/cc-16.png
+++ /dev/null
Binary files differ
diff --git a/source/img/cc-32.png b/source/img/cc-32.png
deleted file mode 100644
index cc0856b6..00000000
--- a/source/img/cc-32.png
+++ /dev/null
Binary files differ
diff --git a/source/img/cc.svg b/source/img/cc.svg
deleted file mode 100644
index cb08896c..00000000
--- a/source/img/cc.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="64px" height="64px" viewBox="5.5 -3.5 64 64" enable-background="new 5.5 -3.5 64 64" xml:space="preserve">
-<g>
- <circle fill="#FFFFFF" cx="37.785" cy="28.501" r="28.836"/>
- <path d="M37.441-3.5c8.951,0,16.572,3.125,22.857,9.372c3.008,3.009,5.295,6.448,6.857,10.314
- c1.561,3.867,2.344,7.971,2.344,12.314c0,4.381-0.773,8.486-2.314,12.313c-1.543,3.828-3.82,7.21-6.828,10.143
- c-3.123,3.085-6.666,5.448-10.629,7.086c-3.961,1.638-8.057,2.457-12.285,2.457s-8.276-0.808-12.143-2.429
- c-3.866-1.618-7.333-3.961-10.4-7.027c-3.067-3.066-5.4-6.524-7-10.372S5.5,32.767,5.5,28.5c0-4.229,0.809-8.295,2.428-12.2
- c1.619-3.905,3.972-7.4,7.057-10.486C21.08-0.394,28.565-3.5,37.441-3.5z M37.557,2.272c-7.314,0-13.467,2.553-18.458,7.657
- c-2.515,2.553-4.448,5.419-5.8,8.6c-1.354,3.181-2.029,6.505-2.029,9.972c0,3.429,0.675,6.734,2.029,9.913
- c1.353,3.183,3.285,6.021,5.8,8.516c2.514,2.496,5.351,4.399,8.515,5.715c3.161,1.314,6.476,1.971,9.943,1.971
- c3.428,0,6.75-0.665,9.973-1.999c3.219-1.335,6.121-3.257,8.713-5.771c4.99-4.876,7.484-10.99,7.484-18.344
- c0-3.543-0.648-6.895-1.943-10.057c-1.293-3.162-3.18-5.98-5.654-8.458C50.984,4.844,44.795,2.272,37.557,2.272z M37.156,23.187
- l-4.287,2.229c-0.458-0.951-1.019-1.619-1.685-2c-0.667-0.38-1.286-0.571-1.858-0.571c-2.856,0-4.286,1.885-4.286,5.657
- c0,1.714,0.362,3.084,1.085,4.113c0.724,1.029,1.791,1.544,3.201,1.544c1.867,0,3.181-0.915,3.944-2.743l3.942,2
- c-0.838,1.563-2,2.791-3.486,3.686c-1.484,0.896-3.123,1.343-4.914,1.343c-2.857,0-5.163-0.875-6.915-2.629
- c-1.752-1.752-2.628-4.19-2.628-7.313c0-3.048,0.886-5.466,2.657-7.257c1.771-1.79,4.009-2.686,6.715-2.686
- C32.604,18.558,35.441,20.101,37.156,23.187z M55.613,23.187l-4.229,2.229c-0.457-0.951-1.02-1.619-1.686-2
- c-0.668-0.38-1.307-0.571-1.914-0.571c-2.857,0-4.287,1.885-4.287,5.657c0,1.714,0.363,3.084,1.086,4.113
- c0.723,1.029,1.789,1.544,3.201,1.544c1.865,0,3.18-0.915,3.941-2.743l4,2c-0.875,1.563-2.057,2.791-3.541,3.686
- c-1.486,0.896-3.105,1.343-4.857,1.343c-2.896,0-5.209-0.875-6.941-2.629c-1.736-1.752-2.602-4.19-2.602-7.313
- c0-3.048,0.885-5.466,2.658-7.257c1.77-1.79,4.008-2.686,6.713-2.686C51.117,18.558,53.938,20.101,55.613,23.187z"/>
-</g>
-</svg>
diff --git a/source/img/favicon-152.png b/source/img/favicon-152.png
deleted file mode 100644
index 70cdb353..00000000
--- a/source/img/favicon-152.png
+++ /dev/null
Binary files differ
diff --git a/source/img/feed-16.png b/source/img/feed-16.png
deleted file mode 100644
index d5ead47c..00000000
--- a/source/img/feed-16.png
+++ /dev/null
Binary files differ
diff --git a/source/img/feed-256.png b/source/img/feed-256.png
deleted file mode 100644
index cc64b292..00000000
--- a/source/img/feed-256.png
+++ /dev/null
Binary files differ
diff --git a/source/img/feed-32.png b/source/img/feed-32.png
deleted file mode 100644
index 2d44b08e..00000000
--- a/source/img/feed-32.png
+++ /dev/null
Binary files differ
diff --git a/source/img/icon-100.png b/source/img/icon-100.png
deleted file mode 100644
index acb60895..00000000
--- a/source/img/icon-100.png
+++ /dev/null
Binary files differ
diff --git a/source/img/icon-150.png b/source/img/icon-150.png
deleted file mode 100644
index effbb89d..00000000
--- a/source/img/icon-150.png
+++ /dev/null
Binary files differ
diff --git a/source/img/icon-200.png b/source/img/icon-200.png
deleted file mode 100644
index 9e6896de..00000000
--- a/source/img/icon-200.png
+++ /dev/null
Binary files differ
diff --git a/source/img/icon-2048.png b/source/img/icon-2048.png
deleted file mode 100644
index 3ef2502a..00000000
--- a/source/img/icon-2048.png
+++ /dev/null
Binary files differ
diff --git a/source/img/icon-300.png b/source/img/icon-300.png
deleted file mode 100644
index c3bd33ad..00000000
--- a/source/img/icon-300.png
+++ /dev/null
Binary files differ
diff --git a/source/img/icon-400.png b/source/img/icon-400.png
deleted file mode 100644
index 6de14504..00000000
--- a/source/img/icon-400.png
+++ /dev/null
Binary files differ
diff --git a/source/img/rss-16.png b/source/img/rss-16.png
deleted file mode 100644
index 3353bc95..00000000
--- a/source/img/rss-16.png
+++ /dev/null
Binary files differ
diff --git a/source/img/rss-32.png b/source/img/rss-32.png
deleted file mode 100644
index 227a0535..00000000
--- a/source/img/rss-32.png
+++ /dev/null
Binary files differ
diff --git a/templates/template.html b/templates/template.html
index 037e3fb5..8491bc5b 100644
--- a/templates/template.html
+++ b/templates/template.html
@@ -13,14 +13,15 @@ $endif$
<meta name="msapplication-TileImage" content="/img/favicon-144.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
<style type="text/css">code{white-space: pre;}</style>
+ <link href="//fonts.googleapis.com/css?family=Open+Sans:regular" rel="stylesheet" type="text/css"/>
+ <link href="//fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css"/>
+ <link href="//fonts.googleapis.com/css?family=Droid+Sans+Mono" rel="stylesheet" type="text/css"/>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
<link href='/css/normalize.css' media="all" rel="stylesheet" type="text/css"/>
<link href='/css/theme.css' media="all" rel="stylesheet" type="text/css"/>
<link href='/css/theme-wide.css' media="only screen and (min-width: 1441px)" rel="stylesheet" type="text/css"/>
<link href='/css/theme-narrow.css' media="only screen and (max-width: 1023px)" rel="stylesheet" type="text/css"/>
<link href='/css/print.css' media="print" rel="stylesheet" type="text/css"/>
- <link href="//fonts.googleapis.com/css?family=Open+Sans:regular" rel="stylesheet" type="text/css"/>
- <link href="//fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css"/>
- <link href="//fonts.googleapis.com/css?family=Droid+Sans+Mono" rel="stylesheet" type="text/css"/>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -33,7 +34,7 @@ $endif$
</head>
<body>
<nav class="nav">
- <a class="nav-icon" href="/" title="Home">&nbsp;</a>
+ <a class="nav-icon" href="/" title="Home"><!--blog icon--></a>
<div class="nav-title"><a href="/" class="nav-link">dl? cmplnts?</a></div>
<div class="nav-author">by <a href="https://github.com/zmwangx" class="nav-link" target="_blank">Zhiming Wang</a></div>
</nav>
@@ -62,7 +63,7 @@ $if(updated)$
</span>
$endif$
<span class="rfooter">
- <a class="rss-icon" href="/rss.xml" target="_blank" title="RSS feed">RSS feed icon</a><a class="atom-icon" href="/atom.xml" target="_blank" title="Atom feed">Atom feed icon</a><a class="cc-icon" href="https://creativecommons.org/licenses/by/4.0/" target="_blank" title="Released under the Creative Commons Attribution 4.0 International license.">Creative Commons icon</a>
+ <a class="rss-icon fa fa-rss fa-flip-horizontal" href="/rss.xml" target="_blank" title="RSS feed"><!--RSS feed icon--></a><a class="atom-icon fa fa-rss" href="/atom.xml" target="_blank" title="Atom feed"><!--Atom feed icon--></a><a class="cc-icon fa fa-creative-commons" href="https://creativecommons.org/licenses/by/4.0/" target="_blank" title="Released under the Creative Commons Attribution 4.0 International license."><!--CC icon--></a>
<a href="https://github.com/zmwangx" target="_blank">Zhiming Wang</a>
</span>
</footer>