diff --git a/bornhack/settings/base.py b/bornhack/settings/base.py index 73ae5bda..386cbaa8 100644 --- a/bornhack/settings/base.py +++ b/bornhack/settings/base.py @@ -57,6 +57,7 @@ TEMPLATES = [ 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', 'camps.context_processors.current_camp', + 'shop.context_processors.current_order', ], }, }, diff --git a/bornhack/static_src/fonts/glyphicons-halflings-regular.eot b/bornhack/static_src/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 00000000..b93a4953 Binary files /dev/null and b/bornhack/static_src/fonts/glyphicons-halflings-regular.eot differ diff --git a/bornhack/static_src/fonts/glyphicons-halflings-regular.svg b/bornhack/static_src/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 00000000..94fb5490 --- /dev/null +++ b/bornhack/static_src/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bornhack/static_src/fonts/glyphicons-halflings-regular.ttf b/bornhack/static_src/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 00000000..1413fc60 Binary files /dev/null and b/bornhack/static_src/fonts/glyphicons-halflings-regular.ttf differ diff --git a/bornhack/static_src/fonts/glyphicons-halflings-regular.woff b/bornhack/static_src/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 00000000..9e612858 Binary files /dev/null and b/bornhack/static_src/fonts/glyphicons-halflings-regular.woff differ diff --git a/bornhack/static_src/fonts/glyphicons-halflings-regular.woff2 b/bornhack/static_src/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 00000000..64539b54 Binary files /dev/null and b/bornhack/static_src/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/bornhack/templates/base.html b/bornhack/templates/base.html index 2e49af8e..813c1b7a 100644 --- a/bornhack/templates/base.html +++ b/bornhack/templates/base.html @@ -39,6 +39,18 @@