Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
4d157014
Commit
4d157014
authored
Oct 25, 2016
by
Sébastiaan Versteeg
Browse files
Move Open Sans and Oswald to static instead of using Google Fonts
parent
898611b6
Changes
29
Expand all
Hide whitespace changes
Inline
Side-by-side
website/thaliawebsite/static/fonts/OpenSans.ttf
0 → 100644
View file @
4d157014
File added
website/thaliawebsite/static/fonts/OpenSans.woff
0 → 100644
View file @
4d157014
File added
website/thaliawebsite/static/fonts/OpenSans.woff2
0 → 100644
View file @
4d157014
File added
website/thaliawebsite/static/fonts/Oswald-Regular.eot
0 → 100644
View file @
4d157014
File added
website/thaliawebsite/static/fonts/Oswald-Regular.svg
0 → 100644
View file @
4d157014
This diff is collapsed.
Click to expand it.
website/thaliawebsite/static/fonts/Oswald-Regular.ttf
0 → 100644
View file @
4d157014
File added
website/thaliawebsite/static/fonts/Oswald-Regular.woff
0 → 100644
View file @
4d157014
File added
website/thaliawebsite/static/fonts/Oswald-Regular.woff2
0 → 100644
View file @
4d157014
File added
website/thaliawebsite/templates/base.html
View file @
4d157014
...
...
@@ -16,8 +16,6 @@
<!-- css stylesheets -->
{% block css_head %}
<link
href=
"https://fonts.googleapis.com/css?family=Open+Sans:400italic,400,700"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"https://fonts.googleapis.com/css?family=Oswald:400"
rel=
"stylesheet"
type=
"text/css"
>
{% compress css %}
<link
href=
"{% static "
plugins
/
font-awesome
/
css
/
font-awesome.min.css
"
%}"
rel=
"stylesheet"
type=
"text/css"
>
...
...
@@ -26,7 +24,6 @@
<link
href=
"{% static "
css
/
jquery.fancybox.css
"
%}"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"{% static "
css
/
style.scss
"
%}"
rel=
"stylesheet"
type=
"text/x-scss"
>
<link
href=
"{% static "
css
/
skin.scss
"
%}"
rel=
"stylesheet"
type=
"text/x-scss"
>
{% endcompress %}{% endblock %}
<!-- js head -->
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment