aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2012-07-24 18:09:45 +0000
committerflop25 <flop25@piwigo.org>2012-07-24 18:09:45 +0000
commit37b4b3e0f3a4b5909a045af4633dd64ac2e735a5 (patch)
tree261449e857407532eaa2631910bcb56be0a63952
parent881dfec74c9dc7fe9b1350fbdb2fb67326d47ee7 (diff)
merge r16800 & r16799 from trunk to 2.4 branch
bug:2688 changing padding margin... +10 px for .thumbnailCategory .description using a prefilter __ changing the padding adding a prefilter to a height for .thumbnailCategory .description .text git-svn-id: http://piwigo.org/svn/branches/2.4@16984 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--themes/Sylvia/theme.css11
-rw-r--r--themes/Sylvia/themeconf.inc.php22
2 files changed, 28 insertions, 5 deletions
diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css
index 98e8fee34..3111bc643 100644
--- a/themes/Sylvia/theme.css
+++ b/themes/Sylvia/theme.css
@@ -194,20 +194,21 @@
}
.thumbnailCategory .illustration {
background:transparent url(images/cat_top-left.gif) no-repeat scroll left top;
- padding: 0 0 0 10px;
- margin: 0 !important;
+ padding: 0 5px 0 10px;
+ margin: 0 !important;
+ text-align: center;
}
.thumbnailCategory .illustration a {
display: block;
- margin: 0;
- padding:20px 0 0 8px;
+ margin: 0 auto;
+ padding: 20px 4px 0;
border:0;
}
.thumbnailCategory .description {
background:transparent url(images/cat_top-right.gif) no-repeat scroll right top;
margin: 0;
padding:15px 10px 3px 0;
- overflow-x: hidden !important;
+ overflow: hidden !important;
height:158px;
}
.thumbnailCategory .description .text {
diff --git a/themes/Sylvia/themeconf.inc.php b/themes/Sylvia/themeconf.inc.php
index 78c84e49e..b1523d611 100644
--- a/themes/Sylvia/themeconf.inc.php
+++ b/themes/Sylvia/themeconf.inc.php
@@ -13,4 +13,26 @@ $themeconf = array(
'icon_dir' => 'themes/Sylvia/icon',
'mime_icon_dir' => 'themes/Sylvia/icon/mimetypes/',
);
+/************************************ mainpage_categories.tpl ************************************/
+add_event_handler('loc_end_index_category_thumbnails', 'Sylvia_album');
+function Sylvia_album($tpl_thumbnails_var)
+{
+ global $template;
+ $template->set_prefilter('index_category_thumbnails', 'Sylvia_album_prefilter');
+ return $tpl_thumbnails_var;
+}
+function Sylvia_album_prefilter($content, &$smarty)
+{
+ $search = '#\{html_style\}#';
+ $replacement = '{html_style}
+.thumbnailCategory .description .text{ldelim}
+ height: {$derivative_params->max_height()-30}px;
+}';
+ $content = preg_replace($search, $replacement, $content);
+ $search = '#\.thumbnailCategory[\t ]*.description\{ldelim\}[\s]*height:[\t ]*\{\$derivative_params->max_height\(\)\+5#';
+ $replacement = '.thumbnailCategory .description{ldelim}
+ height: {$derivative_params->max_height()+15';
+ $content = preg_replace($search, $replacement, $content);
+ return $content;
+}
?>