From 0929426813a04f627ff3ef357138a154c79f368a Mon Sep 17 00:00:00 2001 From: rvelices Date: Thu, 29 Mar 2012 19:34:00 +0000 Subject: removed unused css, merged some css, etc... git-svn-id: http://piwigo.org/svn/trunk@13801 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/Sylvia/theme.css | 7 +--- themes/default/local_head.tpl | 2 - themes/default/template/comment_list.tpl | 12 +++--- themes/default/template/picture.tpl | 34 +++++++--------- themes/default/template/picture_nav_buttons.tpl | 8 ++-- themes/default/theme.css | 54 ++++++++----------------- themes/elegant/theme.css | 19 ++------- 7 files changed, 45 insertions(+), 91 deletions(-) (limited to 'themes') diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css index e4e892a62..a016ca354 100644 --- a/themes/Sylvia/theme.css +++ b/themes/Sylvia/theme.css @@ -285,11 +285,11 @@ .content .commentElement.even { background-color: #111; } -.content .commentElement div.illustration { +.content .commentElement .illustration { padding: 0 0 0 10px; margin: 0 !important; } -.content .commentElement div.illustration a { +.content .commentElement .illustration a { display: block; margin: 0; padding:20px 0 0 8px; @@ -355,9 +355,6 @@ padding: 15px 2px 6px 12px; border: 1px solid #666; } -#thePicturePage .commentElement .date, #thePicturePage .commentElementy .author { - font-weight:bold; -} #thePicturePage .commentsList { padding-left: 12px; padding-right: 12px; diff --git a/themes/default/local_head.tpl b/themes/default/local_head.tpl index 38bb4ec0e..2ff76b316 100644 --- a/themes/default/local_head.tpl +++ b/themes/default/local_head.tpl @@ -7,5 +7,3 @@ {combine_css path="themes/default/print.css" order=-10} {/if} - -{if !isset($MENUBAR)}{/if} \ No newline at end of file diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index 315cbfe07..b73cc39e2 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -1,18 +1,17 @@ {if isset($comment_derivative_params)} {strip}{html_style} -.commentElement DIV.illustration{ldelim} - width: {$comment_derivative_params->max_width()+5}px; +.commentElement .illustration{ldelim} + width: {$comment_derivative_params->max_width()+5}px } .content .commentElement .description{ldelim} - height: {$comment_derivative_params->max_height()+5}px; + height: {$comment_derivative_params->max_height()+5}px } {/html_style}{/strip} {/if} diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 723c0bc8c..ee96dac63 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -58,7 +58,7 @@ jQuery("#derivativeSwitchBox").on('mouseleave click', function() {
+
+
{if $DISPLAY_NAV_THUMB}
{if isset($previous)} @@ -159,7 +159,7 @@ y.callService(
{/if} -
+
{strip} {if $display_info.author and isset($INFO_AUTHOR)}
@@ -277,8 +277,8 @@ y.callService(
{'Who can see this photo?'|@translate}
-{combine_script id='core.scripts' require='jquery' load='async' path='themes/default/js/scripts.js'} -{footer_script} +{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} +{footer_script require='jquery'} {literal}function setPrivacyLevel(rootUrl, id, level) { var y = new PwgWS(rootUrl); @@ -309,7 +309,7 @@ function togglePrivacyLevelBox() } {/literal} {/footer_script} - +
{if isset($metadata)} -
+
{foreach from=$metadata item=meta}

{$meta.TITLE}

{foreach from=$meta.lines item=value key=label} @@ -341,25 +341,21 @@ function togglePrivacyLevelBox() {if isset($COMMENT_COUNT)}
- {if $COMMENT_COUNT > 0} -

{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}

- {else} -

{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}

- {/if} - +

{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}

+
{if isset($comment_add)}

{'Add a comment'|@translate}

- + {if $comment_add.SHOW_AUTHOR}

+

{/if} -

-

+

-

+

{/if} diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl index 921a1de81..e6b2a1e1f 100644 --- a/themes/default/template/picture_nav_buttons.tpl +++ b/themes/default/template/picture_nav_buttons.tpl @@ -30,7 +30,7 @@  {'Not repeat the slideshow'|@translate} {/if} - +{/if}{/strip}-->*} {strip}{if isset($previous)}  {'Previous'|@translate} @@ -72,7 +72,7 @@  {'Next'|@translate} {/if}{/strip} - +{/if}{/strip}-->*} {/if}
{strip} diff --git a/themes/default/theme.css b/themes/default/theme.css index ab418542b..f04d37679 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -269,30 +269,19 @@ TD.calDayHead { width: 100%; } -.commentsList LI { - margin: 0; - padding: 0; - float: left; - width:99%; -} - .commentElement { - display:block; - padding: 2px 0 0 2px; margin: 5px; + padding: 2px 0 0 2px; + float: left; + width:99%; } .commentElement .description { - font-size: 100%; overflow: auto; /*width: inherit;*/ } -.commentElement .description P { - margin: 0; -} - -.commentElement DIV.illustration { +.commentElement .illustration { text-align: left; margin: 2px 0 0 2px; float: left; @@ -411,13 +400,7 @@ TD.calDayHead { margin: 5px 5px 0 10px; } -.infoTable .label { - font-weight: bold; - text-align: right; - padding-right: 0.5em; -} - -.infoTable UL { +.imageInfoTable UL { /*this is the album list*/ margin: 0; padding: 0 0 0 1em; list-style-type: square; @@ -452,8 +435,6 @@ TD.calDayHead { clear: none; } -.noCommentText {display:none;} - /** * Default Layout */ @@ -824,30 +805,27 @@ LEGEND { #commentAdd input[type="text"], #commentAdd textarea { - min-width: 100%; max-width: 100%; width: 100%; - font-family: Arial,Helvetica,sans-serif; - font-size: 100%; } -#pictureCommentList li { - clear: both; - display: block; - padding: 0.5em 0; - margin-bottom: 5px; + +#pictureCommentList .commentElement { border-radius: 5px; - width: 100%; } -#pictureCommentList ul { list-style: none; padding: 0;} -#pictureCommentList li ul { list-style-type: none; padding: 4px;} -#pictureCommentList .author { font-weight: bold;} -#pictureCommentList .date { font-style: italic;} + +.commentAuthor { + font-weight: bold; +} + +.commentDate { + font-style: italic +} + #pictureCommentList .commentsOrder { float: left; margin-bottom: 5px;} #pictureCommentList .navigationBar { float: right; margin-bottom: 5px;} #pictureComments h4 { margin: 0;} #pictureComments form p { margin: 5px 0; text-align: left;} #pictureComments form p textarea { margin: 10px 0;} -#pictureComments INPUT { margin: 10px;} #pictureComments INPUT[type=submit] { margin: 0;} /* image info table */ diff --git a/themes/elegant/theme.css b/themes/elegant/theme.css index d2b30ae40..199398406 100644 --- a/themes/elegant/theme.css +++ b/themes/elegant/theme.css @@ -11,11 +11,10 @@ html, body { background-color: #111;} #imageInfos, #infoSwitcher.infohidden { background-color: #333;} #thePicturePage #comments { background-color: #333;} #pictureCommentList li { background-color: #444;} -#pictureCommentList .commentElement { background-color: transparent;} .calendarTitle { background-color: #222;} .switchBox, .header_notes { background-color: #555;} -.thumbnailCategory, .commentElement { background-color: #333;} +.thumbnailCategory { background-color: #333;} .message { background-color: #666;} INPUT[type="text"], INPUT[type="password"], @@ -162,7 +161,7 @@ a:hover { border-bottom: none;} #thumbnails { padding-top: 5px;} .thumbnails IMG { margin-bottom: 0; vertical-align: middle;} .thumbnailCategory DIV.illustration, -.commentElement DIV.illustration { margin: 2px; text-align: center;} +.commentElement .illustration { margin: 2px; text-align: center;} /* picture page */ @@ -238,7 +237,6 @@ a:hover { border-bottom: none;} #thePicturePage #comments form { margin: 10px 0;} #thePicturePage #comments fieldset { margin: 0 1em;} -.noCommentText { display:block;} .commentshidden #pictureComments { display: none;} .commentContent .comments_toggle { cursor: pointer;} @@ -254,18 +252,7 @@ a:hover { border-bottom: none;} font-family: Arial,Helvetica,sans-serif; font-size: 100%; } -#pictureCommentList li { - clear: both; - display: block; - padding: 0.5em 0; - margin-bottom: 5px; - border-radius: 5px; - width: 100%; -} -#pictureCommentList ul { list-style: none; padding: 0;} -#pictureCommentList li ul { list-style-type: none; padding: 4px;} -#pictureCommentList .author { font-weight: bold;} -#pictureCommentList .date { font-style: italic;} + #pictureCommentList .commentsOrder { float: left; margin-bottom: 5px;} #pictureCommentList .navigationBar { float: right; margin-bottom: 5px;} #pictureComments h4 { margin: 0;} -- cgit v1.2.3