From 2adf7d99db1ef22ef37e517e64f511495e6c83c4 Mon Sep 17 00:00:00 2001 From: czaks Date: Wed, 30 Apr 2014 00:13:04 +0200 Subject: [PATCH] integrate favelog into catalog theme; needs more work, code cleanup etc. --- .../favelog/favelog.js => js/catalog.js | 0 .../favelog => js}/jquery.mixitup.min.js | 0 .../favelog => js}/jquery.tooltipster.min.js | 0 stylesheets/style.css | 39 +++++ .../tooltipster}/tooltipster.css | 0 templates/themes/catalog/catalog.html | 61 ++++++-- templates/themes/catalog/info.php | 11 +- templates/themes/catalog/theme.php | 11 +- templates/themes/favelog/catalog.css | 75 ---------- templates/themes/favelog/catalog.html | 79 ----------- templates/themes/favelog/info.php | 58 -------- templates/themes/favelog/theme.php | 133 ------------------ templates/themes/favelog/thumb.png | Bin 11543 -> 0 bytes 13 files changed, 106 insertions(+), 361 deletions(-) rename templates/themes/favelog/favelog.js => js/catalog.js (100%) rename {templates/themes/favelog => js}/jquery.mixitup.min.js (100%) rename {templates/themes/favelog => js}/jquery.tooltipster.min.js (100%) rename {templates/themes/favelog => stylesheets/tooltipster}/tooltipster.css (100%) delete mode 100644 templates/themes/favelog/catalog.css delete mode 100644 templates/themes/favelog/catalog.html delete mode 100644 templates/themes/favelog/info.php delete mode 100644 templates/themes/favelog/theme.php delete mode 100644 templates/themes/favelog/thumb.png diff --git a/templates/themes/favelog/favelog.js b/js/catalog.js similarity index 100% rename from templates/themes/favelog/favelog.js rename to js/catalog.js diff --git a/templates/themes/favelog/jquery.mixitup.min.js b/js/jquery.mixitup.min.js similarity index 100% rename from templates/themes/favelog/jquery.mixitup.min.js rename to js/jquery.mixitup.min.js diff --git a/templates/themes/favelog/jquery.tooltipster.min.js b/js/jquery.tooltipster.min.js similarity index 100% rename from templates/themes/favelog/jquery.tooltipster.min.js rename to js/jquery.tooltipster.min.js diff --git a/stylesheets/style.css b/stylesheets/style.css index df873e68..ea575e55 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -519,6 +519,45 @@ form.ban-appeal textarea { .theme-catalog div.thread strong { display: block; } +.theme-catalog div.threads{ + text-align: center; + margin-left: -20px; +} + +.theme-catalog div.grid-size-small { + width: 200px; + max-width: 200px; + max-height: 350px; +} + +.theme-catalog div.grid-size-large { + width: 300px; + max-width: 300px; + max-height: 450px; +} + +.theme-catalog img.thread-image { + height: auto; + max-width: 100%; +} + +@media (max-width: 420px) { + .theme-catalog ul#Grid { + padding-left: 18px; + } + .theme-catalog div.thread { + width: auto; + margin-left: 0; + margin-right: 0; + + } + .theme-catalog div.threads { + overflow: hidden; + } +} + +@include url("tooltipster/tooltipster.css"); + .compact-boardlist { padding: 3px; padding-bottom: 0px; diff --git a/templates/themes/favelog/tooltipster.css b/stylesheets/tooltipster/tooltipster.css similarity index 100% rename from templates/themes/favelog/tooltipster.css rename to stylesheets/tooltipster/tooltipster.css diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html index 3bfd3e23..1df38287 100644 --- a/templates/themes/catalog/catalog.html +++ b/templates/themes/catalog/catalog.html @@ -5,6 +5,12 @@ {% include 'header.html' %} {{ settings.title }} @@ -15,20 +21,47 @@

{{ settings.title }} (/{{ board }}/)

{{ settings.subtitle }}
-
- + + + {% trans 'Sort by' %}: + + + {% trans 'Image size' %}: + +
+ +