Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Website
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tryton
Communication
Website
Commits
0989278ead9a
Commit
0989278ead9a
authored
5 years ago
by
Cédric Krier
Browse files
Options
Downloads
Patches
Plain Diff
Use redirect for font path
This allows to add timestamp parameter.
parent
6fbcdc6a5eba
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app.py
+6
-1
6 additions, 1 deletion
app.py
gulpfile.js
+1
-1
1 addition, 1 deletion
gulpfile.js
sass/_font.scss
+15
-15
15 additions, 15 deletions
sass/_font.scss
with
22 additions
and
17 deletions
app.py
+
6
−
1
View file @
0989278e
...
...
@@ -18,7 +18,7 @@
make_response
,
abort
)
from
flask.logging
import
default_handler
from
flask_caching
import
Cache
from
flask_cdn
import
CDN
from
flask_cdn
import
CDN
,
url_for
as
cdn_url_for
from
flask_gravatar
import
Gravatar
from
flask_sitemap
import
Sitemap
from
icalendar
import
Calendar
...
...
@@ -544,6 +544,11 @@
return
render_template
(
'
service_providers_start.html
'
)
@app.route
(
'
/fonts/<name>
'
)
def
fonts
(
name
):
return
redirect
(
cdn_url_for
(
'
static
'
,
filename
=
'
fonts/
'
+
name
))
@app.errorhandler
(
HTTPStatus
.
NOT_FOUND
)
def
not_found
(
error
):
return
render_template
(
'
not_found.html
'
),
HTTPStatus
.
NOT_FOUND
...
...
This diff is collapsed.
Click to expand it.
gulpfile.js
+
1
−
1
View file @
0989278e
...
...
@@ -47,7 +47,7 @@
.
pipe
(
iconfontCss
({
fontName
:
fontName
,
targetPath
:
'
../../sass/iconfont/_icons.scss
'
,
fontPath
:
'
../../static
/fonts/
'
fontPath
:
'
/fonts/
'
}))
.
pipe
(
iconfont
({
fontName
:
fontName
,
...
...
This diff is collapsed.
Click to expand it.
sass/_font.scss
+
15
−
15
View file @
0989278e
...
...
@@ -3,11 +3,11 @@
font-family
:
'Roboto Condensed'
;
font-style
:
normal
;
font-weight
:
300
;
src
:
url('
..
/fonts/RobotoCondensed-Light.eot')
;
/* For IE6-8 */
src
:
url('
..
/fonts/RobotoCondensed-Light.eot?#iefix')
format
(
'embedded-opentype'
)
,
url('
..
/fonts/RobotoCondensed-Light.woff')
format
(
'woff'
)
,
url('
..
/fonts/RobotoCondensed-Light.otf')
format
(
'truetype'
)
,
url('
..
/fonts/RobotoCondensed-Light.ttf')
format
(
'truetype'
);
src
:
url('/fonts/RobotoCondensed-Light.eot')
;
/* For IE6-8 */
src
:
url('/fonts/RobotoCondensed-Light.eot?#iefix')
format
(
'embedded-opentype'
)
,
url('/fonts/RobotoCondensed-Light.woff')
format
(
'woff'
)
,
url('/fonts/RobotoCondensed-Light.otf')
format
(
'truetype'
)
,
url('/fonts/RobotoCondensed-Light.ttf')
format
(
'truetype'
);
}
@font-face
{
...
...
@@ -15,11 +15,11 @@
font-family
:
'Roboto Condensed'
;
font-style
:
normal
;
font-weight
:
400
;
src
:
url('
..
/fonts/RobotoCondensed-Regular.eot')
;
/* For IE6-8 */
src
:
url('
..
/fonts/RobotoCondensed-Regular.eot?#iefix')
format
(
'embedded-opentype'
)
,
url('
..
/fonts/RobotoCondensed-Regular.woff')
format
(
'woff'
)
,
url('
..
/fonts/RobotoCondensed-Regular.otf')
format
(
'truetype'
)
,
url('
..
/fonts/RobotoCondensed-Regular.ttf')
format
(
'truetype'
);
src
:
url('/fonts/RobotoCondensed-Regular.eot')
;
/* For IE6-8 */
src
:
url('/fonts/RobotoCondensed-Regular.eot?#iefix')
format
(
'embedded-opentype'
)
,
url('/fonts/RobotoCondensed-Regular.woff')
format
(
'woff'
)
,
url('/fonts/RobotoCondensed-Regular.otf')
format
(
'truetype'
)
,
url('/fonts/RobotoCondensed-Regular.ttf')
format
(
'truetype'
);
}
@font-face
{
...
...
@@ -27,9 +27,9 @@
font-family
:
'Roboto Condensed'
;
font-style
:
normal
;
font-weight
:
700
;
src
:
url('
..
/fonts/RobotoCondensed-Bold.eot')
;
/* For IE6-8 */
src
:
url('
..
/fonts/RobotoCondensed-Bold.eot?#iefix')
format
(
'embedded-opentype'
)
,
url('
..
/fonts/RobotoCondensed-Bold.woff')
format
(
'woff'
)
,
url('
..
/fonts/RobotoCondensed-Bold.otf')
format
(
'truetype'
)
,
url('
..
/fonts/RobotoCondensed-Bold.ttf')
format
(
'truetype'
);
src
:
url('/fonts/RobotoCondensed-Bold.eot')
;
/* For IE6-8 */
src
:
url('/fonts/RobotoCondensed-Bold.eot?#iefix')
format
(
'embedded-opentype'
)
,
url('/fonts/RobotoCondensed-Bold.woff')
format
(
'woff'
)
,
url('/fonts/RobotoCondensed-Bold.otf')
format
(
'truetype'
)
,
url('/fonts/RobotoCondensed-Bold.ttf')
format
(
'truetype'
);
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment