Some optimizations. Improve font loading and embed global.css directly

2019-02-18 13:37:41 +01:00
parent 92ae4d0d6b
commit 287b5af6fb
23 changed files with 50 additions and 17 deletions
--- a/res/template/404.html
+++ b/res/template/404.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Not Found"}}
+		{{template "user_style" .}}
 	</head>

 	<body>
--- a/res/template/500.html
+++ b/res/template/500.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Internal Server Error"}}
+		{{template "user_style" .}}
 	</head>

 	<body>
--- a/res/template/account/file_manager.html
+++ b/res/template/account/file_manager.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "File Manager"}}
+		{{template "user_style" .}}
 		<script type="text/javascript">var apiEndpoint = '{{.APIEndpoint}}';</script>
 		<style>
 			.file_manager {
--- a/res/template/account/login.html
+++ b/res/template/account/login.html
@@ -3,6 +3,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Login"}}
+		{{template "user_style" .}}
 		<script type="text/javascript">var apiEndpoint = '{{.APIEndpoint}}';</script>
 	</head>
 	<body>
--- a/res/template/account/logout.html
+++ b/res/template/account/logout.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Logging out..."}}
+		{{template "user_style" .}}
 	</head>
 	<body>
 		<div id='body' class="body">
--- a/res/template/account/register.html
+++ b/res/template/account/register.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Register"}}
+		{{template "user_style" .}}
 		<script type="text/javascript">var apiEndpoint = '{{.APIEndpoint}}';</script>
 		<script src='https://www.google.com/recaptcha/api.js'></script>
 	</head>
--- a/res/template/account/user_files.html
+++ b/res/template/account/user_files.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Files"}}
+		{{template "user_style" .}}
 		<script type="text/javascript">var apiEndpoint = '{{.APIEndpoint}}';</script>
 	</head>

--- a/res/template/account/user_home.html
+++ b/res/template/account/user_home.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" .Username}}
+		{{template "user_style" .}}
 		<script type="text/javascript">var apiEndpoint = '{{.APIEndpoint}}';</script>
 	</head>

--- a/res/template/account/user_lists.html
+++ b/res/template/account/user_lists.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Lists"}}
+		{{template "user_style" .}}
 		<script type="text/javascript">var apiEndpoint = '{{.APIEndpoint}}';</script>
 	</head>

--- a/res/template/account/user_settings.html
+++ b/res/template/account/user_settings.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" .Username}}
+		{{template "user_style" .}}
 		<script type="text/javascript">var apiEndpoint = '{{.APIEndpoint}}';</script>
 	</head>

--- a/res/template/apidoc.html
+++ b/res/template/apidoc.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "API Documentation"}}
+		{{template "user_style" .}}
 		<style>
 			.api_doc_details{
 				border-top: 1px solid;
--- a/res/template/file_not_found.html
+++ b/res/template/file_not_found.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "File Not Found"}}
+		{{template "user_style" .}}
 	</head>
 	<body>
 		<div id="body">
--- a/res/template/file_viewer.html
+++ b/res/template/file_viewer.html
@@ -5,7 +5,9 @@
 		<title>{{.Title}}</title>
 		<meta charset="UTF-8"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-		<link rel="stylesheet" href="/global.css"/>
+		<style>
+		{{.UserStyle}}
+		</style>
 		<link rel="stylesheet" href="/res/style/viewer.css"/>
 		<link rel="stylesheet" href="/res/style/layout.css"/>
 		<link rel="stylesheet" href="/res/style/listview.css"/>
--- a/res/template/fragments/meta_tags.html
+++ b/res/template/fragments/meta_tags.html
@@ -2,7 +2,6 @@
 <title>{{.}} ~ PixelDrain</title>
 <meta charset="UTF-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-<link rel="stylesheet" href="/global.css"/>
 <link rel="stylesheet" href="/res/style/layout.css"/>
 <link rel="shortcut icon" href="/res/img/tray32.png"/>
 <meta name="theme-color" content="#9FCF6C"/>
--- a/res/template/fragments/user_style.html
+++ b/res/template/fragments/user_style.html
@@ -0,0 +1,5 @@
+{{define "user_style"}}
+<style>
+{{.UserStyle}}
+</style>
+{{end}}
--- a/res/template/history.html
+++ b/res/template/history.html
@@ -2,6 +2,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Upload History"}}
+		{{template "user_style" .}}
 		<script src="res/script/jquery.js"></script>
 		<script src="res/script/jquery-cookie.js"></script>
 		<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css"/>
--- a/res/template/home.html
+++ b/res/template/home.html
@@ -3,6 +3,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Free file sharing service"}}
+		{{template "user_style" .}}
 		<script src="/res/script/jquery-2.1.4.min.js"></script>
 		<script type="text/javascript">var apiEndpoint = '{{.APIEndpoint}}';</script>
 	</head>
--- a/res/template/paste.html
+++ b/res/template/paste.html
@@ -3,6 +3,7 @@
 <html>
 	<head>
 		{{template "meta_tags" "Text Upload"}}
+		{{template "user_style" .}}
 		<link rel="stylesheet" href="/res/style/viewer.css"/>
 		<script src="/res/script/jquery-2.1.4.min.js"></script>
 		<style>