CSS: Replace default font with Prompt

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 854a3cdbff6e5f4f017ee2775efcbbfdcdbdc721..ef7480ac9103a967d0e711d5d2bafc637b3b6cd3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -911,13 +911,24 @@ static_flags_4x3_DATA = \
 static_flags_4x3dir = $(static_flagsdir)/4x3
 
 static_fonts_DATA = \
-       src/fonts/ofl/mukta/Mukta-Bold.ttf \
-       src/fonts/ofl/mukta/Mukta-ExtraBold.ttf \
-       src/fonts/ofl/mukta/Mukta-ExtraLight.ttf \
-       src/fonts/ofl/mukta/Mukta-Light.ttf \
-       src/fonts/ofl/mukta/Mukta-Medium.ttf \
-       src/fonts/ofl/mukta/Mukta-Regular.ttf \
-       src/fonts/ofl/mukta/Mukta-SemiBold.ttf \
+       src/fonts/ofl/prompt/Prompt-BlackItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Black.ttf \
+       src/fonts/ofl/prompt/Prompt-BoldItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Bold.ttf \
+       src/fonts/ofl/prompt/Prompt-ExtraBoldItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-ExtraBold.ttf \
+       src/fonts/ofl/prompt/Prompt-ExtraLightItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-ExtraLight.ttf \
+       src/fonts/ofl/prompt/Prompt-Italic.ttf \
+       src/fonts/ofl/prompt/Prompt-LightItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Light.ttf \
+       src/fonts/ofl/prompt/Prompt-MediumItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Medium.ttf \
+       src/fonts/ofl/prompt/Prompt-Regular.ttf \
+       src/fonts/ofl/prompt/Prompt-SemiBoldItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-SemiBold.ttf \
+       src/fonts/ofl/prompt/Prompt-ThinItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Thin.ttf \
        \
        src/font-awesome/webfonts/fa-brands-400.eot \
        src/font-awesome/webfonts/fa-brands-400.svg \

diff --git a/src/backend/iuse.py b/src/backend/iuse.py
index 99c9d0420181dcaa557149118f23d122fc9518cd..77fbcdd5cf836938fc1e27ddd85b9dd27c813f6c 100644 (file)
--- a/src/backend/iuse.py
+++ b/src/backend/iuse.py
@@ -46,7 +46,7 @@ class ImageObject(Object):
        def font(self):
                fontfile = os.path.join(
                        self.request.application.settings.get("static_path", ""),
-                       "fonts/Mukta-Regular.ttf"
+                       "fonts/Prompt-Regular.ttf"
                )
 
                return ImageFont.truetype(fontfile, 15, encoding="unic")

diff --git a/src/fonts b/src/fonts
index 3ca591dae7372a26e254ec6d22e7b453813b9530..b439c994fb212fe6f4f978493774b45dfcbdf4af 160000 (submodule)
--- a/src/fonts
+++ b/src/fonts
@@ -1 +1 @@
-Subproject commit 3ca591dae7372a26e254ec6d22e7b453813b9530
+Subproject commit b439c994fb212fe6f4f978493774b45dfcbdf4af

