webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 02:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

captive-portal: Serve Ubuntu font files locally

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-10-04 12:55:17 +01:00
parent 70f6cba43e
commit 1f06098ba7
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/common/web-user-interface
View File

@@ -96,6 +96,9 @@ srv/web/ipfire/cgi-bin/wlanap.cgi
srv/web/ipfire/html/blob.gif
#srv/web/ipfire/html/captive
#srv/web/ipfire/html/captive/assets
srv/web/ipfire/html/captive/assets/Ubuntu-L.ttf
srv/web/ipfire/html/captive/assets/Ubuntu-M.ttf
srv/web/ipfire/html/captive/assets/Ubuntu-R.ttf
srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css
srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css.map
srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css

18
html/html/captive/assets/captive.css
View File

@@ -1,3 +1,21 @@
@font-face {
font-family: "Ubuntu";
font-weight: 300;
src: local("Ubuntu Light"), local("Ubuntu-Light"), url("Ubuntu-L.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu";
font-weight: 400;
src: local("Ubuntu Regular"), local("Ubuntu-Regular"), url("Ubuntu-R.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu";
font-weight: 500;
src: local("Ubuntu Medium"), local("Ubuntu-Medium"), url("Ubuntu-M.ttf") format("truetype");
}
body {
background-image: url("../cgi-bin/logo.cgi");
background-size: 100%;

2
html/html/captive/template.html
View File

@@ -16,8 +16,6 @@
</style>
</TMPL_IF>
<link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
</head>

8
lfs/web-user-interface
View File

@@ -80,4 +80,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -svf --relative /usr/share/bootstrap/css/bootstrap-reboot.min.css.map \
/srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css.map
# Captive Portal Fonts
ln -svf --relative /usr/share/fonts/Ubuntu-L.ttf \
/srv/web/ipfire/html/captive/assets/Ubuntu-L.ttf
ln -svf --relative /usr/share/fonts/Ubuntu-M.ttf \
/srv/web/ipfire/html/captive/assets/Ubuntu-M.ttf
ln -svf --relative /usr/share/fonts/Ubuntu-R.ttf \
/srv/web/ipfire/html/captive/assets/Ubuntu-R.ttf
@$(POSTBUILD)