diff --git a/res/static/script/Toolbar.js b/res/static/script/Toolbar.js index 3390501..efc4ebb 100644 --- a/res/static/script/Toolbar.js +++ b/res/static/script/Toolbar.js @@ -16,7 +16,7 @@ var Toolbar = { Sharebar.toggle(); } - document.getElementById("toolbar").style.left = "-9em"; + document.getElementById("toolbar").style.left = "-8em"; document.getElementById("filepreview").style.left = "0px"; document.getElementById("button_toggle_toolbar").classList.remove("button_highlight"); diff --git a/res/static/style/layout.css b/res/static/style/layout.css index 0e974fb..1de6c01 100644 --- a/res/static/style/layout.css +++ b/res/static/style/layout.css @@ -216,13 +216,16 @@ hr{ } ::-webkit-scrollbar{ - width: 12px; /* for vertical scrollbars */ - height: 12px; /* for horizontal scrollbars */ + width: 1em; /* for vertical scrollbars */ + height: 1em; /* for horizontal scrollbars */ +} +::-webkit-scrollbar-track { + background: var(--scrollbar_background_color); } -::-webkit-scrollbar-track {background: var(--scrollbar_background_color);} ::-webkit-scrollbar-thumb { background-color: var(--scrollbar_foreground_color); - border-radius: 6px; + border-radius: 0.5em; + border: 0.22em solid var(--scrollbar_background_color); } ::-webkit-scrollbar-corner{background: transparent;} @@ -293,10 +296,10 @@ pre{ .file_button{ position: relative; box-sizing: border-box; - width: 310px; + width: 300px; max-width: 90%; - height: 60px; - margin: 6px; + height: 3.6em; + margin: 10px; padding: 0; overflow: hidden; border-radius: 2px; diff --git a/res/static/style/viewer.css b/res/static/style/viewer.css index e234b76..70fff9c 100644 --- a/res/static/style/viewer.css +++ b/res/static/style/viewer.css @@ -3,10 +3,6 @@ Author : Fornax */ -body{ - overflow: hidden; -} - /* Viewer container */ .file_viewer { position: absolute; @@ -26,7 +22,7 @@ body{ display: flex; flex-direction: row; text-align: left; - padding: 0.2em; + padding: 8px; } /* Headerbar components */ @@ -63,7 +59,7 @@ body{ white-space: nowrap; } .file_viewer > .list_navigator > .list_item{ - height: 40px !important; + height: 2.6em !important; width: 250px !important; } @@ -195,7 +191,7 @@ body{ /* Workaround to hide the scrollbar in non webkit browsers, it's really ugly' */ -#toolbar > div { +.file_viewer_toolbar > div { position: absolute; left: 0; top: 0; @@ -204,7 +200,7 @@ body{ overflow-y: scroll; overflow-x: hidden; } -#toolbar > div > div { +.file_viewer_toolbar > div > div { position: absolute; left: 0; top: 0; diff --git a/res/template/account/user_files.html b/res/template/account/user_files.html index 7e27ade..f6f93de 100644 --- a/res/template/account/user_files.html +++ b/res/template/account/user_files.html @@ -32,14 +32,14 @@
- {{range $files.Files}} - + {{range $files.Files}} {{.Name}} {{.Name}}
{{.DateUpload.Format "2006-01-02 15:04:05"}} - - {{end}} + {{end}}
diff --git a/res/template/account/user_home.html b/res/template/account/user_home.html index 01c0def..b4611ef 100644 --- a/res/template/account/user_home.html +++ b/res/template/account/user_home.html @@ -21,29 +21,29 @@

Your most recently uploaded files:

{{$files := .PixelAPI.UserFiles 0 18}} - {{range $files.Files}} - + {{range $files.Files}} {{.Name}} {{.Name}}
{{.DateUpload.Format "2006-01-02 15:04:05"}} - - {{end}} + {{end}}
...All my files

Your most recently created lists:

{{$lists := .PixelAPI.UserLists 0 18}} - {{range $lists.Lists}} - + {{range $lists.Lists}} {{.Title}} {{.Title}} ({{.FileCount}} Files)
{{.DateCreated.Format "2006-01-02 15:04:05"}} - - {{end}} + {{end}}
...All my lists
diff --git a/res/template/account/user_lists.html b/res/template/account/user_lists.html index c7220b6..4c005fd 100644 --- a/res/template/account/user_lists.html +++ b/res/template/account/user_lists.html @@ -26,15 +26,15 @@

- {{range $lists.Lists}} - - {{.Title}} - {{.Title}} - ({{.FileCount}} Files) -
- {{.DateCreated.Format "2006-01-02 15:04:05"}} - - {{end}} + {{range $lists.Lists}} + {{.Title}} + {{.Title}} + ({{.FileCount}} Files) +
+ {{.DateCreated.Format "2006-01-02 15:04:05"}} + {{end}}
diff --git a/res/template/file_viewer.html b/res/template/file_viewer.html index 9503bce..75d6441 100644 --- a/res/template/file_viewer.html +++ b/res/template/file_viewer.html @@ -29,7 +29,6 @@ Back to the Home page - {{.Title}}
diff --git a/webcontroller/user_style.go b/webcontroller/user_style.go index a6857e8..0a1ec2e 100644 --- a/webcontroller/user_style.go +++ b/webcontroller/user_style.go @@ -158,7 +158,7 @@ var defaultPixeldrainStyle = pixeldrainStyleSheet{ HighlightTextColor: hsl{0, 0, 0}, DangerColor: hsl{339, .65, .31}, FileBackgroundColor: hsl{0, 0, .20}, - ScrollbarForegroundColor: hsl{0, 0, .30}, + ScrollbarForegroundColor: hsl{0, 0, .35}, ScrollbarBackgroundColor: hsl{0, 0, 0}, BackgroundColor: hsl{0, 0, 0}, @@ -227,7 +227,7 @@ var maroonStyle = pixeldrainStyleSheet{ HighlightTextColor: hsl{0, 0, 1}, DangerColor: hsl{0, .1, .1}, FileBackgroundColor: hsl{0, 1, .03}, - ScrollbarForegroundColor: hsl{0, .75, .2}, + ScrollbarForegroundColor: hsl{0, .75, .3}, ScrollbarBackgroundColor: hsl{0, 0, 0}, BackgroundColor: hsl{0, 1, .05}, @@ -250,7 +250,7 @@ var hackerStyle = pixeldrainStyleSheet{ HighlightTextColor: hsl{0, 0, 0}, DangerColor: hsl{0, .65, .31}, FileBackgroundColor: hsl{120, .8, .06}, - ScrollbarForegroundColor: hsl{0, 0, .25}, + ScrollbarForegroundColor: hsl{120, .5, .25}, ScrollbarBackgroundColor: hsl{0, 0, 0}, BackgroundColor: hsl{0, 0, 0}, @@ -297,7 +297,7 @@ var arcPixeldrainStyle = pixeldrainStyleSheet{ DangerColor: hsl{357, .53, .57}, // hsl(357, 53%, 57%) FileBackgroundColor: hsl{219, .1, .2}, ScrollbarForegroundColor: hsl{222, .08, .44}, // hsl(222, 8%, 44%) - ScrollbarBackgroundColor: hsl{223, .12, .29}, // hsl(223, 12%, 29%) + ScrollbarBackgroundColor: hsl{223, .12, .2}, // hsl(223, 12%, 29%) BackgroundColor: hsl{0, 0, 0}, BodyColor: hsl{223, .12, .29},