diff --git a/src/scss/_fonts.scss b/src/scss/_fonts.scss
index 69a0b10e0acf33ae161ed300b2118f452c1ffdf2..c1782fbe0c6586e3cfbb7f4ea77d878db1bea3c9 100644 (file)
--- a/src/scss/_fonts.scss
+++ b/src/scss/_fonts.scss
@@ -1,53 +1,53 @@
 /* latin-ext */
 @font-face {
-       font-family: "Mukta";
+       font-family: "Prompt";
        font-style: normal;
        font-weight: 400;
-       src: local("Mukta Regular"), local("Mukta-Regular"), url(/static/fonts/Mukta-Regular.ttf) format("truetype");
+       src: local("Prompt Regular"), local("Prompt-Regular"), url(/static/fonts/Prompt-Regular.ttf) format("truetype");
        unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 
 /* latin */
 @font-face {
-       font-family: "Mukta";
+       font-family: "Prompt";
        font-style: normal;
        font-weight: 400;
-       src: local("Mukta Regular"), local("Mukta-Regular"), url(/static/fonts/Mukta-Regular.ttf) format("truetype");
+       src: local("Prompt Regular"), local("Prompt-Regular"), url(/static/fonts/Prompt-Regular.ttf) format("truetype");
        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 /* latin-ext */
 @font-face {
-       font-family: 'Mukta';
+       font-family: 'Prompt';
        font-style: normal;
        font-weight: 500;
-       src: local('Mukta Medium'), local('Mukta-Medium'), url(/static/fonts/Mukta-Medium.ttf) format("truetype");
+       src: local('Prompt Medium'), local('Prompt-Medium'), url(/static/fonts/Prompt-Medium.ttf) format("truetype");
        unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 
 /* latin */
 @font-face {
-       font-family: 'Mukta';
+       font-family: 'Prompt';
        font-style: normal;
        font-weight: 500;
-       src: local('Mukta Medium'), local('Mukta-Medium'), url(/static/fonts/Mukta-Medium.ttf) format("truetype");
+       src: local('Prompt Medium'), local('Prompt-Medium'), url(/static/fonts/Prompt-Medium.ttf) format("truetype");
        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 /* latin-ext */
 @font-face {
-       font-family: "Mukta";
+       font-family: "Prompt";
        font-style: normal;
        font-weight: 700;
-       src: local("Mukta Bold"), local("Mukta-Bold"), url(/static/fonts/Mukta-Bold.ttf) format("truetype");
+       src: local("Prompt Bold"), local("Prompt-Bold"), url(/static/fonts/Prompt-Bold.ttf) format("truetype");
        unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 
 /* latin */
 @font-face {
-       font-family: "Mukta";
+       font-family: "Prompt";
        font-style: normal;
        font-weight: 700;
-       src: local("Mukta Bold"), local("Mukta-Bold"), url(/static/fonts/Mukta-Bold.ttf) format("truetype");
+       src: local("Prompt Bold"), local("Prompt-Bold"), url(/static/fonts/Prompt-Bold.ttf) format("truetype");
        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }

diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 5927fa85433d44720e8342b2e5cbdc47c3391739..368f6016250281509b5a02008c2aa52ec3e93c65 100644 (file)
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -37,7 +37,7 @@ $border-radius:                               5px;
 $border-radius-lg:                     5px;
 
 // Fonts
-$font-family-sans-serif:       "Mukta", sans-serif;
+$font-family-sans-serif:       "Prompt", sans-serif;
 
 $font-weight-light:                    200;
 $font-weight-normal:           400;

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 676e6edb8a60fc3dcd64283401c438fdb4eb5684..97b4a9534058d52c2283393c6b11ae9c36dc1e08 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -115,7 +115,7 @@ class Application(tornado.web.Application):
                        (r"/logout", auth.LogoutHandler),
                ]
 
-               self.add_handlers(r"(dev|www)\.ipfire\.org", [
+               self.add_handlers(r"(dev|www)\.ipfire\.rocks", [
                        # Entry site that lead the user to index
                        (r"/", IndexHandler),
 
@@ -175,7 +175,7 @@ class Application(tornado.web.Application):
                ])
 
                # mirrors.ipfire.org
-               self.add_handlers(r"^mirrors\.ipfire\.org", [
+               self.add_handlers(r"^mirrors\.ipfire\.rocks", [
                        (r"/", mirrors.IndexHandler),
                        (r"/mirrors/(.*)", mirrors.MirrorHandler),
                ])
@@ -247,7 +247,7 @@ class Application(tornado.web.Application):
                ] + authentication_handlers)
 
                # location.ipfire.org
-               self.add_handlers(r"location\.ipfire\.org", [
+               self.add_handlers(r"location\.ipfire\.rocks", [
                        (r"/", location.IndexHandler),
                        (r"/download", StaticHandler, { "template" : "../location/download.html" }),
                        (r"/how\-to\-use", StaticHandler, { "template" : "../location/how-to-use.html" }),
@@ -303,7 +303,7 @@ class Application(tornado.web.Application):
                ]  + authentication_handlers)
 
                # wiki.ipfire.org
-               self.add_handlers(r"wiki\.ipfire\.org",
+               self.add_handlers(r"wiki\.ipfire\.rocks",
                        authentication_handlers + [
 
                        # Actions

diff --git a/src/web/people.py b/src/web/people.py
index 8f6a858bcb5119b30bd7a81e495573d80be7f4e5..6c31a82e85109c2fd7ae0e904499b5c915b3e775 100644 (file)
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -108,7 +108,7 @@ class AvatarHandler(base.BaseHandler):
                # Load font
                font = PIL.ImageFont.truetype(os.path.join(
                        self.application.settings.get("static_path", ""),
-                       "fonts/Mukta-Bold.ttf"
+                       "fonts/Prompt-Bold.ttf"
                ), size, encoding="unic")
 
                # Determine size of the printed letter