Discussion:
[SCM] UNNAMED PROJECT branch, master, updated. 91cb2f72f6e9837bcb003283c95c6dccacf5b3e9
Michal Cihar
2012-02-22 11:47:10 UTC
Permalink
The following commit has been merged in the master branch:
commit 91cb2f72f6e9837bcb003283c95c6dccacf5b3e9
Author: Michal Čihař <***@cihar.com>
Date: Wed Feb 22 12:45:38 2012 +0100

Use CSS sprites

diff --git a/html/base.html b/html/base.html
index a5d913c..60fe5e3 100644
--- a/html/base.html
+++ b/html/base.html
@@ -37,7 +37,7 @@
</head>
<body>
<div id="header">
- <h1><a href="/" rel="home"><img src="/media/images/wammu-32x32.png" alt="Logo" /> [GW]ammu</a></h1>
+ <h1><a href="/" rel="home"><img src="/media/dot.gif" class="sprite-logo" /> [GW]ammu</a></h1>

<ul id="links">
{% for item in menu %}
@@ -98,10 +98,10 @@ href="http://wammu.eu/"></a></li>
<p>{% trans "Share Gammu with the world!" %}</p>

<ul class="share">
-<li><a href="https://plus.google.com/104858815416760393584/?prsrc=3"><img src="/media/share/gplus.png" width="16" height="16" /> {% trans "Gammu on Google+" %}</a></li>
-<li><a href="https://www.facebook.com/wammu"><img src="/media/share/fb.png" width="16" height="16" /> {% trans "Gammu on Facebook" %}</a></li>
-<li><a href="http://twitter.com/wammu"><img src="/media/share/twitter.png" width="16" height="16" /> {% trans "Follow us on Twitter" %}</a></li>
-<li><a href="http://identi.ca/gammu"><img src="/media/share/ic.png" width="16" height="16" /> {% trans "Follow us on Identi.ca" %}</a></li>
+<li><a href="https://plus.google.com/104858815416760393584/?prsrc=3"><img src="/media/dot.gif" class="share-gplus"/> {% trans "Gammu on Google+" %}</a></li>
+<li><a href="https://www.facebook.com/wammu"><img src="/media/dot.gif" class="share-fb"/> {% trans "Gammu on Facebook" %}</a></li>
+<li><a href="http://twitter.com/wammu"><img src="/media/dot.gif" class="share-twitter"/> {% trans "Follow us on Twitter" %}</a></li>
+<li><a href="http://identi.ca/gammu"><img src="/media/dot.gif" class="share-ic"/> {% trans "Follow us on Identi.ca" %}</a></li>
</ul>

{% block sidebar %}{% endblock %}
diff --git a/media/css/style.css b/media/css/style.css
index a311c7b..908324e 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -303,3 +303,28 @@ ul.share {
list-style: none;
padding: 0 1em 0 1em;
}
+.sprite-logo {
+ background: url('/media/sprites.png') 0px 0px;
+ width: 32px;
+ height: 32px;
+}
+.share-fb {
+ background: url('/media/sprites.png') 0px -32px;
+ width: 16px;
+ height: 16px;
+}
+.share-ic {
+ background: url('/media/sprites.png') -16px -32px;
+ width: 16px;
+ height: 16px;
+}
+.share-gplus {
+ background: url('/media/sprites.png') 0px -48px;
+ width: 16px;
+ height: 16px;
+}
+.share-twitter {
+ background: url('/media/sprites.png') -16px -48px;
+ width: 16px;
+ height: 16px;
+}
diff --git a/media/dot.gif b/media/dot.gif
new file mode 100644
index 0000000..35d42e8
Binary files /dev/null and b/media/dot.gif differ
--
UNNAMED PROJECT
Michal Cihar
2012-02-22 11:47:10 UTC
Permalink
The following commit has been merged in the master branch:
commit b34ca683c7597759474b85be0aaa30c54405e641
Author: Michal Čihař <***@cihar.com>
Date: Wed Feb 22 12:30:02 2012 +0100

Add script for creating CSS sprites

diff --git a/admin/create-sprite b/admin/create-sprite
new file mode 100755
index 0000000..2347159
--- /dev/null
+++ b/admin/create-sprite
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cd media
+convert -size 32x64 xc:none sprites.png
+convert sprites.png images/wammu-32x32.png -geometry +0+0 -composite sprites.png
+convert sprites.png share/fb.png -geometry +0+32 -composite sprites.png
+convert sprites.png share/gplus.png -geometry +0+48 -composite sprites.png
+convert sprites.png share/ic.png -geometry +16+32 -composite sprites.png
+convert sprites.png share/twitter.png -geometry +16+48 -composite sprites.png
+optipng sprites.png
+
+
diff --git a/media/sprites.png b/media/sprites.png
new file mode 100644
index 0000000..d10265e
Binary files /dev/null and b/media/sprites.png differ
--
UNNAMED PROJECT
Michal Cihar
2012-02-22 11:47:10 UTC
Permalink
The following commit has been merged in the master branch:
commit 1019432635b7fd4aaa82887e2301865f9bb9829b
Author: Michal Čihař <***@cihar.com>
Date: Wed Feb 22 12:22:45 2012 +0100

Use same image

diff --git a/html/base.html b/html/base.html
index b32b20d..a5d913c 100644
--- a/html/base.html
+++ b/html/base.html
@@ -37,7 +37,7 @@
</head>
<body>
<div id="header">
- <h1><a href="/" rel="home"><img src="/media/images/logo.png" alt="Logo" /> [GW]ammu</a></h1>
+ <h1><a href="/" rel="home"><img src="/media/images/wammu-32x32.png" alt="Logo" /> [GW]ammu</a></h1>

<ul id="links">
{% for item in menu %}
--
UNNAMED PROJECT
Michal Cihar
2012-02-22 11:47:10 UTC
Permalink
The following commit has been merged in the master branch:
commit 27140d99914e41294c9cb7c31b30bcc10d130bff
Author: Michal Čihař <***@cihar.com>
Date: Wed Feb 22 12:22:58 2012 +0100

No longer used

diff --git a/media/images/logo.png b/media/images/logo.png
deleted file mode 100644
index 032cf72..0000000
Binary files a/media/images/logo.png and /dev/null differ
--
UNNAMED PROJECT
Loading...