Skip to content

Commit 59a0ba4

Browse files
authored
Merge pull request #32 from pyvec/honzajavorek/fix-web
Fix web :)
2 parents a17aa07 + aa252ed commit 59a0ba4

File tree

7 files changed

+246
-21
lines changed

7 files changed

+246
-21
lines changed

pyvecorg/data/projects.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ entries:
66
- name:
77
cs: Konference PyCon CZ
88
en: PyCon CZ conference
9-
logo: img/projects/pyconcz18.svg
10-
photo: pyconcz18
9+
logo: img/projects/pyconcz.svg
10+
photo: pyconcz
1111
url: https://cz.pycon.org/
1212
description:
1313
cs: >-
392 KB
Loading
Lines changed: 233 additions & 0 deletions
Loading
-87.3 KB
Binary file not shown.

pyvecorg/static/img/projects/pyconcz18.svg

Lines changed: 0 additions & 17 deletions
This file was deleted.

pyvecorg/static/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ a.icon, a.icon:hover, a.icon:focus,
177177
border-radius: 1rem 1rem 0 0;
178178
}
179179

180-
.project-header-pyconcz18 { background-image: url('img/projects/pyconcz18.jpg') }
180+
.project-header-pyconcz { background-image: url('img/projects/pyconcz.jpg') }
181181
.project-header-pyladies { background-image: url('img/projects/pyladies.jpg') }
182182
.project-header-naucse { background-image: url('img/projects/naucse.jpg') }
183183
.project-header-pyvo { background-image: url('img/projects/pyvo.jpg') }

pyvecorg/views.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import os
12
from datetime import datetime
23

3-
from flask import request, render_template, redirect, url_for
4+
from flask import (request, render_template, redirect, url_for,
5+
send_from_directory)
46

57
from pyvecorg import app
68
from pyvecorg.data import load_data, select_language
@@ -16,6 +18,13 @@ def index_redirect():
1618
return redirect(url_for('index', lang='cs'))
1719

1820

21+
@app.route('/favicon.ico')
22+
def favicon():
23+
static = os.path.join(app.root_path, 'static')
24+
return send_from_directory(static, 'favicon.ico',
25+
mimetype='image/vnd.microsoft.icon')
26+
27+
1928
@app.route('/<lang>/')
2029
def index(lang):
2130
context = select_language(data, lang)

0 commit comments

Comments
 (0)