diff --git a/res/include/script/Viewer.js b/res/include/script/Viewer.js index 27bf36d..9f6c718 100644 --- a/res/include/script/Viewer.js +++ b/res/include/script/Viewer.js @@ -47,10 +47,10 @@ var Viewer = { document.getElementById("file_viewer_headerbar_title").style.lineHeight = "1em"; document.getElementById("file_viewer_list_title").innerText = this.title; document.getElementById("file_viewer_file_title").innerText = file.name; - document.title = this.title + " ~ " + file.name + " ~ PixelDrain"; + document.title = this.title + " ~ " + file.name + " ~ pixeldrain"; } else { document.getElementById("file_viewer_file_title").innerText = file.name; - document.title = file.name + " ~ PixelDrain"; + document.title = file.name + " ~ pixeldrain"; } $.get("/u/" + file.id + "/preview", function(response){ diff --git a/res/include/style/layout.css b/res/include/style/layout.css index dc5b696..bd9198e 100644 --- a/res/include/style/layout.css +++ b/res/include/style/layout.css @@ -8,26 +8,11 @@ } /* Fonts */ - -@font-face { - font-family: 'default'; - font-display: fallback; - font-style: normal; - font-weight: normal; - text-rendering: optimizeLegibility; - src: - local('Cantarell'), - local('Cantarell Regular'), - local('Cantarell, Regular'), - local('Cantarell-Regular'), - url("/res/misc/Cantarell-Regular.otf") format("opentype"); -} @font-face { font-family: 'light'; font-display: fallback; font-style: normal; font-weight: normal; - text-rendering: optimizeLegibility; src: local('Cantarell Light'), local('Cantarell, Light'), @@ -43,7 +28,7 @@ body{ background-color: #0d0d0d; /* Fallback */ background-color: var(--body_color); background-repeat: repeat; - font-family: "default"; + font-family: sans-serif; margin: 0; line-height: 1.5em; color: #bfbfbf; /* Fallback */ @@ -136,7 +121,7 @@ body{ padding: 0; box-sizing: border-box; text-align: left; - word-break: break-word; + word-break: break-all; clear: both; } .page_body > h1 { @@ -245,9 +230,9 @@ h1, h2, h3, h4, h5, h6 { h1{font-size: 2em; font-family: "light"; font-weight: normal;} h2{font-size: 1.75em; font-family: "light"; font-weight: normal;} h3{font-size: 1.5em; font-family: "light"; font-weight: normal;} -h4{font-size: 1.25em; font-family: "default"; font-weight: normal;} -h5{font-size: 1em; font-family: "default"; font-weight: normal;} -h6{font-size: .75em; font-family: "default"; font-weight: normal;} +h4{font-size: 1.25em; font-family: sans-serif; font-weight: normal;} +h5{font-size: 1em; font-family: sans-serif; font-weight: normal;} +h6{font-size: .75em; font-family: sans-serif; font-weight: normal;} h2, h3{border-bottom: 1px var(--layer_3_color_border) solid;} /* Differentiate it a bit, else it just looks like bold text */ p, .indent { diff --git a/res/include/style/viewer.css b/res/include/style/viewer.css index 2fd7b55..ab42407 100644 --- a/res/include/style/viewer.css +++ b/res/include/style/viewer.css @@ -66,7 +66,6 @@ display: none; /* Becomes visible if the page is a list */ width: 100%; background-color: var(--layer_1_color); - /* box-shadow: 0 0 8px var(--shadow_color); */ text-align: center; line-height: 1em; overflow-x: scroll; @@ -182,9 +181,7 @@ } .text-container > pre { white-space: pre-wrap; - word-wrap: break-word; overflow: hidden; - } .pannable{ @@ -196,7 +193,6 @@ cursor: move; top: 50%; transform: translateY(-50%); - -webkit-transform: translateY(-50%); } .center{ @@ -207,7 +203,6 @@ max-height: 100%; top: 50%; transform: translateY(-50%); - -webkit-transform: translateY(-50%); } .drop-shadow{ diff --git a/res/static/misc/clientinfo.html b/res/static/misc/clientinfo.html deleted file mode 100644 index 3386e4d..0000000 --- a/res/static/misc/clientinfo.html +++ /dev/null @@ -1,80 +0,0 @@ -

The Client

-

- - The Client - - - I created a desktop client for users who want the convenience to - share (parts of) their desktop with just the press of a key. - You can - check out the client in action here. The client will also zip - files for you automatically when you try to upload multiple files - at once, just to save you those valueable seconds! -

- -

Using PixelDrain

- -I bet you're very excited to start using it! You can download it -from here, but there are some important things you need to know -before you start using it: -
- - - -Download PixelDrain now. - -

- - -Here are some current files on PixelDrain to show you how the -website is progressing: - \ No newline at end of file diff --git a/res/static/misc/wasm/index.html b/res/static/misc/wasm/index.html index a58d648..8aad5da 100644 --- a/res/static/misc/wasm/index.html +++ b/res/static/misc/wasm/index.html @@ -1,4 +1,4 @@ - + diff --git a/res/template/404.html b/res/template/404.html index 734dd26..4f271ef 100644 --- a/res/template/404.html +++ b/res/template/404.html @@ -1,5 +1,5 @@ {{define "404"}} - + {{template "meta_tags" "Not Found"}} {{template "user_style" .}} @@ -25,5 +25,5 @@ {{template "page_bottom"}} {{template "analytics"}} - + {{end}} diff --git a/res/template/500.html b/res/template/500.html index 7e71874..8acb5d4 100644 --- a/res/template/500.html +++ b/res/template/500.html @@ -1,5 +1,5 @@ {{define "500"}} - + {{template "meta_tags" "500, Internal Server Error"}} {{template "user_style" .}} diff --git a/res/template/about.html b/res/template/about.html index 0344e0c..f9f3b5d 100644 --- a/res/template/about.html +++ b/res/template/about.html @@ -1,5 +1,5 @@ {{define "about"}} - + {{template "meta_tags" "About"}} {{template "user_style" .}} diff --git a/res/template/account/email_confirm.html b/res/template/account/email_confirm.html index 2b9a77c..ebed176 100644 --- a/res/template/account/email_confirm.html +++ b/res/template/account/email_confirm.html @@ -1,5 +1,5 @@ {{define "email_confirm"}} - + {{template "meta_tags" "E-mail verification"}} {{template "user_style" .}} diff --git a/res/template/account/file_manager.html b/res/template/account/file_manager.html index a2a77ba..a336a6a 100644 --- a/res/template/account/file_manager.html +++ b/res/template/account/file_manager.html @@ -1,9 +1,9 @@ {{define "file_manager"}} - + {{template "meta_tags" "File Manager"}} {{template "user_style" .}} - + - - - - - - - - - - - - - - - - - - - -
- Previous Item - Next Item -
-
- -
- Loading... -
- - - - - - - - - - - - - - - - diff --git a/res/template/fragments/form.html b/res/template/fragments/form.html index ee1c80d..0df343d 100644 --- a/res/template/fragments/form.html +++ b/res/template/fragments/form.html @@ -90,11 +90,11 @@ {{end}} {{define "form_page"}} - + {{template "meta_tags" .Title}} {{template "user_style" .}} - + diff --git a/res/template/fragments/meta_tags.html b/res/template/fragments/meta_tags.html index cef0f43..766367e 100644 --- a/res/template/fragments/meta_tags.html +++ b/res/template/fragments/meta_tags.html @@ -1,5 +1,5 @@ {{define "meta_tags"}} -{{.}} ~ PixelDrain +{{.}} ~ pixeldrain diff --git a/res/template/history.html b/res/template/history.html index 2d5ac73..26b1ada 100644 --- a/res/template/history.html +++ b/res/template/history.html @@ -1,11 +1,11 @@ {{define "history_cookies"}} - + {{template "meta_tags" "Upload History"}} {{template "user_style" .}} - +
@@ -13,7 +13,7 @@

Upload History

- Here are all files you have previously uploaded to PixelDrain using this computer. + Here are all files you have previously uploaded to pixeldrain using this computer. This data is saved locally in your web browser and gets updated every time you upload a file through your current browser.


diff --git a/res/template/home.html b/res/template/home.html index bcd4f3f..53cbe75 100644 --- a/res/template/home.html +++ b/res/template/home.html @@ -1,6 +1,6 @@ {{define "home"}} - + {{template "meta_tags" "Free file sharing service"}} {{template "user_style" .}} @@ -60,7 +60,7 @@

- By uploading files to Pixeldrain you accept that a cookie will + By uploading files to pixeldrain you accept that a cookie will be placed in your web browser. More information on the about page

@@ -87,19 +87,19 @@ {{template `open_in_new.svg` .}}
Open link

- - - - -
@@ -148,7 +148,7 @@ {{template "page_bottom"}} - diff --git a/webcontroller/file_preview.go b/webcontroller/file_preview.go index 4b332e6..ab8c09f 100644 --- a/webcontroller/file_preview.go +++ b/webcontroller/file_preview.go @@ -242,12 +242,12 @@ func serveFilePreviewDemo(w http.ResponseWriter) { | | /\/ |/ |/ / | / | / | | / |/ | | |_/ /\_/|__/|__/\_/|_/ |_/\_/|_/|_/ | |_/ -This is a demonstration of Pixeldrain's file viewer. +This is a demonstration of pixeldrain's file viewer. -The website automatically detects what kind of file you requested and prepares a page for viewing it properly. This is what a text file would look like on Pixeldrain. You can upload your own text file at pixeldrain.com/t. +The website automatically detects what kind of file you requested and prepares a page for viewing it properly. This is what a text file would look like on pixeldrain. You can upload your own text file at pixeldrain.com/t. Pixeldrain is a free service for sharing files with large or small groups of people. For more information visit the home page by pressing the home button on the toolbar at the left side of the screen. -Press the Details button or "i" for more info about Pixeldrain's file viewer. +Press the Details button or "i" for more info about pixeldrain's file viewer.
`) } diff --git a/webcontroller/file_viewer.go b/webcontroller/file_viewer.go index 0ce3ae6..418952a 100644 --- a/webcontroller/file_viewer.go +++ b/webcontroller/file_viewer.go @@ -53,7 +53,7 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request, templateData.OGData = metadataFromFile(*finfo[0]) var err error if list { - templateData.Title = fmt.Sprintf("%d files in Pixeldrain", len(finfo)) + templateData.Title = fmt.Sprintf("%d files on pixeldrain", len(finfo)) templateData.Other = viewerData{ Type: "list", CaptchaKey: wc.captchaKey(), @@ -66,7 +66,7 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request, }, } } else { - templateData.Title = fmt.Sprintf("%s ~ Pixeldrain file", finfo[0].Name) + templateData.Title = fmt.Sprintf("%s ~ pixeldrain", finfo[0].Name) templateData.Other = viewerData{ Type: "file", CaptchaKey: wc.captchaKey(), diff --git a/webcontroller/list_viewer.go b/webcontroller/list_viewer.go index 8cb93ec..340947d 100644 --- a/webcontroller/list_viewer.go +++ b/webcontroller/list_viewer.go @@ -26,7 +26,7 @@ func (wc *WebController) serveListViewer(w http.ResponseWriter, r *http.Request, return } - templateData.Title = fmt.Sprintf("%s ~ Pixeldrain list", list.Title) + templateData.Title = fmt.Sprintf("%s ~ pixeldrain", list.Title) templateData.OGData = metadataFromList(*list) templateData.Other = viewerData{ Type: "list", diff --git a/webcontroller/opengraph.go b/webcontroller/opengraph.go index fddb587..af40ff3 100644 --- a/webcontroller/opengraph.go +++ b/webcontroller/opengraph.go @@ -31,7 +31,7 @@ type linkRule struct { } func (o linkRule) HTML() template.HTML { - return template.HTML(`` + "\n") + return template.HTML(`` + "\n") } func metadataFromFile(f pixelapi.FileInfo) (meta template.HTML) { diff --git a/webcontroller/user_account.go b/webcontroller/user_account.go index cfc5035..5b2b5bf 100644 --- a/webcontroller/user_account.go +++ b/webcontroller/user_account.go @@ -45,7 +45,7 @@ func (wc *WebController) registerForm(td *TemplateData, r *http.Request) (f Form } // Construct the form - td.Title = "Register a new Pixeldrain account" + td.Title = "Register a new pixeldrain account" f = Form{ Name: "register", Title: td.Title,