diff --git a/js/toggle-images.js b/js/toggle-images.js index c3636d29..56f7d692 100644 --- a/js/toggle-images.js +++ b/js/toggle-images.js @@ -74,10 +74,10 @@ $(document).ready(function(){ .on(event, function() { hide_images = !hide_images; if (hide_images) { - $('img.post-image, .theme-catalog .thread>a>img').each(hideImage); + $('img.post-image, .theme-catalog .thread>a>img, img.banner, img.board_image').each(hideImage); localStorage.hideimages = true; } else { - $('img.post-image, .theme-catalog .thread>a>img').each(restoreImage); + $('img.post-image, .theme-catalog .thread>a>img, img.banner, img.board_image').each(restoreImage); delete localStorage.hideimages; } @@ -87,7 +87,7 @@ $(document).ready(function(){ }); if (hide_images) { - $('img.post-image, .theme-catalog .thread>a>img').each(hideImage); + $('img.post-image, .theme-catalog .thread>a>img, img.banner, img.board_image').each(hideImage); show_hide_hide_images_buttons(); if (window.Options && Options.get_tab('general')) { diff --git a/stylesheets/img/testorange_f_bg.gif b/stylesheets/img/orange_f_bg.gif similarity index 100% rename from stylesheets/img/testorange_f_bg.gif rename to stylesheets/img/orange_f_bg.gif diff --git a/stylesheets/img/testorange_textarea_bg.gif b/stylesheets/img/orange_textarea_bg.gif similarity index 100% rename from stylesheets/img/testorange_textarea_bg.gif rename to stylesheets/img/orange_textarea_bg.gif diff --git a/stylesheets/img/testorange_testo.png b/stylesheets/img/testorange_testo.png deleted file mode 100644 index f173873a..00000000 Binary files a/stylesheets/img/testorange_testo.png and /dev/null differ diff --git a/stylesheets/testorange.css b/stylesheets/orange.css similarity index 84% rename from stylesheets/testorange.css rename to stylesheets/orange.css index 44ebd697..16f37330 100644 --- a/stylesheets/testorange.css +++ b/stylesheets/orange.css @@ -1,4 +1,4 @@ -/* +piwnichan style, based on testorange.css from Karachan */ +/* +piwnichan style, based on orange.css from Karachan */ body { font-family: sans-serif; @@ -6,19 +6,19 @@ body { color:#bebebe; background-color: #1e1e1e; - background-image: url('img/testorange_testo.png'), url('img/testorange_top_bg.png'), url('img/testorange_bg.png'); - background-repeat: no-repeat, repeat-x, repeat; - background-attachment: fixed, scroll, scroll; - background-position: right bottom, 0% 0%, 0% 0%; + background-image: url('img/orange_top_bg.png'), url('img/orange_bg.png'); + background-repeat: repeat-x, repeat; + background-attachment: scroll, scroll; + background-position: 0% 0%, 0% 0%; } .desktop-style .bl-menu{ -background-image: url('img/testorange_bg.png'); +background-image: url('img/orange_bg.png'); background-repeat: repeat; } .boardlist .board a { -background-image: url('img/testorange_bg.png'); +background-image: url('img/orange_bg.png'); background-repeat: repeat; } @@ -46,7 +46,7 @@ input { background: #fff; } textarea { - background: #dedede url('img/testorange_textarea_bg.gif') repeat-x; + background: #dedede url('img/orange_textarea_bg.gif') repeat-x; } input, textarea { border: 1px #fff solid; @@ -180,7 +180,7 @@ div.post.reply { color: #bebebe; } form table th, div.banner, div.pages, .replymode, .postblock, .passvalid, .catalogmode { - background: #ff9100 url('img/testorange_f_bg.gif') repeat-x !important; + background: #ff9100 url('img/orange_f_bg.gif') repeat-x !important; } div.pages, div.pages a { color: black; diff --git a/stylesheets/style.css b/stylesheets/style.css index eb83e581..e4662173 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -988,17 +988,7 @@ div.boardlist a { /* Threads */ /* Thread Footer */ -#thread-interactions-alt { - margin: 8px 0; - clear: both; -} -#thread-links-alt { - float: left; -} -#thread-links-alt > a { - padding-left: none; - padding-right: 10px; -} + #thread-interactions { margin: 8px 0; clear: both; diff --git a/templates/main.js b/templates/main.js index c2a6f6c0..c2da6b2f 100644 --- a/templates/main.js +++ b/templates/main.js @@ -1,4 +1,10 @@ {% raw %} +/* + * main.js - This file is compiled and contains code from the following scripts, concatenated together in order: + * {% endraw %}{{ config.additional_javascript|join(', ') }}{% raw %} + * Please see those files for licensing and authorship information. + * Compiled on {% endraw %}{{ time()|date("%c") }}{% raw %} + */ /* gettext-compatible _ function, example of usage: * @@ -390,6 +396,9 @@ function ready() { var post_date = "{{ config.post_date }}"; var max_images = {{ config.max_images }}; +if (typeof active_page === "undefined") { + active_page = "page"; +} onready(init);