From: Radek Czajka Date: Tue, 17 Apr 2012 13:39:20 +0000 (+0200) Subject: use regular png images for navigation X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/ba233a49e66a99626ca2a2f19d804e1bdd130977?ds=sidebyside use regular png images for navigation --- diff --git a/apps/wolnelektury_core/static/css/base.css b/apps/wolnelektury_core/static/css/base.css index 64c5de1de..5c29ef046 100755 --- a/apps/wolnelektury_core/static/css/base.css +++ b/apps/wolnelektury_core/static/css/base.css @@ -1,15 +1,3 @@ -/* Logo font */ -@font-face { - /* IE version */ - font-family: WL-Nav; - src: url(/static/fonts/WL-Nav.eot); -} -@font-face { - font-family: WL-Nav; - src: url(/static/fonts/WL-Nav.ttf) format("truetype"); -} - - html { margin: 0; padding: 0; @@ -131,8 +119,7 @@ h2 { .theme-list-link:after { padding-left: 1em; - content: "↓"; - font-family: WL-Nav; + content: url("/static/img/arrow-teal.png"); vertical-align: middle; } .theme-list-link { diff --git a/apps/wolnelektury_core/static/css/book_box.css b/apps/wolnelektury_core/static/css/book_box.css index 8dee81384..e23847fb1 100755 --- a/apps/wolnelektury_core/static/css/book_box.css +++ b/apps/wolnelektury_core/static/css/book_box.css @@ -212,8 +212,7 @@ .book-box-read a:before { - content: "\2609"; - font-family: WL-Nav; + content: url("/static/img/read.png"); font-size: 2.25em; margin-right: .15em; vertical-align: middle; @@ -221,8 +220,7 @@ } .book-box-download a.downarrow:before { - content: "\21E9"; - font-family: WL-Nav; + content: url("/static/img/download.png"); font-size: 2.25em; margin-right: .15em; vertical-align: middle; @@ -230,8 +228,7 @@ } .book-box-audiobook a:before { - content: "\266B"; - font-family: WL-Nav; + content: url("/static/img/listen.png"); font-size: 2.25em; margin-right: .15em; vertical-align: middle; diff --git a/apps/wolnelektury_core/static/css/cite.css b/apps/wolnelektury_core/static/css/cite.css index 04fdfdd9f..d397da2ee 100755 --- a/apps/wolnelektury_core/static/css/cite.css +++ b/apps/wolnelektury_core/static/css/cite.css @@ -106,7 +106,7 @@ .book-wide-box .cite { position: relative; - top: -0.8em; + top: -1em; right: -1em; background-color: #f7f7f7; vertical-align: middle; diff --git a/apps/wolnelektury_core/static/css/header.css b/apps/wolnelektury_core/static/css/header.css index 891c16318..fefb65ab0 100755 --- a/apps/wolnelektury_core/static/css/header.css +++ b/apps/wolnelektury_core/static/css/header.css @@ -163,8 +163,7 @@ a.menu span { } #lang-button:after { padding-left: 1em; - content: "↓"; - font-family: WL-Nav; + content: url("/static/img/arrow-gray.png"); vertical-align: middle; } #lang-menu { diff --git a/apps/wolnelektury_core/static/css/main_page.css b/apps/wolnelektury_core/static/css/main_page.css index cbfc3db7b..3db1655b7 100755 --- a/apps/wolnelektury_core/static/css/main_page.css +++ b/apps/wolnelektury_core/static/css/main_page.css @@ -88,8 +88,5 @@ } .infopages-box .social-links a { - font-family: WL-Nav, courier; - font-size: 3em; - color: #281d1c; - margin-right: .2em; + margin-right: .6em; } diff --git a/apps/wolnelektury_core/static/css/picture_box.css b/apps/wolnelektury_core/static/css/picture_box.css index 06f3e62c8..83022eb77 100755 --- a/apps/wolnelektury_core/static/css/picture_box.css +++ b/apps/wolnelektury_core/static/css/picture_box.css @@ -82,8 +82,7 @@ } .picture-box-tools a:before { - content: "⇩"; - font-family: WL-Nav; + content: url("/static/img/download.png"); font-size: 2em; margin-right: .25em; vertical-align: middle; diff --git a/apps/wolnelektury_core/static/img/arrow-gray.png b/apps/wolnelektury_core/static/img/arrow-gray.png new file mode 100644 index 000000000..b1c590d04 Binary files /dev/null and b/apps/wolnelektury_core/static/img/arrow-gray.png differ diff --git a/apps/wolnelektury_core/static/img/arrow-gray.svg b/apps/wolnelektury_core/static/img/arrow-gray.svg new file mode 100644 index 000000000..02d7075c3 --- /dev/null +++ b/apps/wolnelektury_core/static/img/arrow-gray.svg @@ -0,0 +1,40 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/apps/wolnelektury_core/static/img/arrow-teal.png b/apps/wolnelektury_core/static/img/arrow-teal.png new file mode 100644 index 000000000..ce406336b Binary files /dev/null and b/apps/wolnelektury_core/static/img/arrow-teal.png differ diff --git a/apps/wolnelektury_core/static/img/arrow-teal.svg b/apps/wolnelektury_core/static/img/arrow-teal.svg new file mode 100644 index 000000000..478ed07c2 --- /dev/null +++ b/apps/wolnelektury_core/static/img/arrow-teal.svg @@ -0,0 +1,41 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/apps/wolnelektury_core/static/img/download.png b/apps/wolnelektury_core/static/img/download.png new file mode 100644 index 000000000..54d1bf904 Binary files /dev/null and b/apps/wolnelektury_core/static/img/download.png differ diff --git a/apps/wolnelektury_core/static/img/download.svg b/apps/wolnelektury_core/static/img/download.svg new file mode 100644 index 000000000..cb49aa2ba --- /dev/null +++ b/apps/wolnelektury_core/static/img/download.svg @@ -0,0 +1,41 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/apps/wolnelektury_core/static/img/listen.png b/apps/wolnelektury_core/static/img/listen.png new file mode 100644 index 000000000..68627221c Binary files /dev/null and b/apps/wolnelektury_core/static/img/listen.png differ diff --git a/apps/wolnelektury_core/static/img/listen.svg b/apps/wolnelektury_core/static/img/listen.svg new file mode 100644 index 000000000..714768f54 --- /dev/null +++ b/apps/wolnelektury_core/static/img/listen.svg @@ -0,0 +1,41 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/apps/wolnelektury_core/static/img/read.png b/apps/wolnelektury_core/static/img/read.png new file mode 100644 index 000000000..1d5ab0e7b Binary files /dev/null and b/apps/wolnelektury_core/static/img/read.png differ diff --git a/apps/wolnelektury_core/static/img/read.svg b/apps/wolnelektury_core/static/img/read.svg new file mode 100644 index 000000000..f3fd5b65c --- /dev/null +++ b/apps/wolnelektury_core/static/img/read.svg @@ -0,0 +1,41 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/apps/wolnelektury_core/static/img/social/f.png b/apps/wolnelektury_core/static/img/social/f.png new file mode 100644 index 000000000..3261c6d7f Binary files /dev/null and b/apps/wolnelektury_core/static/img/social/f.png differ diff --git a/apps/wolnelektury_core/static/img/social/f.svg b/apps/wolnelektury_core/static/img/social/f.svg new file mode 100644 index 000000000..fd25a0b1e --- /dev/null +++ b/apps/wolnelektury_core/static/img/social/f.svg @@ -0,0 +1,36 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/apps/wolnelektury_core/static/img/social/facebook.png b/apps/wolnelektury_core/static/img/social/facebook.png deleted file mode 100644 index c46485acc..000000000 Binary files a/apps/wolnelektury_core/static/img/social/facebook.png and /dev/null differ diff --git a/apps/wolnelektury_core/static/img/social/gplus.png b/apps/wolnelektury_core/static/img/social/gplus.png new file mode 100644 index 000000000..c9a98cca4 Binary files /dev/null and b/apps/wolnelektury_core/static/img/social/gplus.png differ diff --git a/apps/wolnelektury_core/static/img/social/gplus.svg b/apps/wolnelektury_core/static/img/social/gplus.svg new file mode 100644 index 000000000..ad8584c48 --- /dev/null +++ b/apps/wolnelektury_core/static/img/social/gplus.svg @@ -0,0 +1,36 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/apps/wolnelektury_core/static/img/social/naszaklasa.png b/apps/wolnelektury_core/static/img/social/naszaklasa.png deleted file mode 100644 index 6fcd6d53d..000000000 Binary files a/apps/wolnelektury_core/static/img/social/naszaklasa.png and /dev/null differ diff --git a/apps/wolnelektury_core/static/img/social/nk.png b/apps/wolnelektury_core/static/img/social/nk.png new file mode 100644 index 000000000..736918565 Binary files /dev/null and b/apps/wolnelektury_core/static/img/social/nk.png differ diff --git a/apps/wolnelektury_core/static/img/social/nk.svg b/apps/wolnelektury_core/static/img/social/nk.svg new file mode 100644 index 000000000..143701f10 --- /dev/null +++ b/apps/wolnelektury_core/static/img/social/nk.svg @@ -0,0 +1,36 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/apps/wolnelektury_core/static/img/social/twitter.png b/apps/wolnelektury_core/static/img/social/twitter.png deleted file mode 100644 index 0a75ea8d7..000000000 Binary files a/apps/wolnelektury_core/static/img/social/twitter.png and /dev/null differ diff --git a/apps/wolnelektury_core/templates/main_page.html b/apps/wolnelektury_core/templates/main_page.html index 2947a2f69..87a9c3f0c 100755 --- a/apps/wolnelektury_core/templates/main_page.html +++ b/apps/wolnelektury_core/templates/main_page.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load cache chunks i18n catalogue_tags infopages_tags social_tags %} @@ -67,9 +68,13 @@