diff --git a/.gitignore b/.gitignore index 4d5132f..361d876 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ pip-delete-this-directory.txt .venv/ venv/ env/ + +# WSL +*:Zone.Identifier diff --git a/media/article-headers/5e71e370cc113.image.jpg b/media/article-headers/5e71e370cc113.image.jpg new file mode 100644 index 0000000..ccaf36e Binary files /dev/null and b/media/article-headers/5e71e370cc113.image.jpg differ diff --git a/media/default-header.jpg b/media/default-header.jpg index 42f9128..4245962 100644 Binary files a/media/default-header.jpg and b/media/default-header.jpg differ diff --git a/news/static/news/css/fonts/Segoe UI Bold Italic.woff b/news/static/news/css/fonts/Segoe UI Bold Italic.woff new file mode 100644 index 0000000..fa45e22 Binary files /dev/null and b/news/static/news/css/fonts/Segoe UI Bold Italic.woff differ diff --git a/news/static/news/css/fonts/Segoe UI Bold.woff b/news/static/news/css/fonts/Segoe UI Bold.woff new file mode 100644 index 0000000..a6b0a97 Binary files /dev/null and b/news/static/news/css/fonts/Segoe UI Bold.woff differ diff --git a/news/static/news/css/fonts/Segoe UI Italic.woff b/news/static/news/css/fonts/Segoe UI Italic.woff new file mode 100644 index 0000000..1649115 Binary files /dev/null and b/news/static/news/css/fonts/Segoe UI Italic.woff differ diff --git a/news/static/news/css/fonts/Segoe UI.woff b/news/static/news/css/fonts/Segoe UI.woff new file mode 100644 index 0000000..a45efa3 Binary files /dev/null and b/news/static/news/css/fonts/Segoe UI.woff differ diff --git a/news/static/news/css/styles.css b/news/static/news/css/styles.css index 20bebd4..9fd5d56 100644 --- a/news/static/news/css/styles.css +++ b/news/static/news/css/styles.css @@ -1,11 +1,6 @@ -@font-face { - font-family: Futura; - src: url(futura.ttf); -} - @font-face { font-family: 'Segoe UI'; - src: url('Segoe UI.ttf'); + src: url('fonts/Segoe UI.woff'); } body { diff --git a/news/static/news/favicon2.ico b/news/static/news/favicon.ico similarity index 100% rename from news/static/news/favicon2.ico rename to news/static/news/favicon.ico diff --git a/news/templates/news/article_detail.html b/news/templates/news/article_detail.html index 9d2fd36..654b16e 100644 --- a/news/templates/news/article_detail.html +++ b/news/templates/news/article_detail.html @@ -1,22 +1,26 @@ {% extends "news/base.html" %} {% block content %} -
- Profile Picture -
-
{% endblock content %} diff --git a/news/templates/news/base.html b/news/templates/news/base.html index 0abb5af..bc9815a 100644 --- a/news/templates/news/base.html +++ b/news/templates/news/base.html @@ -14,8 +14,8 @@ - - + + NewViewsNews diff --git a/news/templates/news/home.html b/news/templates/news/home.html index 5c0d554..ef298bd 100644 --- a/news/templates/news/home.html +++ b/news/templates/news/home.html @@ -6,8 +6,8 @@
... -
{{ post.category }} -
{{ article.headline }}
+ diff --git a/users/templates/users/profile.html b/users/templates/users/profile.html index 90c5ce7..b8b7364 100644 --- a/users/templates/users/profile.html +++ b/users/templates/users/profile.html @@ -82,7 +82,7 @@
- + Your browser does not support the HTML canvas tag. diff --git a/users/views.py b/users/views.py index 6d63862..0ac647a 100644 --- a/users/views.py +++ b/users/views.py @@ -97,7 +97,6 @@ def profile(request): valueX = user.profile.economicScore * 2.5 + 250 valueY = user.profile.socialScore * -2.5 + 250 - print("VALUEX IS " + str(valueX)) context = { 'userForm': userForm,