# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1479418171 -7200
# Node ID 6ba6249fb1940dc3755026a7adea22e7855393c8
# Parent  7474664924eaf22139b169b03e47cab4c886ec66
Create new project logo. Add favicon to project sites.

diff -r 7474664924ea -r 6ba6249fb194 Makefile
--- a/Makefile	Thu Nov 17 22:46:48 2016 +0200
+++ b/Makefile	Thu Nov 17 23:29:31 2016 +0200
@@ -159,10 +159,10 @@
 
 HTML_FILES := $(RST_HTML_FILES) $(INDEX_HTML_FILE) $(STAT_HTML_FILE)
 
-LOGO_NAME := logo
-LOGO_SVG := $(LOGO_NAME).svg
+LOGO_FILE := www/logo.svg
 LOGO_DIM := 32x32 48x48 64x64
-LOGO_PNG_FILES := $(patsubst %,$(LOGO_NAME)-%.png,$(LOGO_DIM))
+LOGO_PNG_FILES := $(patsubst %,dist/misc/logo-%.png,$(LOGO_DIM))
+FAVICON := dist/www/favicon.ico
 
 DISTREL_TARBALLS = dist/$(fullpkgname).tar.gz dist/$(fullpkgname).zip
 DISTSRC_TARBALLS = dist/$(fullpkgname)_src.tar.gz # dist/$(fullpkgname)_src.zip
@@ -233,10 +233,10 @@
 	hg push ssh://$(DEFUN_USER)@$(DEFUN_HG_SRV)/$(DEFUN_HG_DIR) || [ $$? = 1 ]
 
 .PHONY: deploy2defun-www
