From 7cac637c36781db19f7b314ad0131232bfa1409b Mon Sep 17 00:00:00 2001 From: TheHowl Date: Wed, 24 Sep 2014 23:07:36 +0200 Subject: [PATCH 01/15] oh hey look I just fixed #8 search.php It was just a typo, an horrible typo. --- search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search.php b/search.php index 394aa3ff..71f4ae5e 100644 --- a/search.php +++ b/search.php @@ -15,7 +15,7 @@ $boards = listBoards(TRUE); } - $body = Element('search_form.html', Array('boards' => $boards, 'board' => isset($_GET['board']) ? $_GET['board'] : false, 'search' => isset($_GET['search']) ? str_replace('"', '"', utf8tohtml($_GET['search'])) : false)); + $body = Element('search_form.html', Array('boards' => $boards, 'b' => isset($_GET['board']) ? $_GET['board'] : false, 'search' => isset($_GET['search']) ? str_replace('"', '"', utf8tohtml($_GET['search'])) : false)); if(isset($_GET['search']) && !empty($_GET['search']) && isset($_GET['board']) && in_array($_GET['board'], $boards)) { $phrase = $_GET['search']; From 5d8d20fcc5c8a2364d51158813f439eff4de3cc8 Mon Sep 17 00:00:00 2001 From: 8chan Date: Wed, 24 Sep 2014 21:29:12 +0000 Subject: [PATCH 02/15] Add timer to auto reload js Conflicts: js/auto-reload.js --- js/auto-reload.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/js/auto-reload.js b/js/auto-reload.js index 4a872024..886f32e6 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -8,6 +8,7 @@ * Copyright (c) 2012 Michael Save * Copyright (c) 2013-2014 Marcin Łabanowski * Copyright (c) 2013 undido + * Copyright (c) 2014 Fredrick Brennan * * Usage: * $config['additional_javascript'][] = 'js/jquery.min.js'; @@ -27,6 +28,8 @@ $(document).ready(function(){ var poll_interval; + // Add an update link + $('.boardlist.bottom').prev().after("["+_("Update thread")+"] ()"); // Grab the settings var settings = new script_settings('auto-reload'); @@ -37,6 +40,7 @@ $(document).ready(function(){ // number of ms to wait before reloading var poll_interval_delay = poll_interval_mindelay_bottom; + var poll_current_time = poll_interval_delay; var end_of_page = false; @@ -68,6 +72,14 @@ $(document).ready(function(){ window_active = false; }); + var timer_update = function() { + $('#update_secs').text(poll_current_time/1000); + } + + var decrement_timer = function() { + poll_current_time = poll_current_time - 1000; + } + var recheck_activated = function() { if (new_posts && window_active && $(window).scrollTop() + $(window).height() >= @@ -115,6 +127,7 @@ $(document).ready(function(){ } poll_interval = setTimeout(poll, poll_interval_delay); + poll_current_time = poll_interval_delay; }; $(window).scroll(function() { @@ -128,9 +141,15 @@ $(document).ready(function(){ clearTimeout(poll_interval); poll_interval = setTimeout(poll, poll_interval_shortdelay); + poll_current_time = poll_interval_shortdelay; end_of_page = true; }).trigger('scroll'); - poll_interval = setTimeout(poll, poll_interval_delay); + $('#update_thread').on('click', poll); + setInterval(timer_update, 1000); + setInterval(decrement_timer, 1000); + + poll_interval = setInterval(poll, poll_interval_delay); + timer_update(); }); From ed5272f17d22be01770361c3950fe5fbc32cfb7f Mon Sep 17 00:00:00 2001 From: czaks Date: Thu, 25 Sep 2014 06:31:40 +0200 Subject: [PATCH 03/15] auto-reload.js: don`t scroll up --- js/auto-reload.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/auto-reload.js b/js/auto-reload.js index 886f32e6..1f4d11fe 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -128,6 +128,8 @@ $(document).ready(function(){ poll_interval = setTimeout(poll, poll_interval_delay); poll_current_time = poll_interval_delay; + + return false; }; $(window).scroll(function() { From dbaeb395acf6ad1e95f7623c2853d9d702920bb5 Mon Sep 17 00:00:00 2001 From: czaks Date: Thu, 25 Sep 2014 06:32:53 +0200 Subject: [PATCH 04/15] auto-reload.js: it`s actually setTimeout, not setInterval, right? --- js/auto-reload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/auto-reload.js b/js/auto-reload.js index 1f4d11fe..87e332df 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -151,7 +151,7 @@ $(document).ready(function(){ setInterval(timer_update, 1000); setInterval(decrement_timer, 1000); - poll_interval = setInterval(poll, poll_interval_delay); + poll_interval = setTimeout(poll, poll_interval_delay); timer_update(); }); From e81d016ffac5a5e7f73a9aafe35a221397b51a51 Mon Sep 17 00:00:00 2001 From: 8chan Date: Sat, 19 Apr 2014 20:02:39 +0000 Subject: [PATCH 05/15] Attempt to fix scroll to anchor issue --- templates/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/main.js b/templates/main.js index 97f1135f..9286d201 100644 --- a/templates/main.js +++ b/templates/main.js @@ -154,6 +154,7 @@ function highlightReply(id) { var post = document.getElementById('reply_'+id); if (post) post.className += ' highlighted'; + window.location.hash = id; } return true; } From f71cdcaa812353ff7ca8414adec9dbecc1dcf1a6 Mon Sep 17 00:00:00 2001 From: Zealotux Date: Fri, 26 Sep 2014 02:19:49 +0200 Subject: [PATCH 06/15] Update style.css Added "cursor" to "options_tab_icon" according to https://github.com/ctrlcctrlv/8chan/issues/80 --- stylesheets/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/stylesheets/style.css b/stylesheets/style.css index eea2fb0d..2ac1f180 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -685,6 +685,7 @@ form.ban-appeal textarea { .options_tab_icon { padding: 5px; color: black; + cursor: pointer; } .options_tab_icon.active { color: red; From ba515c5f0519ae89b0876e4291061ecf2ffa6967 Mon Sep 17 00:00:00 2001 From: czaks Date: Fri, 26 Sep 2014 12:56:05 +0200 Subject: [PATCH 07/15] post-hover.js: show a popup preview if a reply is only partially on screen; fixes ctrlcctrlv#84 --- js/post-hover.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index 2808b8e7..0becfb70 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -58,8 +58,8 @@ onready(function(){ // link links to itself or to op; ignore } else if($post.is(':visible') && - $post.offset().top + $post.height() >= $(window).scrollTop() && - $post.offset().top <= $(window).scrollTop() + $(window).height()) { + $post.offset().top >= $(window).scrollTop() && + $post.offset().top + $post.height() <= $(window).scrollTop() + $(window).height()) { // post is in view $post.addClass('highlighted'); } else { From b888500133bcf40f2030754075bbd1b3a7a1f9b7 Mon Sep 17 00:00:00 2001 From: kaernyk Date: Fri, 26 Sep 2014 05:06:45 -0400 Subject: [PATCH 08/15] Corrected thread padding via style.css Conflicts: stylesheets/style.css --- stylesheets/style.css | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/stylesheets/style.css b/stylesheets/style.css index eea2fb0d..dbd3a11d 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -7,25 +7,33 @@ body { padding-left: 5px; padding-right: 5px; } + table * { margin: 0; } + a, a:visited { text-decoration: underline; color: #34345C; } + a:hover, p.intro a.post_no:hover { color: #ff0000; } + a.post_no { text-decoration: none; margin: 0; padding: 0; } + p.intro a.post_no { color: inherit; } -p.intro a.post_no, p.intro a.email, p.intro a.post_anchor { + +p.intro a.post_no, +p.intro a.email, +p.intro a.post_anchor { margin: 0; } p.intro a.email span.name { @@ -502,7 +510,6 @@ form.ban-appeal textarea { .theme-catalog div.thread img { float:none!important; margin: auto; - margin-bottom: 12px; max-height: 150px; max-width: 200px; box-shadow: 0 0 4px rgba(0, 0, 0, 0.55); @@ -520,7 +527,7 @@ form.ban-appeal textarea { overflow:hidden; position: relative; font-size:11px; - padding: 15px; + padding:5px; max-height:300px; background: rgba(182, 182, 182, 0.12); border: 2px solid rgba(111, 111, 111, 0.34); @@ -714,3 +721,6 @@ form.ban-appeal textarea { height: 100%; margin-top: 0px; } +.mentioned { + word-wrap: break-word; +} From e5ce012a091a9b56059595e8b0b2b8fd904c228a Mon Sep 17 00:00:00 2001 From: kaernyk Date: Fri, 26 Sep 2014 04:41:32 -0400 Subject: [PATCH 09/15] Adjust theme via catalog.css & style.css Changes to catalog.css: - Forced all threads to a height of 300px and reduced padding to improve consistency. I think it improves the readability quite a bit but I may be alone in thinking this way. - Changes to style.css: - Removed additional padding to allow new catalog spacing Conflicts: stylesheets/style.css --- stylesheets/catalog.css | 26 ++++++++++++-------------- stylesheets/style.css | 28 ++++++++++++++++++---------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/stylesheets/catalog.css b/stylesheets/catalog.css index 29ff4cbf..b4ec6f55 100644 --- a/stylesheets/catalog.css +++ b/stylesheets/catalog.css @@ -20,26 +20,24 @@ div.threads{ } div.thread { - display: inline-block; + position: relative; vertical-align: top; - margin-bottom:25px; - margin-left: 20px; - margin-right: 15px; - text-align:center; - font-weight:normal; - width:205px; + display: inline-block; overflow:hidden; - position: relative; + margin:2px; + padding: 2px; + height:300px; + width:205px; font-size:11px; - padding: 15px; + font-weight:normal; + text-align:center; background: rgba(182, 182, 182, 0.12); border: 2px solid rgba(111, 111, 111, 0.34); - max-height:300px; } -div.thread:hover { - background: #D6DAF0; - border-color: #B7C5D9; +div.threads:hover { + background: #D6DAF0; + border-color: #B7C5D9; } div.grid-size-small { @@ -70,6 +68,6 @@ img.thread-image { } div.threads { - overflow: hidden; + overflow: hidden; } } \ No newline at end of file diff --git a/stylesheets/style.css b/stylesheets/style.css index dbd3a11d..80ed6e2b 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -222,7 +222,8 @@ div.post.reply div.body a { color: #D00; } div.post { - max-width: 97%; + max-width: 95%; + padding-left:20px; } div.post div.body { word-wrap: break-word; @@ -518,16 +519,12 @@ form.ban-appeal textarea { .theme-catalog div.thread { display: inline-block; vertical-align: top; - margin-bottom:25px; - margin-left: 20px; - margin-right: 15px; text-align:center; font-weight:normal; - width:205px; + width:205px; overflow:hidden; position: relative; font-size:11px; - padding:5px; max-height:300px; background: rgba(182, 182, 182, 0.12); border: 2px solid rgba(111, 111, 111, 0.34); @@ -549,19 +546,19 @@ form.ban-appeal textarea { width: 100px; max-width: 100px; max-height: 150px; -} +} .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; @@ -669,7 +666,7 @@ form.ban-appeal textarea { background-color: #d6daf0; border: 1px solid black; display: inline-block; - position: relative; + position: relative; margin-top: 20px; width: 600px; height: 300px; @@ -724,3 +721,14 @@ form.ban-appeal textarea { .mentioned { word-wrap: break-word; } + + +code > pre { +/* Better code tags */ + background:black; + max-width:inherit; +} + +code > pre > span.pln { + color:grey; +} From b7592c3eecd5346851cfc0b1450e4a3c3b6bb543 Mon Sep 17 00:00:00 2001 From: Nebs Date: Fri, 26 Sep 2014 00:30:23 -0500 Subject: [PATCH 10/15] Fixed unanimating gifs in the catalog --- js/no-animated-gif.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/no-animated-gif.js b/js/no-animated-gif.js index 7e777d87..45a55f97 100644 --- a/js/no-animated-gif.js +++ b/js/no-animated-gif.js @@ -13,7 +13,10 @@ */ function unanimate_gif(e) { - var c = $(''); + if (active_page === "catalog") + var c = $(''); + else + var c = $(''); $(e).parent().prepend(c); c.attr('width', $(e).width()); c.attr('height',$(e).height()); @@ -32,7 +35,7 @@ function unanimate_gif(e) { } function no_animated_gif() { - var anim_gifs = $('img.post-image[src$=".gif"]'); + var anim_gifs = $('img.post-image[src$=".gif"], img.thread-image[src$=".gif"]'); localStorage.no_animated_gif = true; $('#no-animated-gif>a').text(_('Animate GIFs')); $('#no-animated-gif>input').prop('checked', true); @@ -48,7 +51,7 @@ function animated_gif() { $('#no-animated-gif>input').prop('checked', false); } -if (active_page == 'thread' || active_page == 'index' || active_page == 'ukko') { +if (active_page == 'thread' || active_page == 'index' || active_page == 'ukko' || active_page == 'catalog') { $(function(){ var selector, event; if (window.Options && Options.get_tab('general')) { From ab2a83d194eb7bfd2fe82942333fe55cb4cb4c16 Mon Sep 17 00:00:00 2001 From: Nebs Date: Thu, 25 Sep 2014 18:27:39 -0500 Subject: [PATCH 11/15] Fixes catalog href on a potential /res/ board --- js/catalog-link.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/catalog-link.js b/js/catalog-link.js index 899e6859..5c5d9b13 100644 --- a/js/catalog-link.js +++ b/js/catalog-link.js @@ -16,11 +16,11 @@ function catalog() { var board = $("input[name='board']"); if (board.length>0) { -if (window.location.href.indexOf("/res/")==-1){ //if we are inside a thread -var catalog_url = 'catalog.html'; +if (window.location.pathname.indexOf("/res/")>0){ //if we are inside a thread +var catalog_url = '../catalog.html'; } else { -var catalog_url = '../catalog.html'; +var catalog_url = 'catalog.html'; } var pages = document.getElementsByClassName('pages')[0]; var bottom = document.getElementsByClassName('boardlist bottom')[0] From 7ea5b129e6ea03cabdbd67e566f0e352486cdd30 Mon Sep 17 00:00:00 2001 From: hatstand0 Date: Thu, 25 Sep 2014 23:42:41 +1000 Subject: [PATCH 12/15] Fix thumbnail width/height in API The API currently has the thumbnail widths and heights switched around --- inc/api.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/api.php b/inc/api.php index a8ae9eed..d7b28ee9 100644 --- a/inc/api.php +++ b/inc/api.php @@ -41,8 +41,8 @@ class Api { ); $this->fileFields = array( - 'thumbheight' => 'tn_w', - 'thumbwidth' => 'tn_h', + 'thumbheight' => 'tn_h', + 'thumbwidth' => 'tn_w', 'height' => 'w', 'width' => 'h', 'size' => 'fsize', From d27cddaaccc68eaa1b37b3a0694ba3e40a8fe049 Mon Sep 17 00:00:00 2001 From: hatstand0 Date: Fri, 26 Sep 2014 00:09:14 +1000 Subject: [PATCH 13/15] Add file hash to API The API currently lacks the Base64 encoded file hash 4chan's API provides, which assists in file de-duplication by archive software. --- inc/api.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/api.php b/inc/api.php index d7b28ee9..3769a9c9 100644 --- a/inc/api.php +++ b/inc/api.php @@ -113,6 +113,7 @@ class Api { $apiPost['ext'] = substr($file->file, $dotPos); $dotPos = strrpos($file->file, '.'); $apiPost['tim'] = substr($file->file, 0, $dotPos); + $apiPost['md5'] = base64_encode(md5_file($file->file_path, true)); } return $apiPost; From 76439cbdd9b9378ce21486bdec77bd77be3b371b Mon Sep 17 00:00:00 2001 From: czaks Date: Fri, 26 Sep 2014 13:34:47 +0200 Subject: [PATCH 14/15] we don`t use tooltipster anymore, do we? --- stylesheets/style.css | 2 - stylesheets/tooltipster/tooltipster.css | 274 ------------------------ 2 files changed, 276 deletions(-) delete mode 100644 stylesheets/tooltipster/tooltipster.css diff --git a/stylesheets/style.css b/stylesheets/style.css index 1f51bb18..b24854ed 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -580,8 +580,6 @@ form.ban-appeal textarea { } } -@include url("tooltipster/tooltipster.css"); - .compact-boardlist { padding: 3px; padding-bottom: 0; diff --git a/stylesheets/tooltipster/tooltipster.css b/stylesheets/tooltipster/tooltipster.css deleted file mode 100644 index e5c609cc..00000000 --- a/stylesheets/tooltipster/tooltipster.css +++ /dev/null @@ -1,274 +0,0 @@ -/* This is the default Tooltipster theme (feel free to modify or duplicate and create multiple themes!): */ -.tooltipster-default { - border-radius: 5px; - border: 2px solid #000; - background: #4c4c4c; - color: #fff; -} - -/* Use this next selector to style things like font-size and line-height: */ -.tooltipster-default .tooltipster-content { - font-family: Arial, sans-serif; - font-size: 14px; - line-height: 16px; - padding: 8px 10px; - overflow: hidden; -} - -/* This next selector defines the color of the border on the outside of the arrow. This will automatically match the color and size of the border set on the main tooltip styles. Set display: none; if you would like a border around the tooltip but no border around the arrow */ -.tooltipster-default .tooltipster-arrow .tooltipster-arrow-border { - /* border-color: ... !important; */ -} - - -/* If you're using the icon option, use this next selector to style them */ -.tooltipster-icon { - cursor: help; - margin-left: 4px; -} - - - - - - - - -/* This is the base styling required to make all Tooltipsters work */ -.tooltipster-base { - padding: 0; - font-size: 0; - line-height: 0; - position: absolute; - left: 0; - top: 0; - z-index: 9999999; - pointer-events: none; - width: auto; - overflow: visible; -} -.tooltipster-base .tooltipster-content { - overflow: hidden; -} - - -/* These next classes handle the styles for the little arrow attached to the tooltip. By default, the arrow will inherit the same colors and border as what is set on the main tooltip itself. */ -.tooltipster-arrow { - display: block; - text-align: center; - width: 100%; - height: 100%; - position: absolute; - top: 0; - left: 0; - z-index: -1; -} -.tooltipster-arrow span, .tooltipster-arrow-border { - display: block; - width: 0; - height: 0; - position: absolute; -} -.tooltipster-arrow-top span, .tooltipster-arrow-top-right span, .tooltipster-arrow-top-left span { - border-left: 8px solid transparent !important; - border-right: 8px solid transparent !important; - border-top: 8px solid; - bottom: -7px; -} -.tooltipster-arrow-top .tooltipster-arrow-border, .tooltipster-arrow-top-right .tooltipster-arrow-border, .tooltipster-arrow-top-left .tooltipster-arrow-border { - border-left: 9px solid transparent !important; - border-right: 9px solid transparent !important; - border-top: 9px solid; - bottom: -7px; -} - -.tooltipster-arrow-bottom span, .tooltipster-arrow-bottom-right span, .tooltipster-arrow-bottom-left span { - border-left: 8px solid transparent !important; - border-right: 8px solid transparent !important; - border-bottom: 8px solid; - top: -7px; -} -.tooltipster-arrow-bottom .tooltipster-arrow-border, .tooltipster-arrow-bottom-right .tooltipster-arrow-border, .tooltipster-arrow-bottom-left .tooltipster-arrow-border { - border-left: 9px solid transparent !important; - border-right: 9px solid transparent !important; - border-bottom: 9px solid; - top: -7px; -} -.tooltipster-arrow-top span, .tooltipster-arrow-top .tooltipster-arrow-border, .tooltipster-arrow-bottom span, .tooltipster-arrow-bottom .tooltipster-arrow-border { - left: 0; - right: 0; - margin: 0 auto; -} -.tooltipster-arrow-top-left span, .tooltipster-arrow-bottom-left span { - left: 6px; -} -.tooltipster-arrow-top-left .tooltipster-arrow-border, .tooltipster-arrow-bottom-left .tooltipster-arrow-border { - left: 5px; -} -.tooltipster-arrow-top-right span, .tooltipster-arrow-bottom-right span { - right: 6px; -} -.tooltipster-arrow-top-right .tooltipster-arrow-border, .tooltipster-arrow-bottom-right .tooltipster-arrow-border { - right: 5px; -} -.tooltipster-arrow-left span, .tooltipster-arrow-left .tooltipster-arrow-border { - border-top: 8px solid transparent !important; - border-bottom: 8px solid transparent !important; - border-left: 8px solid; - top: 50%; - margin-top: -7px; - right: -7px; -} -.tooltipster-arrow-left .tooltipster-arrow-border { - border-top: 9px solid transparent !important; - border-bottom: 9px solid transparent !important; - border-left: 9px solid; - margin-top: -8px; -} -.tooltipster-arrow-right span, .tooltipster-arrow-right .tooltipster-arrow-border { - border-top: 8px solid transparent !important; - border-bottom: 8px solid transparent !important; - border-right: 8px solid; - top: 50%; - margin-top: -7px; - left: -7px; -} -.tooltipster-arrow-right .tooltipster-arrow-border { - border-top: 9px solid transparent !important; - border-bottom: 9px solid transparent !important; - border-right: 9px solid; - margin-top: -8px; -} - - -/* Some CSS magic for the awesome animations - feel free to make your own custom animations and reference it in your Tooltipster settings! */ - -.tooltipster-fade { - opacity: 0; - -webkit-transition-property: opacity; - -moz-transition-property: opacity; - -o-transition-property: opacity; - -ms-transition-property: opacity; - transition-property: opacity; -} -.tooltipster-fade-show { - opacity: 1; -} - -.tooltipster-grow { - -webkit-transform: scale(0,0); - -moz-transform: scale(0,0); - -o-transform: scale(0,0); - -ms-transform: scale(0,0); - transform: scale(0,0); - -webkit-transition-property: -webkit-transform; - -moz-transition-property: -moz-transform; - -o-transition-property: -o-transform; - -ms-transition-property: -ms-transform; - transition-property: transform; - -webkit-backface-visibility: hidden; -} -.tooltipster-grow-show { - -webkit-transform: scale(1,1); - -moz-transform: scale(1,1); - -o-transform: scale(1,1); - -ms-transform: scale(1,1); - transform: scale(1,1); - -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1); - -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); -} - -.tooltipster-swing { - opacity: 0; - -webkit-transform: rotateZ(4deg); - -moz-transform: rotateZ(4deg); - -o-transform: rotateZ(4deg); - -ms-transform: rotateZ(4deg); - transform: rotateZ(4deg); - -webkit-transition-property: -webkit-transform, opacity; - -moz-transition-property: -moz-transform; - -o-transition-property: -o-transform; - -ms-transition-property: -ms-transform; - transition-property: transform; -} -.tooltipster-swing-show { - opacity: 1; - -webkit-transform: rotateZ(0deg); - -moz-transform: rotateZ(0deg); - -o-transform: rotateZ(0deg); - -ms-transform: rotateZ(0deg); - transform: rotateZ(0deg); - -webkit-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 1); - -webkit-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4); - -moz-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4); - -ms-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4); - -o-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4); - transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4); -} - -.tooltipster-fall { - top: 0; - -webkit-transition-property: top; - -moz-transition-property: top; - -o-transition-property: top; - -ms-transition-property: top; - transition-property: top; - -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1); - -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); -} -.tooltipster-fall-show { -} -.tooltipster-fall.tooltipster-dying { - -webkit-transition-property: all; - -moz-transition-property: all; - -o-transition-property: all; - -ms-transition-property: all; - transition-property: all; - top: 0px !important; - opacity: 0; -} - -.tooltipster-slide { - left: -40px; - -webkit-transition-property: left; - -moz-transition-property: left; - -o-transition-property: left; - -ms-transition-property: left; - transition-property: left; - -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1); - -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); - transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15); -} -.tooltipster-slide.tooltipster-slide-show { -} -.tooltipster-slide.tooltipster-dying { - -webkit-transition-property: all; - -moz-transition-property: all; - -o-transition-property: all; - -ms-transition-property: all; - transition-property: all; - left: 0px !important; - opacity: 0; -} - - -/* CSS transition for when contenting is changing in a tooltip that is still open. The only properties that will NOT transition are: width, height, top, and left */ -.tooltipster-content-changing { - opacity: 0.5; - -webkit-transform: scale(1.1, 1.1); - -moz-transform: scale(1.1, 1.1); - -o-transform: scale(1.1, 1.1); - -ms-transform: scale(1.1, 1.1); - transform: scale(1.1, 1.1); -} From bfb85fc2b19bcc895bd0034d0d7a9d7b64f481f4 Mon Sep 17 00:00:00 2001 From: czaks Date: Fri, 26 Sep 2014 13:35:56 +0200 Subject: [PATCH 15/15] catalog.css is no longer used --- stylesheets/catalog.css | 73 ----------------------------------------- 1 file changed, 73 deletions(-) delete mode 100644 stylesheets/catalog.css diff --git a/stylesheets/catalog.css b/stylesheets/catalog.css deleted file mode 100644 index b4ec6f55..00000000 --- a/stylesheets/catalog.css +++ /dev/null @@ -1,73 +0,0 @@ -img { - float:none!important; - margin: auto; - margin-bottom: 12px; - /*max-height: 150px; - max-width: 200px;*/ - box-shadow: 0 0 4px rgba(0, 0, 0, 0.55); - border: 2px solid rgba(153, 153, 153, 0); -} - -/* -img:hover { - border: 2px solid rgba(153, 153, 153, 0.27); -} -*/ - -div.threads{ - text-align: center; - margin-left: -20px; -} - -div.thread { - position: relative; - vertical-align: top; - display: inline-block; - overflow:hidden; - margin:2px; - padding: 2px; - height:300px; - width:205px; - font-size:11px; - font-weight:normal; - text-align:center; - background: rgba(182, 182, 182, 0.12); - border: 2px solid rgba(111, 111, 111, 0.34); -} - -div.threads:hover { - background: #D6DAF0; - border-color: #B7C5D9; -} - -div.grid-size-small { - width: 200px; - max-width: 200px; - max-height: 350px; -} - -div.grid-size-large { - width: 300px; - max-width: 300px; - max-height: 450px; -} - -img.thread-image { - height: auto; - max-width: 100%; -} - -@media (max-width: 420px) { - ul#Grid { - padding-left: 18px; - } - div.thread { - width: auto; - margin-left: 0; - margin-right: 0; - - } - div.threads { - overflow: hidden; - } -} \ No newline at end of file