From 2c81b6dda92c5acdf2c1746d9702c27b947e9a8e Mon Sep 17 00:00:00 2001 From: Wim Brand Date: Tue, 10 Mar 2020 18:04:30 +0100 Subject: [PATCH] fix colors --- res/include/script/homepage.js | 8 ++++---- res/include/style/layout.css | 4 +--- res/template/account/user_files.html | 2 +- res/template/account/user_home.html | 4 ++-- res/template/account/user_lists.html | 2 +- webcontroller/user_style.go | 6 +++--- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/res/include/script/homepage.js b/res/include/script/homepage.js index 4765514..d81fafa 100644 --- a/res/include/script/homepage.js +++ b/res/include/script/homepage.js @@ -28,14 +28,14 @@ UploadProgressBar.prototype.onProgress = function(progress){ this.uploadDiv.innerText = "Uploading... " + Math.round(progress*1000)/10 + "%\n" + this.name this.uploadDiv.style.background = 'linear-gradient(' +'to right, ' - +'var(--input_color_dark) 0%, ' + +'var(--layer_3_color) 0%, ' +'var(--highlight_color) '+ ((progress*100)) +'%, ' - +'var(--input_color_dark) '+ ((progress*100)+1) +'%)' + +'var(--layer_3_color) '+ ((progress*100)+1) +'%)' } UploadProgressBar.prototype.onFinished = function(id){ console.log("Upload finished: "+this.file.name+" "+id) - this.uploadDiv.style.background = 'var(--input_color_dark)' + this.uploadDiv.style.background = 'var(--layer_3_color)' this.uploadDiv.href = '/u/'+id this.uploadDiv.target= "_blank" @@ -44,7 +44,7 @@ UploadProgressBar.prototype.onFinished = function(id){ fileImg.alt = this.file.name let linkSpan = document.createElement("span") - linkSpan.style.color = "var(--highlight_color)" + linkSpan.classList = "file_button_title" linkSpan.innerText = domainURL()+"/u/"+id this.uploadDiv.innerHTML = "" // Remove uploading progress diff --git a/res/include/style/layout.css b/res/include/style/layout.css index 4127cee..590ecce 100644 --- a/res/include/style/layout.css +++ b/res/include/style/layout.css @@ -338,7 +338,7 @@ pre{ overflow: hidden; border-radius: 2px; box-shadow: 2px 2px 8px -3px var(--shadow_color); - background-color: var(--input_color_dark); + background-color: var(--layer_3_color); color: #bfbfbf; /* Fallback */ color: var(--text_color); word-break: break-all; @@ -355,8 +355,6 @@ pre{ .file_button_selected { box-shadow: 0px 0px 3px 3px var(--highlight_color); text-decoration: none; - color: #bfbfbf; /* Fallback */ - color: var(--text_color); } .file_button > img{ max-height: 100%; diff --git a/res/template/account/user_files.html b/res/template/account/user_files.html index ca28075..234cfcf 100644 --- a/res/template/account/user_files.html +++ b/res/template/account/user_files.html @@ -38,7 +38,7 @@ {{range $files.Files}} {{.Name}} - {{.Name}} + {{.Name}}
{{.DateUpload.Format "2006-01-02 15:04:05"}} {{.Name}} - {{.Name}} + {{.Name}}
{{.DateUpload.Format "2006-01-02 15:04:05"}} {{.Title}} - {{.Title}} + {{.Title}} ({{.FileCount}} Files)
{{.DateCreated.Format "2006-01-02 15:04:05"}} diff --git a/res/template/account/user_lists.html b/res/template/account/user_lists.html index 1241c10..04d66b3 100644 --- a/res/template/account/user_lists.html +++ b/res/template/account/user_lists.html @@ -31,7 +31,7 @@ {{range $lists.Lists}} {{.Title}} - {{.Title}} + {{.Title}} ({{.FileCount}} Files)
{{.DateCreated.Format "2006-01-02 15:04:05"}} diff --git a/webcontroller/user_style.go b/webcontroller/user_style.go index a636e7d..05924e8 100644 --- a/webcontroller/user_style.go +++ b/webcontroller/user_style.go @@ -211,7 +211,7 @@ var defaultPixeldrainStyle = pixeldrainStyleSheet{ Layer1Shadow: 3, Layer2Color: hsl{0, 0, .11}, Layer2Shadow: 5, - Layer3Color: hsl{0, 0, .14}, + Layer3Color: hsl{0, 0, .15}, Layer3Shadow: 7, ShadowColor: hsl{0, 0, 0}, @@ -295,7 +295,7 @@ var hackerStyle = pixeldrainStyleSheet{ Layer1Shadow: 3, Layer2Color: hsl{0, 0, .03}, Layer2Shadow: 5, - Layer3Color: hsl{120, .3, .15}, + Layer3Color: hsl{120, .3, .08}, Layer3Shadow: 7, ShadowColor: hsl{0, 0, 0}, @@ -345,7 +345,7 @@ var arcPixeldrainStyle = pixeldrainStyleSheet{ var deepseaPixeldrainStyle = pixeldrainStyleSheet{ TextColor: hsl{0, 0, .7}, - InputColor: hsl{41, .58, .47}, // hsl(0, 0%, 11%) + InputColor: hsl{41, .58, .47}, InputTextColor: hsl{0, 0, 0}, HighlightColor: hsl{5, .77, .55}, HighlightTextColor: hsl{0, 0, 0},