From 65772d86540099e5547f5daba723de4bc386d558 Mon Sep 17 00:00:00 2001 From: kilo Date: Tue, 12 Sep 2017 15:03:26 +0200 Subject: [PATCH] rollback the rollback (#1554) * rollback the rollback * fix classic.css padding * remove tag * Update torrents.jet.html * Fix html tag * fix footer & ad showing over the TOS * move setting & add it's explanation * Update en-us.all.json * include nav in listing directly instead of refine * Update search.jet.html * remove now useless css rules * Update main.css * Update base.jet.html * exclude old navigation cookie from deletion * add torrent uploaded total size to user profile --- public/css/classic.css | 74 +++++++++---------- public/css/main.css | 20 +---- public/js/main.js | 2 +- templates/layouts/partials/base.jet.html | 4 +- .../layouts/partials/helpers/search.jet.html | 6 +- .../layouts/partials/menu/profile.jet.html | 6 ++ templates/site/torrents/listing.jet.html | 3 + templates/site/torrents/view.jet.html | 2 +- templates/site/user/public/settings.jet.html | 19 ++--- templates/site/user/torrents.jet.html | 5 +- templates/template_functions.go | 22 ++++-- translations/en-us.all.json | 4 +- 12 files changed, 81 insertions(+), 86 deletions(-) diff --git a/public/css/classic.css b/public/css/classic.css index f1b1677f..cd862358 100644 --- a/public/css/classic.css +++ b/public/css/classic.css @@ -64,7 +64,7 @@ th.tr-name a { text-align: right; } .tr-links .icon-magnet::before { - margin-right: 2px; + margin-right: 2px; } .tr-links a { display: block; @@ -75,7 +75,7 @@ th.tr-name a { .comment-count { display: inline!important; - font-weight: bold; + font-weight: bold; } .tr-cs a{ display: none; @@ -195,45 +195,45 @@ select.form-input { color: #FBFBFB; } .website-nav .pagination p { - display: none; + display: none; } .website-nav { - padding-bottom: 4px!important; + padding-bottom: 4px!important; padding-top: 4px!important; } .website-nav .pagination { - padding: .5rem; - font-size: 1em; + padding: .5rem; + font-size: 1em; } .website-nav .pagination a { - display: inline!important; + display: inline!important; } .website-nav .pagination span { - min-width: auto; + min-width: auto; } .website-nav #page-prev{ - float: left; + float: left; } .website-nav #page-next{ - float: right; + float: right; } #description-box code { - font-size: 1.3em; + font-size: 1.3em; } .user-form input[type="text"],.user-form input[type="email"],.user-form input[type="password"] { - width: 173px; + width: 173px; } .user-form input.form-control { - width: 100%; + width: 100%; } .user-form h2 { - font-size: 0.9em; + font-size: 0.9em; } .user-form .input-label { - font-size: 1em; + font-size: 1em; } .results.box { @@ -255,23 +255,23 @@ select.form-input { } span.comment-index+p { - margin-top: 0; + margin-top: 0; } span.comment-index+p a { - font-weight: bold; + font-weight: bold; padding-top: 2px; font-size: .9em; - color: black; - text-decoration: none; + color: black; + text-decoration: none; line-height: 22px; } span.comment-index+p a:hover { - text-decoration: underline; + text-decoration: underline; } .comment-index { - margin: 3px 0 0 0; + margin: 3px 0 0 0; } #solution { @@ -279,29 +279,29 @@ span.comment-index+p a:hover { } .comment-index a::before { - content: ''; + content: ''; } .comment-index a { - font-weight: bold; - color: black; + font-weight: bold; + color: black; float: right; margin-left: 9px; } .comment-index a:hover { - color: #44A0A0; + color: #44A0A0; } .comment-submit { - border: none; - background: none; + border: none; + background: none; margin-top: 15px!important; } .comment-submit .comment-form { - margin: 0; + margin: 0; } .comment-form h3 { - margin-top: 20px; + margin-top: 20px; } .comment-submit textarea{ @@ -334,11 +334,11 @@ span.comment-index+p a:hover { font-style: italic; } .torrent-info-data.uploader-link a, .torrent-info-data.uploader-anon a{ - color: green; + color: green; } #torrent-description-hr { - margin-top: 40px; + margin-top: 40px; } .comment-submit h3 { @@ -389,18 +389,18 @@ span.comment-index+p a:hover { text-decoration: none; } .torrent-buttons div { - margin-right: 0!important; + margin-right: 0!important; } .torrent-buttons [class*="icon-"]::before { display: none; } #comments { - margin-bottom: 15px; + margin-bottom: 15px; } #no-comment-message { - font-size: .9em; + font-size: .9em; } th, th a { @@ -497,13 +497,9 @@ a.nav-btn.log-in { .box.refine { border-radius: 4px 4px 0 0; border-bottom: none; - display:block!important; padding: 8px; padding-bottom: 11px; } -.box.refine.refine-not-search { - display: none!important; -} .refine h3 { display: none; @@ -536,7 +532,7 @@ a.nav-btn.log-in { display: none!important; } .box.profile-panel { - border-right: none; + border-right: none; } .profile-panel .btn-green { min-height: 22px; diff --git a/public/css/main.css b/public/css/main.css index 16a2c776..66589ebf 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -644,7 +644,7 @@ textarea { text-align: center; padding: 1rem 0 1.2rem 0; position: relative; - z-index: 2; + z-index: 1; } .footer-opt { @@ -1906,26 +1906,12 @@ span.tag { display: none; } -#ad-container { - z-index: 4; - position: relative; - padding: 0 5%; - max-height: 93px; - overflow: hidden; - display: block!important; -} -#ad-container * { - width: 728px; +iframe { max-width: 100%; + width: 728px; height: 90px; border: none; overflow: hidden; - display: block; -} -#ad-blocked { - height: 62px; - border: 1px solid; - border-radius: 10px; } #admin-header { diff --git a/public/js/main.js b/public/js/main.js index 46e76d38..151a4950 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -87,7 +87,7 @@ parseAllDates() //called if no Commit cookie is set or if the website has a newer commit than the one in cookie function resetCookies() { var cookies = document.cookie.split(";") - var excludedCookies = ["mascot", "theme", "theme2", "mascot_url", "lang", "csrf_token", "altColors", "EU_Cookie"] + var excludedCookies = ["mascot", "theme", "theme2", "mascot_url", "lang", "csrf_token", "altColors", "EU_Cookie", "oldNav"] //Remove all cookies but exclude those in the above array for (var i = 0; i < cookies.length; i++) { diff --git a/templates/layouts/partials/base.jet.html b/templates/layouts/partials/base.jet.html index c0d26abc..57e1d887 100644 --- a/templates/layouts/partials/base.jet.html +++ b/templates/layouts/partials/base.jet.html @@ -80,11 +80,9 @@ {{end}} -
{{ adId = Sukebei() ? 634159 : 634157 }} -
+