diff --git a/public/css/g.css b/public/css/g.css index cabf0240..c5893b8b 100644 --- a/public/css/g.css +++ b/public/css/g.css @@ -47,9 +47,9 @@ tr:nth-child(even) { background: hsla(198, 5%, 90%, 0.2); } td.tr-se { color: #22A243; } td.tr-le { color: #E84C4C; } -.torrent-info.aplus { background: hsla(200, 100%, 50%, 0.2) !important; } -.torrent-info.trusted { background: hsla(100, 100%, 50%, 0.2) !important; } -.torrent-info.remake { background: hsla(30, 100%, 50%, 0.2) !important; } +.aplus { background: hsla(200, 100%, 50%, 0.2) !important; } +.trusted { background: hsla(100, 100%, 50%, 0.2) !important; } +.remake { background: hsla(30, 100%, 50%, 0.2) !important; } .pagination .active { background: #cbbdd7; color: #444; } diff --git a/public/css/main.css b/public/css/main.css index 252a902d..d4e9c6a2 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -114,6 +114,11 @@ select.form-input + .select-icon { .form-input.search-box + .search-icon { margin-left: -2rem; padding: 5px 10px; + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAALCAQAAAADpb+tAAAAjUlEQVQIHQXBoU1DYQCAwXviUQw4LHlYJAnBYQmqW3wdpkk3wLAEAxCSCkLSFSowBIFCIH7uQCfd9dgCALrvr9Fo9NopoItG21ZNLR17A/TcHqCl0RXopw1AU6MH0KEdQKtGN6B1o0ugbb/NoKmXRrs27Rt9dw5oat2hr5667r3PzgAANPfREQAAzd3yD3GyOPKUaUBTAAAAAElFTkSuQmCC") + no-repeat + center center; + border: none; + vertical-align: middle; } .header .h-user { @@ -240,7 +245,7 @@ th { border-bottom-width: 2px; } .tr-date { width: 90px; } .sort-arrows { margin-left: 0.2rem; } -.sort-arrows a { +.sort-arrows span { font-size: 100%; letter-spacing: -0.3rem; opacity: 0.4; @@ -308,6 +313,25 @@ html, body { } +@media (max-width: 810px) { + .torrent-info-row > td { + display: block; + } + .torrent-info-td { + width: 100% !important; + } + td.torrent-view-td.torrent-info-data { + padding-left: 5px; + } + .profile-main { + display: inline-grid !important; + } + .profile-panel, .profile-content { + width: 100% !important; + margin-bottom: 20px; + } +} + /* Default Theme */ @@ -369,9 +393,9 @@ tr:nth-child(even) { background: rgba(200,200,200,0.15); } td.tr-se { color: #22A243; } td.tr-le { color: #E84C4C; } -.torrent-info.aplus { background: hsla(200, 100%, 70%, 0.2); } -.torrent-info.trusted { background: hsla(100, 100%, 70%, 0.2); } -.torrent-info.remake { background: hsla(30, 100%, 70%, 0.2); } +.aplus { background: hsla(200, 100%, 70%, 0.2); } +.trusted { background: hsla(100, 100%, 70%, 0.2); } +.remake { background: hsla(30, 100%, 70%, 0.2); } .pagination .active { background: #d5d5d5; color: #222; } .pagination .disabled { color: #d5d5d5; cursor: unset; } @@ -420,6 +444,7 @@ td.tr-le { color: #E84C4C; } .torrent-hr { font-size: large; + font-weight: bold; } .torrent-info-label { @@ -454,8 +479,6 @@ td.tr-le { color: #E84C4C; } margin-left: 10px; margin-top: 10px; padding-bottom: 5px; - display: flex; - justify-content: space-between; } .comment-index { margin-right: 5px; @@ -465,15 +488,9 @@ td.tr-le { color: #E84C4C; } .torrent-buttons { display: inline-block; float: right; - margin-top: 5px; -} -.torrent-magnet-button { - background: green; - color: white; - font-size: larger; - vertical-align: bottom; - margin-right: 5px; - margin-top: 5px; + margin-top: 20px; + margin-right: 10px; + font-size: large; } .profile-panel { @@ -536,6 +553,11 @@ td.tr-le { color: #E84C4C; } .tr-filelist { --nest-level: 0; } +.caret-down-icon { + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAALBAMAAABbgmoVAAAAIVBMVEUAAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmYs5FxxAAAACnRSTlMAByUqK1VzuvH9L+rg5gAAACtJREFUCFtjYEABVatWrVohwGAJpJYxMLDMWrUqASjqCeKAuAlgRaoMOAAAIO0LHGODAFsAAAAASUVORK5CYII=') + no-repeat center center; + vertical-align: middle; +} .tr-filelist td { padding: 4px 4px; white-space: nowrap; @@ -570,3 +592,10 @@ td.tr-le { color: #E84C4C; } height: 16px; display: inline-block; } + +#torrent-name { + height: 100%; + display: flex; + flex-direction: column; + font-weight: bold; +} \ No newline at end of file diff --git a/public/css/tomorrow.css b/public/css/tomorrow.css index 9fcb7dcc..ec6fda91 100644 --- a/public/css/tomorrow.css +++ b/public/css/tomorrow.css @@ -41,9 +41,9 @@ tr:nth-child(even) { background: rgba(0,0,0,0.2); } td.tr-se { color: #b5bd68; } td.tr-le { color: #cc6666; } -.torrent-info.aplus { background: hsla(180, 50%, 50%, 0.2) !important; } -.torrent-info.trusted { background: hsla(90, 50%, 50%, 0.2) !important; } -.torrent-info.remake { background: hsla(40, 50%, 50%, 0.2) !important; } +.aplus { background: hsla(180, 50%, 50%, 0.2) !important; } +.trusted { background: hsla(90, 50%, 50%, 0.2) !important; } +.remake { background: hsla(40, 50%, 50%, 0.2) !important; } .pagination .active { background: #141517; color: #c5c8c6; } .pagination .disabled { color: #141517; cursor: unset; } diff --git a/public/img/logo_s.png b/public/img/logo_s.png new file mode 100644 index 00000000..e185a455 Binary files /dev/null and b/public/img/logo_s.png differ diff --git a/public/js/main.js b/public/js/main.js index 16621eb8..6481faa2 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -18,7 +18,7 @@ function toggleLayer(elem) { // Date formatting var lang = document.getElementsByTagName("html")[0].getAttribute("lang"); -var ymdOpt = { year: "numeric", month: "short", day: "numeric" }; +var ymdOpt = { year: "numeric", month: "2-digit", day: "2-digit" }; var hmOpt = { hour: "numeric", minute: "numeric" }; var list = document.getElementsByClassName("date-short"); diff --git a/templates/_search.html b/templates/_search.html index cb2edd33..785d55c5 100644 --- a/templates/_search.html +++ b/templates/_search.html @@ -5,6 +5,7 @@ {{ end }} + - + {{end}} diff --git a/templates/_user_list_torrents.html b/templates/_user_list_torrents.html index d5cf5737..6b1dd157 100644 --- a/templates/_user_list_torrents.html +++ b/templates/_user_list_torrents.html @@ -1,14 +1,13 @@ {{define "profile_content"}} {{with .UserProfile}} {{ if gt (len .Torrents) 0 }} -
- - - - - - - +
{{call $.T "category"}}{{call $.T "name"}}{{call $.T "date"}}{{call $.T "size"}}{{call $.T "links"}}
+ + + + + + {{ range $i, $t := .Torrents }} {{ if lt $i 16 }} @@ -18,7 +17,7 @@ {{if eq .Status 3}}trusted{{end}} {{if eq .Status 4}}aplus{{end}}"> - - - + diff --git a/templates/_user_notifications.html b/templates/_user_notifications.html index 254404c8..4b91d1c1 100644 --- a/templates/_user_notifications.html +++ b/templates/_user_notifications.html @@ -1,6 +1,6 @@ {{define "profile_notifications_content"}} {{with .User}} -
+
{{ call $.T "clear_notifications" }}
diff --git a/templates/home.html b/templates/home.html index 287ec571..4274324f 100644 --- a/templates/home.html +++ b/templates/home.html @@ -18,22 +18,22 @@ Your browser does not support the audio element.
- + - + {{ range .ListTorrents}} + + {{if Sukebei}}Sukebei{{else}}Nyaa{{end}} Pantsu - {{block "title" .}}{{ call $.T "error_404" }}{{end}} @@ -43,12 +45,12 @@ -
+
{{call $.T "category"}}{{call $.T "name"}}{{call $.T "date"}}{{call $.T "size"}}{{call $.T "links"}}
+ {{ if Sukebei }} @@ -32,17 +31,17 @@ {{.Name}} {{.Date}} + {{.Date}} {{ fileSize .Filesize $.T }} - +
{{if ne .TorrentLink ""}} - +
{{end}}
{{call $.T "category"}} - {{call $.T "name"}}{{ genSortArrows .URL "1" }} + {{call $.T "name"}}{{ genSortArrows .URL "1" }} {{call $.T "size"}}{{ genSortArrows .URL "4" }}{{call $.T "size"}}{{ genSortArrows .URL "4" }} - {{call $.T "S"}}{{ genSortArrows .URL "5" }} / + {{call $.T "S"}}{{ genSortArrows .URL "5" }} - {{call $.T "L"}}{{ genSortArrows .URL "6" }} / + {{call $.T "L"}}{{ genSortArrows .URL "6" }} - {{call $.T "D"}}{{ genSortArrows .URL "7" }} + {{call $.T "D"}}{{ genSortArrows .URL "7" }} {{call $.T "date"}}{{ genSortArrows .URL "2" }}{{call $.T "date"}}{{ genSortArrows .URL "2" }}
- + @@ -25,7 +29,7 @@ - + @@ -33,13 +37,33 @@
Name:{{.Name}}Category:{{ if Sukebei}}{{ call $.T (CategoryName .Category .SubCategory) }}{{else}}{{ call $.T (CategoryName .Category .SubCategory) }}{{end}}
Date:{{.Date}}
{{call $.T "leechers"}}:{{if .LastScrape.IsZero}}{{call $.T "unknown"}}{{else}}{{.Leechers}}{{end}}
{{call $.T "hash"}}:{{.Hash}}{{call $.T "hash"}}:{{.Hash}} {{call $.T "completed"}}:{{if .LastScrape.IsZero}}{{call $.T "unknown"}}{{else}}{{.Completed}}{{end}}
{{call $.T "last_scraped"}}{{if not .LastScrape.IsZero}}{{formatDateRFC .LastScrape}}{{else}}{{call $.T "unknown"}}{{end}}
-
- Magnet! - Torrent! +
+ Magnet + Torrent + {{ if gt $.User.ID 0}} + + {{ call $.T "report_btn" }} + {{end}}

{{call $.T "description"}}

{{ if ne .Description ""}} -
{{.Description}}
+
{{.Description}}
{{else}}

No description provided!

{{end}} @@ -99,8 +123,8 @@

- -
+ +

{{block "captcha" (makeCaptchaData .CaptchaID $.T)}}{{end}}