diff --git a/public/css/style-night.css b/public/css/style-night.css
index d7926659..4b9263d6 100644
--- a/public/css/style-night.css
+++ b/public/css/style-night.css
@@ -1,27 +1,44 @@
/*Don't make changes to layout here, only colours*/
/* Torrent status colors */
.remake {
- background-color: #473e50; /*270,13%,28%*/
+ /*270,13%,28%*/
+ background-color: #473e50;
}
+
.trusted {
- background-color: #395045; /*150,17%,27%*/
+ /*150,17%,27%*/
+ background-color: #395045;
}
+
.aplus {
- background-color: #3c5b71; /*205,30%,34%*/
+ /*205,30%,34%*/
+ background-color: #3c5b71;
}
+
.remake a {
- color: #cfc2dc; /*270,26%,81%*/
+ /*270,26%,81%*/
+ color: #cfc2dc;
}
+
.trusted a {
- color: #bde0db; /*170,36%,81%*/
+ /*170,36%,81%*/
+ color: #bde0db;
}
+
.remake a:hover {
color: #cf9fff;
}
+
.trusted a:hover {
color: #6ae3d1;
}
-.table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th {
+
+.table > tbody > tr > td,
+.table > tbody > tr > th,
+.table > tfoot > tr > td,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > thead > tr > th {
border-color: hsla(200,60%,70%,0.15);
}
@@ -60,26 +77,29 @@
background-image: url(/img/megumin.png);
}
-body, footer {
+body,
+footer {
background-color: #282A2E;
color: #eff5f5;
}
-
.pagination > .active > a {
background: #ececec;
border-color: #ececec;
- color: #337ab7; /* restore usual text color */
+ /* restore usual text color */
+ color: #337ab7;
}
/* Links, Text */
a {
color: #a2c9dd;
}
+
a:hover {
color: #55c5ff;
text-shadow: 1px 1px 0 #000;
}
+
.btn-success {
color: #fff;
background-color: #b294bb;
@@ -90,16 +110,21 @@ a:hover {
background-color: #b294bb;
}
-.form-control, pre {
+.form-control,
+pre {
color: #fff;
background-color: #29363d
}
/* style the dropdown member menu */
-.nav > .dropdown.open, .profile-image[aria-expanded="true"], .nav ul.dropdown-menu {
+.nav > .dropdown.open,
+.profile-image[aria-expanded="true"],
+.nav ul.dropdown-menu {
background: #282A2E;
}
-.dropdown-menu > li > a:focus, .dropdown-menu > li > a:hover {
+
+.dropdown-menu > li > a:focus,
+.dropdown-menu > li > a:hover {
background: #263238;
}
@@ -127,9 +152,11 @@ a:hover {
border-bottom: .5em solid #fff;
margin-bottom: -.5em;
}
+
.modal-content {
background: #29363d;
}
+
.modal-content .close {
color: #fff;
}
@@ -140,7 +167,6 @@ a:hover {
}
/*Comments*/
-
.commentList .commentData {
color: #fff;
}
@@ -153,6 +179,7 @@ a:hover {
textarea.torrent-desc {
background: none;
}
-.md-editor>textarea:focus {
+
+.md-editor > textarea:focus {
background: none;
}
diff --git a/public/css/style.css b/public/css/style.css
index 100a4d41..b472ac28 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -2,9 +2,11 @@
.remake {
background-color: rgb(240, 176, 128);
}
+
.trusted {
background-color: #a3e9a4;
}
+
.aplus {
background-color: #81d3fa;
}
@@ -12,39 +14,47 @@
.container.remake {
box-shadow: 0px 0px 30px 10px rgba(240, 176, 128, 0.6);
}
+
.row.remake {
margin-bottom: 0.5rem;
color: rgb(119, 94, 140);
- padding:2px 0;
+ padding: 2px 0;
}
+
.container.trusted {
box-shadow: 0px 0px 30px 10px rgba(163, 233, 164, 0.6);
}
+
.row.trusted {
margin-bottom: 0.5rem;
color: rgb(119, 94, 140);
- padding:2px 0;
+ padding: 2px 0;
}
+
.container.aplus {
box-shadow: 0px 0px 30px 10px rgba(129, 211, 250, 0.6);
}
+
.row.aplus {
margin-bottom: 0.5rem;
color: rgb(119, 94, 140);
- padding:2px 0;
+ padding: 2px 0;
}
/* modified copy of NyaaTorrent theme */
-#mainmenu, #mainmenu .dropdown-menu{
+#mainmenu,
+#mainmenu .dropdown-menu {
background: #263238;
color: white;
}
+
#mainmenu {
position: fixed;
width: 100%;
z-index: 4;
border: 0px solid white;
}
+
#mainmenu a {
background: none;
color: white;
@@ -59,6 +69,7 @@
background: white;
}
+/* This used to avoid usage of Javascript for switching images. */
#mascot {
background-image: url(/img/renchon.png);
width: 125px;
@@ -67,7 +78,6 @@
bottom: 0px;
left: 2%;
}
-/* This used to avoid usage of Javascript for switching images. */
body {
background-color: #ececec;
@@ -84,7 +94,8 @@ body {
.pagination > .active > a {
background: #ececec;
border-color: #ececec;
- color: #337ab7; /* restore usual text color */
+ /* restore usual text color */
+ color: #337ab7;
}
/* Links, Text */
@@ -125,15 +136,17 @@ td {
.comment-row td:first-of-type {
vertical-align: top;
text-align: left;
- color:#bbb;
+ color: #bbb;
}
-.md-editor > textarea, .md-preview {
+.md-editor > textarea,
+.md-preview {
background: none !important;
}
/* Table style & fixes */
-.table > tbody > tr > th, .nowrap {
+.table > tbody > tr > th,
+.nowrap {
white-space: nowrap;
}
@@ -142,7 +155,8 @@ td {
vertical-align: middle;
}
-.table > tbody > tr > th, .table > tbody > tr > td {
+.table > tbody > tr > th,
+.table > tbody > tr > td {
padding: 4px;
}
@@ -172,15 +186,34 @@ th a:hover {
opacity: 0.25;
}
-div.container div.blockBody:nth-of-type(2) table{table-layout:fixed;}
-div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:first-of-type, div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(5){width:10%;}
-div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(3){width:15%;}
-div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(4){width:19%;}
-div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-type{width:6%;}
+div.container div.blockBody:nth-of-type(2) table {
+ table-layout: fixed;
+}
+
+div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:first-of-type,
+div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(5) {
+ width: 10%;
+}
+
+div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(3) {
+ width: 15%;
+}
+
+div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(4) {
+ width: 19%;
+}
+
+div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-type {
+ width: 6%;
+}
/* Mobile-friendly main table */
@media only screen and (max-width: 700px) {
- table, thead, tbody, tr {
+
+ table,
+ thead,
+ tbody,
+ tr {
display: block;
}
@@ -192,7 +225,8 @@ div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-typ
display: inline-block;
}
- td:nth-of-type(1), td:nth-of-type(2) {
+ td:nth-of-type(1),
+ td:nth-of-type(2) {
display: block;
}
@@ -235,18 +269,15 @@ div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-typ
display: none;
}
-#mainmenu .navbar-form select.form-control
-{
+#mainmenu .navbar-form select.form-control {
width: 12rem;
}
-#mainmenu .navbar-form select.form-control#max
-{
+#mainmenu .navbar-form select.form-control#max {
width: 6rem;
}
-.special-img
-{
+.special-img {
position: relative;
top: -7px;
float: left;
@@ -257,13 +288,16 @@ div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-typ
line-height: 35px;
}
-#mainmenu .navbar-header, #mainmenu .navbar-nav, #mainmenu .navbar-form {
+#mainmenu .navbar-header,
+#mainmenu .navbar-nav,
+#mainmenu .navbar-form {
padding-top: 8px;
}
#mainmenu .badgemenu {
padding-top: 0;
- margin-right: -50px; /* Any order columns */
+ /* Any order columns */
+ margin-right: -50px;
}
/* PROFILE PAGE */
@@ -407,6 +441,7 @@ select#bottom_language_selector {
#comments blockquote {
color: #789922;
}
+
#comments blockquote:before {
content: ">";
}
@@ -418,7 +453,9 @@ select#bottom_language_selector {
}
.proSeedBar {
- width:100%; height: 0.5rem; overflow: hidden;
+ width: 100%;
+ height: 0.5rem;
+ overflow: hidden;
}
.proSeedBar .seeds {
@@ -436,7 +473,8 @@ select#bottom_language_selector {
.comment-date {
font-size: smaller;
- width: auto; /* Undo bootstrap's fixed width */
+ /* Undo bootstrap's fixed width */
+ width: auto;
}
.text-error {
@@ -444,7 +482,6 @@ select#bottom_language_selector {
}
/* Wordbreak fix*/
-
.break {
word-break: break-all;
hyphens: auto;
@@ -463,7 +500,6 @@ select#bottom_language_selector {
}
/*Comments*/
-
.commentList::before,
.commentList::after {
content: "";
@@ -516,7 +552,7 @@ select#bottom_language_selector {
height: 2.2em;
}
-.commentList ul.comments ul{
+.commentList ul.comments ul {
list-style-type: none;
padding: 0;
margin-left: 85px;
@@ -536,7 +572,7 @@ select#bottom_language_selector {
margin-left: 12%;
}
-@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
+@media only screen and (min-device-width: 320px) and (max-device-width: 480px) {
.comment {
width: 100%;
@@ -545,42 +581,54 @@ select#bottom_language_selector {
}
@media (max-width: 995px) {
+
.navbar-header {
float: none;
}
- .navbar-left,.navbar-right {
+
+ .navbar-left,
+ .navbar-right {
float: none !important;
}
+
.navbar-toggle {
display: block;
}
+
.navbar-collapse {
border-top: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
}
+
.navbar-fixed-top {
top: 0;
border-width: 0 0 1px;
}
+
.navbar-collapse.collapse {
display: none!important;
}
+
.navbar-nav {
float: none!important;
margin-top: 7.5px;
}
- .navbar-nav>li {
+
+ .navbar-nav > li {
float: none;
}
- .navbar-nav>li>a {
+
+ .navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 10px;
}
- .collapse.in{
- display:block !important;
+ .collapse.in {
+ display: block !important;
}
}
+
@media (max-width: 1500px) {
+
#mascot {
display: none;
}
diff --git a/templates/_user_list_torrents.html b/templates/_user_list_torrents.html
index 0861b3f2..b2feb40f 100644
--- a/templates/_user_list_torrents.html
+++ b/templates/_user_list_torrents.html
@@ -33,7 +33,13 @@
| {{.Date}} |
- {{.Filesize}} |
+
+ {{if ne .Filesize "Unknown"}}
+ {{.Filesize}}
+ {{else}}
+ {{ call $.T "unknown"}}
+ {{end}}
+ |
diff --git a/templates/home.html b/templates/home.html
index 26bc746b..d4042bdc 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -73,7 +73,13 @@ Your browser does not support the audio element.
|
{{end}}
{{.Date}} |
- {{.Filesize}} |
+
+ {{if ne .Filesize "Unknown"}}
+ {{.Filesize}}
+ {{else}}
+ {{ call $.T "unknown"}}
+ {{end}}
+ |
diff --git a/templates/view.html b/templates/view.html
index 126ad93a..fc46858e 100644
--- a/templates/view.html
+++ b/templates/view.html
@@ -70,8 +70,14 @@
{{call $.T "date"}}
{{.Date}}
- {{call $.T "size"}}
- {{.Filesize}}
+ {{ call $.T "size"}}
+
+ {{if ne .Filesize "Unknown"}}
+ {{.Filesize}}
+ {{else}}
+ {{ call $.T "unknown"}}
+ {{end}}
+
{{if ne .WebsiteLink ""}}
{{call $.T "link"}}
@@ -93,7 +99,7 @@
{{else}}
{{.Seeders}}
{{.Leechers}}
- {{.Completed}}
+ {{.Completed}}
{{end}}
diff --git a/translations/en-us.all.json b/translations/en-us.all.json
index b8aebc13..9a9a77ff 100644
--- a/translations/en-us.all.json
+++ b/translations/en-us.all.json
@@ -479,6 +479,10 @@
"id": "art_manga",
"translation": "Art - Manga"
},
+ {
+ "id": "art_pictures",
+ "translation": "Art - Pictures"
+ },
{
"id": "real_life",
"translation": "Real Life"
diff --git a/translations/ru-ru.all.json b/translations/ru-ru.all.json
index 04b39657..936260bb 100644
--- a/translations/ru-ru.all.json
+++ b/translations/ru-ru.all.json
@@ -69,7 +69,7 @@
},
{
"id": "terms_conditions_full",
- "translation": "Некоторое дерьмо."
+ "translation": "Здесь будет магия и дружба."
},
{
"id": "remember_me",
@@ -117,7 +117,7 @@
},
{
"id": "follow",
- "translation": "Следить"
+ "translation": "Подписаться"
},
{
"id": "unfollow",
@@ -125,7 +125,7 @@
},
{
"id": "user_followed_msg",
- "translation": "Вы отслеживаете %s!"
+ "translation": "Вы подписались на %s!"
},
{
"id": "user_unfollowed_msg",
@@ -137,7 +137,7 @@
},
{
"id": "see_more_torrents_from",
- "translation": "Смотреть другие торренты %s "
+ "translation": "Посмотреть другие торренты %s "
},
{
"id": "category",
@@ -179,9 +179,13 @@
"id": "faq",
"translation": "FAQ"
},
+ {
+ "id": "fun",
+ "translation": "Fun"
+ },
{
"id": "fap",
- "translation": "Фап"
+ "translation": "Fap"
},
{
"id": "advanced_search",
@@ -209,7 +213,7 @@
},
{
"id": "member",
- "translation": "Членство"
+ "translation": "Пользователь"
},
{
"id": "sign_in",
@@ -225,7 +229,7 @@
},
{
"id": "notice_keep_seeding",
- "translation": "УВЕДОМЛЕНИЕ: УДЕРЖИВАЙ РАЗДАЧУ И ВКЛЮЧАЙ DHT ТЫ ТОРМОЗ"
+ "translation": "ОСТАВАЙТЕСЬ НА РАЗДАЧЕ И ВКЛЮЧИТЕ DHT!"
},
{
"id": "official_nyaapocalipse_faq",
@@ -257,7 +261,7 @@
},
{
"id": "is_everything_lost",
- "translation": "Все потеряно?"
+ "translation": "Все пропало?"
},
{
"id": "in_short_no",
@@ -265,7 +269,7 @@
},
{
"id": "are_some_things_lost",
- "translation": "Некоторые вещи потеряны?"
+ "translation": "Что-нибудь все же потерялось?"
},
{
"id": "answer_is_nyaa_db_lost",
@@ -277,7 +281,7 @@
},
{
"id": "how_are_we_recovering",
- "translation": "Как мы выздоравливаем?"
+ "translation": "Как идет процесс восстановления?"
},
{
"id": "answer_how_are_we_recovering",
@@ -317,11 +321,7 @@
},
{
"id": "answer_which_trackers_do_you_recommend",
- "translation": "Если ваша торрент-загрузка запрещена из-за трекеров, вам нужно добавить некоторые из них:"
- },
- {
- "id": "other_trackers",
- "translation": "Но тебе стоит еще добавить эти, просто на случай, если что-то пойдет не так"
+ "translation": "У нас теперь появился свой собственный трекер doko.moe, добавьте его наверх списка перед загрузкой. Вам стоит еще добавить эти, просто на случай, если что-то пойдет не так."
},
{
"id": "how_can_i_help",
@@ -337,7 +337,7 @@
},
{
"id": "why_written_in_go",
- "translation": "Почему ваше дерьмо написано на Go?"
+ "translation": "Почему это дерьмо написано на Go?"
},
{
"id": "authors_favorite_language",
@@ -459,6 +459,42 @@
"id": "software_games",
"translation": "Софт - Игры"
},
+ {
+ "id": "art",
+ "translation": "Арт"
+ },
+ {
+ "id": "art_anime",
+ "translation": "Арт - Аниме"
+ },
+ {
+ "id": "art_doujinshi",
+ "translation": "Арт - Додзинси"
+ },
+ {
+ "id": "art_games",
+ "translation": "Арт - Игры"
+ },
+ {
+ "id": "art_manga",
+ "translation": "Арт - Манга"
+ },
+ {
+ "id": "art_pictures",
+ "translation": "Арт - Картинки"
+ },
+ {
+ "id": "real_life",
+ "translation": "Real Life"
+ },
+ {
+ "id": "real_life_photobooks_and_pictures",
+ "translation": "Real Life - Фотокниги и картинки"
+ },
+ {
+ "id": "real_life_videos",
+ "translation": "Real Life - Видео"
+ },
{
"id": "torrent_description",
"translation": "Описание торрента"
@@ -517,7 +553,7 @@
},
{
"id": "submit_a_comment_as_anonymous",
- "translation": "Отправить комментарий как Анонимный"
+ "translation": "Отправить анонимный комментарий"
},
{
"id": "submit",
@@ -541,7 +577,7 @@
},
{
"id": "banned",
- "translation": "Banned"
+ "translation": "Забанен"
},
{
"id": "default",
@@ -647,6 +683,14 @@
"id": "delete",
"translation": "Удалить"
},
+ {
+ "id": "files",
+ "translation": "Файлы"
+ },
+ {
+ "id": "filename",
+ "translation": "Имя файла"
+ },
{
"id": "uploaded_by",
"translation": "Загрузил"
@@ -698,5 +742,25 @@
{
"id": "cancel",
"translation": "Отменить"
+ },
+ {
+ "id": "please_include_our_tracker",
+ "translation": "Пожалуйста добавьте udp://tracker.doko.moe:6969 в список трекеров."
+ },
+ {
+ "id": "unknown",
+ "translation": "Неизвестно"
+ },
+ {
+ "id": "last_scraped",
+ "translation": "Обновлялось в: "
+ },
+ {
+ "id": "server_status_link",
+ "translation": "Узнать о состоянии сервера можно здесь"
+ },
+ {
+ "id": "no_database_dumps_available",
+ "translation": "Сейчас нет доступных дампов базы"
}
]
|