-deploy2defun-www: $(HTML_FILES)
+deploy2defun-www: $(HTML_FILES) $(FAVICON)
 	( \
 echo 'cd $(DEFUN_WWW_DIR)'; \
-for f in $(HTML_FILES); do \
+for f in $(HTML_FILES) $(FAVICON); do \
   n=$${f##*/}; \
   echo "put $$f $$n"; \
   echo "chmod 644 $$n"; \
@@ -273,9 +273,9 @@
 
 # Will be accessed via http://$(pkgname).sourceforge.net
 .PHONY: deploy2sf-www
-deploy2sf-www: $(HTML_FILES)
+deploy2sf-www: $(HTML_FILES) $(FAVICON)
 	( echo 'cd htdocs'; \
-for f in $(HTML_FILES); do \
+for f in $(HTML_FILES) $(FAVICON); do \
   n=$${f##*/}; \
   echo "put $$f $$n"; \
   echo "chmod 644 $$n"; \
@@ -610,6 +610,12 @@
 ################################################################
 # Misc targets.
 
+.PHONY: favicon
+favicon: $(FAVICON)
+
+$(FAVICON): $(LOGO_FILE) $(MAKEFILE_LIST) | $(dir $(FAVICON))
+	convert +antialias $< -resize 16x16 $@
+
 .PHONY: logo
 logo: logo-png
 
@@ -618,7 +624,7 @@
 
 # Require:
 #   $ sudo apt-get install imagemagick librsvg2-bin
-$(LOGO_PNG_FILES): $(LOGO_NAME)-%.png: $(LOGO_SVG)
+$(LOGO_PNG_FILES): dist/misc/logo-%.png: $(LOGO_FILE) | dist/misc/
 	convert +antialias -background transparent $< -resize $* $@
 
 .PHONY: voa
diff -r 7474664924ea -r 6ba6249fb194 logo.svg
--- a/logo.svg	Thu Nov 17 22:46:48 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
-     width="64" height="64" fill="none">
-  <desc>Blog4y logo.</desc>
-
-  <rect stroke="black" width="62" height="62" x="1" y="1" rx="10" ry="10" stroke-width="2" />
-
-  <text x="4" y="38" font-size="22" fill="crimson" font-family="Times">Ga</text>
-  <text x="28" y="38" font-size="22" fill="DarkGreen" font-family="Times">Dict</text>
-
-  <!-- Left top. -->
-  <line x1="6" x2="14" y1="6" y2="6" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="4" x2="14" y1="9" y2="9" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="4" x2="14" y1="12" y2="12" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="4" x2="14" y1="15" y2="15" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="4" x2="14" y1="18" y2="18" stroke="gray" fill="transparent" stroke-width="1"/>
-
-  <line x1="16" x2="26" y1="6" y2="6" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="16" x2="26" y1="9" y2="9" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="16" x2="26" y1="12" y2="12" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="16" x2="26" y1="15" y2="15" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="16" x2="26" y1="18" y2="18" stroke="gray" fill="transparent" stroke-width="1"/>
-
-  <!-- Left bottom. -->
-  <line x1="4" x2="14" y1="45" y2="45" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="4" x2="14" y1="48" y2="48" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="4" x2="14" y1="51" y2="51" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="4" x2="14" y1="54" y2="54" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="6" x2="14" y1="57" y2="57" stroke="gray" fill="transparent" stroke-width="1"/>
-
-  <line x1="16" x2="26" y1="45" y2="45" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="16" x2="26" y1="48" y2="48" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="16" x2="26" y1="51" y2="51" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="16" x2="26" y1="54" y2="54" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="16" x2="26" y1="57" y2="57" stroke="gray" fill="transparent" stroke-width="1"/>
-
-  <!-- Right top. -->
-  <line x1="50" x2="58" y1="6" y2="6" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="50" x2="60" y1="9" y2="9" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="50" x2="60" y1="12" y2="12" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="50" x2="60" y1="15" y2="15" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="50" x2="60" y1="18" y2="18" stroke="gray" fill="transparent" stroke-width="1"/>
-
-  <line x1="38" x2="48" y1="6" y2="6" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="38" x2="48" y1="9" y2="9" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="38" x2="48" y1="12" y2="12" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="38" x2="48" y1="15" y2="15" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="38" x2="48" y1="18" y2="18" stroke="gray" fill="transparent" stroke-width="1"/>
-
-  <!-- Right bottom. -->
-  <line x1="50" x2="60" y1="45" y2="45" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="50" x2="60" y1="48" y2="48" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="50" x2="60" y1="51" y2="51" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="50" x2="60" y1="54" y2="54" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="50" x2="58" y1="57" y2="57" stroke="gray" fill="transparent" stroke-width="1"/>
-
-  <line x1="38" x2="48" y1="45"  y2="45" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="38" x2="48" y1="48"  y2="48" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="38" x2="48" y1="51"  y2="51" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="38" x2="48" y1="54"  y2="54" stroke="gray" fill="transparent" stroke-width="1"/>
-  <line x1="38" x2="48" y1="57"  y2="57" stroke="gray" fill="transparent" stroke-width="1"/>
-
-</svg>
diff -r 7474664924ea -r 6ba6249fb194 www/logo.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/logo.svg	Thu Nov 17 23:29:31 2016 +0200
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+     width="60" height="60" fill="none">
+  <desc>Gadict logo.</desc>
+
+  <!-- RU -->
+  <rect stroke-width="0" width="30" height="20" x="0" y="0" fill="#ffffff" />
+  <rect stroke-width="0" width="30" height="20" x="0" y="20" fill="#0039a6" />
+  <rect stroke-width="0" width="30" height="20" x="0" y="40" fill="#d52b1e" />
+
+  <!-- UK -->
+  <rect stroke-width="0" width="30" height="30" x="30" y="0" fill="#005bbb" />
+  <rect stroke-width="0" width="30" height="30" x="30" y="30" fill="#ffd500" />
+
+</svg>
diff -r 7474664924ea -r 6ba6249fb194 www/tmpl/rst.tmpl.in
--- a/www/tmpl/rst.tmpl.in	Thu Nov 17 22:46:48 2016 +0200
+++ b/www/tmpl/rst.tmpl.in	Thu Nov 17 23:29:31 2016 +0200
@@ -3,6 +3,7 @@
 <head>
 <meta name=viewport content="width=device-width, initial-scale=1">
 <meta charset="utf-8">
+<link href="favicon.ico" rel="shortcut icon"/>
 %(head)s
 %(stylesheet)s
 %(body_prefix)s