From: garvinhicking Date: Wed, 25 Jan 2006 19:39:44 +0000 (+0000) Subject: revert changes X-Git-Tag: 1.0~140 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d5318059c877bbd23b2fb552f79c65fe7100230a;p=s9y.git revert changes --- diff --git a/templates/default/admin/img/menuheader_background.png b/templates/default/admin/img/menuheader_background.png index 9060c56..7f76961 100644 Binary files a/templates/default/admin/img/menuheader_background.png and b/templates/default/admin/img/menuheader_background.png differ diff --git a/templates/default/admin/style.css b/templates/default/admin/style.css index 148c69c..017eeda 100644 --- a/templates/default/admin/style.css +++ b/templates/default/admin/style.css @@ -1,51 +1,10 @@ - /* ***************************** - MAIN Selectors - * *****************************/ - body { - font-size: 10pt; - margin: 0; - background-color: #FFFFFF; - font-size: 10px; - font-family: luxi sans, trebuchet ms, bitstream vera sans, verdana, arial, helvetica, sans-serif; - direction: ltr; -} - -a, input, textarea, p, td, th, div, span { - font-family: luxi sans, "Trebuchet ms", bitstream vera sans, verdana, arial, helvetica, sans-serif; -} - -h4,h3 { - margin: 0; -} - -a:link, -a:visited, -a:active { - color: #011a7c; - text-decoration: underline; -} - -a:hover { - color: #011a7c; - text-decoration: underline; -} - -td, th { - font-size: 0.8em; -} - -input, select, textarea { - background: #F8F9FA; font-family: Verdana; - font-size: 0.9em; - border: 1px solid #294366; + margin: 0 0 0 0; + background: #7F9BC2 url({TEMPLATE_PATH}img/background.jpg) repeat-x; + direction: {LANG_DIRECTION}; } -/* ***************************** - GENERAL PAGE Selectors - * *****************************/ - #serendipity_admin_page { text-align: center; } @@ -56,12 +15,29 @@ input, select, textarea { #serendipityAdminFrame { text-align: left; - width: 100%; + width: 80%; + min-width: 777px; margin: auto; background: #FFF; - border: 0px; + border: 2px solid #0F3353; + border-top: 0; } +#serendipityAdminBanner { + background-color: #FFF; + height: 80px; + background: url({TEMPLATE_PATH}img/banner_background.png); +} + +#serendipityAdminInfopane { + background: #F8F9FA url({TEMPLATE_PATH}img/infobar_background.png); + font-size: 10px; + padding: 5px; + vertical-align: middle; + text-align: right; + color: #5E5E5E; + height: 27px; +} #serendipityAdminMainpane { background: #FFF; @@ -72,131 +48,49 @@ input, select, textarea { .serendipityAdminContent { font-size: 0.8em; - padding: 10px 25px 20px 25px; + padding: 10px 5px 20px 5px; width: 80%; - z-index: 1; -} - -#serendipityAdminFooter { - font-size: 0.7em; - text-align: center; - color: #FFF; -} - -/* ***************************** - HEADER Selectors - * *****************************/ - -#serendipityAdminBanner { - height: 150px; - background-color: #011b7c; - background-image: url(templates/default/img/header_bar.png); - background-repeat: repeat-x; - width: 100%; - padding: 0px; - margin: 0px; - border: 0px; } #serendipityAdminBanner h1 { - position: absolute; - top: 0px; - left: 0px; - background-image: url(templates/default/img/header_logo.png); - background-repeat: no-repeat; - padding: 78px 0px 0px 131px; - height: 100px; - width: 770px; - font-size: 2.4em; - letter-spacing: 0.05em; - margin: 0px; - overflow: hidden; - color: #011b7c; - z-index: 0; + padding-left: 20px; + font-size: 1.8em; + margin: 0; } #serendipityAdminBanner h2 { - position: absolute; - top: 108px; - left: 131px; - font-size: 1.3em; - margin: 0px; - letter-spacing: 0.03em; - color: #011b7c; -} - -#serendipityAdminInfopane { - font-size: 10px; - padding: 5px; - vertical-align: middle; - text-align: right; - color: #011b7c; - height: 27px; + padding-left: 30px; + font-size: 1em; + color: #AAA; + margin: 0; } - -/* ***************************** - MENU Selectors - * *****************************/ - #serendipitySideBar { + width: 20%; + padding-top: 10px; } -ul.serendipitySideBarMenu { - padding: 0px 0px 2px 0px; - margin: 0px 0px 5px 22px; - display: block; - width: 190px; - list-style: none; -} - -ul.serendipitySideBarMenu li { - display: block; - list-style: none; - font-size: x-small; -} - -ul.serendipitySideBarMenu { - background-color: #fafaff; +#serendipityAdminFooter { + font-size: 0.7em; + text-align: center; + color: #FFF; } -ul.serendipitySideBarMenu li.serendipitySideBarMenuHead { - background-color: #011c7e; - color: #FFFFFF; +.serendipitySideBarTitle { + padding-left: 2px; font-weight: bold; - padding: 5px 0px 0px 5px; - background: url(templates/default/admin/img/menuheader_background.png) repeat-x; - height: 20px; font-size: 0.9em; - border: 0px; - margin: 0px 0px 5px 0px; -} - -ul.serendipitySideBarMenu li { - display: block; - border: 0px; - border-left: 1px solid #011c7e; - border-bottom: 1px solid #011c7e; - margin: 0px 5px 5px 5px; - background-color: #ffffff; } -ul.serendipitySideBarMenu li a { - padding-left: 5px; - text-decoration: none; - display: block; +.serendipitySideBarContent { + padding-left: 10px; + font-size: 0.8em; } -ul.serendipitySideBarMenu li a:hover { - background-color: #011c7e; - color: white; +.serendipitySideBarItem { + margin-bottom: 10px; } - -/* ***************************** - OTHER Selectors - * *****************************/ - .serendipity_admin_title { font-size: 2em; margin-bottom: 5px; @@ -236,12 +130,69 @@ ul.serendipitySideBarMenu li a:hover { margin: 10px; } + + +td, th { + font-size: 0.8em; +} + +a:visited, +a:link { + color: #294366; + text-decoration: underline; +} + +a:hover { + color: #D40041; +} + +input, select, textarea { + background: #F8F9FA; + font-family: Verdana; + font-size: 0.9em; + border: 1px solid #294366; +} + #serendipity_iframe { border: 1px solid #294366; text-align: center; margin: auto; } +ul.serendipitySideBarMenu { + padding: 0; + margin: 0; +} + +ul.serendipitySideBarMenu li.serendipitySideBarMenuHead { + font-size: 0.85em; + list-style: none; + display: block; + font-weight: bold; + background: url({TEMPLATE_PATH}img/menuheader_background.png) no-repeat; + padding-top: 0.3em; + padding-bottom: 0.3em; + padding-left: 3px; +} + +ul.serendipitySideBarMenu li { + font-size: 0.8em; + font-weight: normal; + background:url({TEMPLATE_PATH}img/menu_background.png) no-repeat; + padding-top: 0.3em; + padding-bottom: 0.3em; + padding-left: 5px; + list-style:none; + display:block; + margin:0; +} + +ul.serendipitySideBarMenu a:link, +ul.serendipitySideBarMenu a:visited { + text-decoration: none; + font-weight: bold; +} + .serendipityImageButton { cursor: pointer; } @@ -273,6 +224,7 @@ a:visited.serendipityIconLinkRight { border: 0; } + a:link.serendipityPrettyButton, a:visited.serendipityPrettyButton, a:hover.serendipityPrettyButton { @@ -282,7 +234,7 @@ a:hover.serendipityPrettyButton { .serendipityPrettyButton { padding: 1px; - background: url(templates/default/admin/img/button_background.png) repeat-x top; + background: url({TEMPLATE_PATH}img/button_background.png) repeat-x top; color: #1D2E3F; font-weight: bold; font-size: 0.9em; @@ -290,6 +242,7 @@ a:hover.serendipityPrettyButton { margin: 2px; } +/* Special class if the button is a tag */ a.serendipityPrettyButton { padding: 2px 4px 2px 4px; cursor: default; @@ -340,5 +293,3 @@ table#serendipity_customfields .customfield_value textarea { width: 100%; height: 100px; } - - diff --git a/templates/default/entries.tpl b/templates/default/entries.tpl index 751fa93..04a1ef5 100644 --- a/templates/default/entries.tpl +++ b/templates/default/entries.tpl @@ -3,13 +3,11 @@ {foreach from=$entries item="dategroup"}
-
{if $dategroup.is_sticky}

{$CONST.STICKY_POSTINGS}

{else}

{$dategroup.date|@formatTime:DATE_FORMAT_ENTRY}

{/if} -
{foreach from=$dategroup.entries item="entry"}

{$entry.title}

diff --git a/templates/default/img/back.png b/templates/default/img/back.png index 69e2635..0fc771a 100644 Binary files a/templates/default/img/back.png and b/templates/default/img/back.png differ diff --git a/templates/default/img/forward.png b/templates/default/img/forward.png index da5d688..5c8fe96 100644 Binary files a/templates/default/img/forward.png and b/templates/default/img/forward.png differ diff --git a/templates/default/img/xml.gif b/templates/default/img/xml.gif index 776e54d..3cefc36 100644 Binary files a/templates/default/img/xml.gif and b/templates/default/img/xml.gif differ diff --git a/templates/default/index.tpl b/templates/default/index.tpl index 2f19eb1..39a9b68 100644 --- a/templates/default/index.tpl +++ b/templates/default/index.tpl @@ -36,11 +36,11 @@ {if $leftSidebarElements > 0} - + {/if} - + {if $rightSidebarElements > 0} - + {/if}
{serendipity_printSidebar side="left"}
{serendipity_printSidebar side="left"}
{$CONTENT}
{$CONTENT}
{serendipity_printSidebar side="right"}
{serendipity_printSidebar side="right"}
@@ -48,9 +48,6 @@ {$raw_data} {serendipity_hookPlugin hook="frontend_footer"} - - - {if $is_embedded != true} diff --git a/templates/default/plugin_calendar.tpl b/templates/default/plugin_calendar.tpl index f74efc8..6d129ec 100644 --- a/templates/default/plugin_calendar.tpl +++ b/templates/default/plugin_calendar.tpl @@ -2,7 +2,7 @@ {if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date} - {$CONST.BACK} + {$CONST.BACK} {/if} @@ -12,7 +12,7 @@ {if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date} - {$CONST.FORWARD} + {$CONST.FORWARD} {/if} @@ -26,7 +26,7 @@ {foreach from=$plugin_calendar_weeks item="week"} {foreach from=$week.days item="day"} - {if isset($day.properties.Active) and $day.properties.Active}{/if}{$day.name|@default:" "}{if isset($day.properties.Active) and $day.properties.Active}{/if} + {if isset($day.properties.Active) and $day.properties.Active}{/if}{$day.name|@default:" "}{if isset($day.properties.Active) and $day.properties.Active}{/if} {/foreach} {/foreach} diff --git a/templates/default/style.css b/templates/default/style.css index 083cb68..faab58d 100644 --- a/templates/default/style.css +++ b/templates/default/style.css @@ -1,185 +1,158 @@ -/* Edited with EditCSS */ -/**** LINK-tag style sheet serendipity.css ****/ - -/* ***************************** - MAIN Selectors - * *****************************/ - -body { - font-size: 10pt; - margin: 0px; - padding: 0px; - background-color: #FFFFFF; - font-size: 10px; - font-family: luxi sans, trebuchet ms, bitstream vera sans, verdana, arial, helvetica, sans-serif; -} - -a, input, textarea, p, td, th, div, span { - font-family: luxi sans, "Trebuchet ms", bitstream vera sans, verdana, arial, helvetica, sans-serif; -} - h4,h3 { margin: 0; } -a:link, -a:visited, -a:active { - color: #011a7c; - text-decoration: none; -} - -a:hover { - color: #011a7c; - text-decoration: underline; +.serendipitySideBarContent input { + width: 150px; } #mainpane { - border: 0px; - padding: 0px; - margin: 20px 0px 0px 0px; - width: 100%; - position: relative; -} - -/* ***************************** - HEADER - * *****************************/ - -#serendipity_banner { - height: 150px; - background-color: #011b7c; - background-image: url(templates/default/img/header_bar.png); - background-repeat: repeat-x; + border-bottom: 1px solid #000000; + margin: auto; width: 100%; - padding: 0px; - margin: 0px; - border: 0px; -} - -#serendipity_banner h1 { - position: absolute; - top: 0px; - left: 0px; - background-image: url(templates/default/img/header_logo.png); - background-repeat: no-repeat; - padding: 78px 0px 0px 131px; - height: 100px; - width: 770px; - font-size: 2.4em; - letter-spacing: 0.05em; - margin: 0px; - overflow: hidden; + border-top: 0px; + background-color: #FFFFFF; + border-top: 1px solid #000000; } -#serendipity_banner h2 { - position: absolute; - top: 108px; - left: 131px; - font-size: 1.3em; - margin: 0px; - letter-spacing: 0.03em; +#content { + padding: 10px; + margin: 10px; + width: auto; } -a.homelink1, -a.homelink1:link, -a.homelink1:visited { - color: #011c7e; - text-decoration: none; +#serendipityRightSideBar { + width: 170px; + border-left: 1px dashed #000000; + padding: 10px; + vertical-align: top; } -a.homelink2, -a.homelink2:link, -a.homelink2:visited { - color: #011c7e; - text-decoration: none; +#serendipityLeftSideBar { + width: 170px; + border-right: 1px dashed #000000; + padding: 10px; + vertical-align: top; } -a.homelink1:hover, -a.homelink2:hover { - color: #8eb2d9; - border-bottom: 1px solid #8eb2d9; +body { + font-size: 10pt; + margin: 0; + background-color: #D2DFF2; + font-size: 10px; + font-family: verdana, arial, helvetica, sans-serif; + margin-bottom: 30px; } -/* ***************************** - Content Parts - * *****************************/ - -#content { - padding: 0px 0px 0px 22px; - margin: 10px auto 0px auto; - vertical-align: top; +input, textarea { + font-size: 10pt; + font-family: verdana, arial, helvetica, sans-serif; } -#contentSpacer { - min-width: 400px; - margin: 0px auto 0px auto; +th, td { + font-size: 10pt; } -.serendipity_content_message { +p, td, th, div, span { + font-family: verdana, arial, helvetica, sans-serif; } -/* ***************************** - Entry related - * *****************************/ - -.serendipity_Entry_Date { - background-color: #FDFDFF; - margin-bottom: 40px; +#serendipity_banner { + margin: auto; + width: 100%; + height: 72px; + background-image: url({TEMPLATE_PATH}img/background.png); } -.serendipity_Entry_Header { - background-color: #FFFFFF; - border-bottom: 1px solid #011a7c; +a.homelink1, +a.homelink1:hover, +a.homelink1:link, +a.homelink1:visited, +#serendipity_banner h1 { + color: #FFFFFF; + font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; + font-size : 20px; + padding-left:15px; + padding-top: 10px; + margin: 0px; + text-decoration: none; } -.serendipity_date { - display: inline; - background-color: #011a7c; - color: white; - font-size: 1.1em; +a.homelink2, +a.homelink2:hover, +a.homelink2:link, +a.homelink2:visited, +#serendipity_banner h2 { + color: #FFFFFF; + padding-left: 15px; + font-size: 14px; margin: 0px; - padding: 0px 5px 0px 5px; + text-decoration: none; } .serendipity_title { - margin: 0px; - background-color: #FFFFFF; - font-size: 2em; + font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; + font-size: medium; font-weight: bold; - color: #011a7e; - padding: 10px 0px 10px 4px; - border-bottom: 1px solid #b8d3f0; + margin-top: 10px; + color: #333333; + padding-left: 5px; + border-bottom: 2px solid #36558C; } -.serendipity_title a, .serendipity_title a:link, .serendipity_title a:visited { - color: #011a7c; - text-decoration: none; + text-decoration: none; + border: 0; + color: #000000; } .serendipity_title a:hover { - color: #8eb2d9; - border-bottom: 1px solid #8eb2d9; + color: #FF0000; } .serendipity_entry { - color: #000000; - font-size: 1.3em; + font-family:Verdana, Arial, Geneva, Helvetica, sans-serif; + color: #333333; + font-size: 9.5pt; font-weight: normal; - padding: 5px; + padding-right: 10px; + width: 95%; margin: auto; - margin-top: 5px; - background-color: #FDFDFF; + margin-top: 10px; +} + +.serendipity_entry_body_folded, +.serendipity_entry_body_unfolded, +.serendipity_entry_extended { + /* Inner blocks of .serendipity_entry, can be used for further customization */ +} + +.serendipity_entry_date { + margin: auto; +} + +.serendipity_date { + font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; + font-size: large; + color: #333333; + margin: 0; + margin-top: 20px; + text-align: right; } -.serendipity_entry .serendipity_entryFooter { - padding: 5px; - margin: 15px 5px 5px 5px; +.serendipity_commentsTitle { + font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; + font-size: small; + font-weight: bold; + margin-top: 10px; + color: #333333; + padding-left: 5px; + border-bottom: 2px solid #36558C; } div.serendipity_entryFooter { + font-family:Verdana, Arial, Geneva, Helvetica, sans-serif; font-size: x-small; color: #000000; padding-top: 10px; @@ -192,97 +165,9 @@ img.serendipity_entryIcon { border: 0px; } -/* ***************************** - SIDEBARS - * *****************************/ - -.serendipitySideBarContent input { - width: 150px; -} - -#serendipityRightSideBar { - width: 190px; -} - -#serendipityLeftSideBar { - width: 190px; -} - -.sideBarSpacer { - margin: 0px 30px 0px 30px; -} - -div.serendipityPlug { - padding-left: 10px; -} - -div.serendipityPlug a { - text-decoration: none; - border: 0px; -} - -/* Container for each item on the side bar */ -div.serendipitySideBarItem { - padding-bottom: 12px; - margin-bottom: 12px; - font-size: 12px; - font-weight:normal; +img.serendipity_entryIcon { + float: right; border: 0px; - width: 180px; -} - -.serendipitySideBarContent { - background-color: #FFFFFF; - background-image: url(templates/default/img/sidebar_spacer.jpg); - background-repeat: repeat-x; - background-position: 0px 0px; - padding: 5px; - padding-top: 10px; -} - -.serendipitySideBarContent form { - margin: 0px; - padding: 0px; -} - -#serendipityLeftSideBar .serendipitySideBarTitle { - background-image: url(templates/default/img/sidebar_left.jpg); - background-repeat: no-repeat; - border: 1px solid #011a7c; -} - -#serendipityRightSideBar .serendipitySideBarTitle { - background-image: url(templates/default/img/sidebar_left.jpg); - background-repeat: no-repeat; - border: 1px solid #011a7c; -} - -/* title of an individual item */ -.serendipitySideBarTitle { - background-color: #1f3180; - margin: 0px; - color: #FFFFFF; - font-size: 12px; - font-weight:bold; - padding: 4px 5px 2px 5px; - display: block; -} - -/* ***************************** - COMMENTS - * *****************************/ - -.serendipity_comments { - position: relative; -} - -.serendipity_commentsTitle { - font-size: small; - font-weight: bold; - margin-top: 10px; - color: #011a7c; - padding-left: 5px; - border-bottom: 1px solid #b8d3f0; } td.serendipity_commentsLabel { @@ -296,52 +181,54 @@ td.serendipity_commentsValue select, td.serendipity_commentsValue textarea { font-size: 12px; padding: 2px; - width: 380px; + width: 400px; } + .serendipity_commentForm { font-size: 13px; + color: #404040; margin-bottom: 13px; margin-right: 10px; margin-left: 10px; background-color: #FFFFFF; } - .serendipity_comment { font-size: 13px; - margin-top: 14px; + margin-top: 10px; margin-right: 10px; margin-left: 10px; - margin-bottom: 35px; - border: 1px solid #b8d3f0; + color: #404040; + padding: 3px; background-color: #FFFFFF; - padding: 5px 5px 5px 5px; - clear: both; -} - -.serendipity_commentBody { - padding: 0px 0px 0px 5px; overflow: auto; } .serendipity_comment_source { - margin-top: 10px; - padding: 0px 0px 0px 5px; - color: #011a7c; - display: block; - position: absolute; - z-index: 3; + margin-top: 5px; + padding-left: 5px; + margin-bottom: 5px; + padding-bottom: 3px; + border-bottom: 2px solid #36558C; } -/* ***************************** - CALENDAR - * *****************************/ +a:link, +a:visited, +a:active { + color: #003366; + text-decoration: underline; +} +a:hover { + color: #000000; + text-decoration: underline; +} table.serendipity_calendar td { font-size:11px; padding: 3px; } table.serendipity_calendar a { + color: #FF0000; font-weight: bold; text-decoration:none; } @@ -361,14 +248,44 @@ td.serendipity_calendarHeader a:hover { text-decoration: none; } -/* ***************************** - IMAGE comments - * *****************************/ +div.serendipityPlug { + padding-left: 10px; +} + +div.serendipityPlug a { + text-decoration: none; + border: 0px; +} + +/* Container for each item on the side bar */ +div.serendipitySideBarItem { + padding-bottom: 12px; + margin-bottom: 12px; + font-size: 12px; + font-weight:normal; + border-bottom: solid 2px #36558C; +} + +/* title of an individual item */ +.serendipitySideBarTitle { + margin: 0; + font-family:Verdana, Arial, Geneva, Helvetica, sans-serif; + color: #000000; + font-size: 12px; + font-weight:bold; + padding-left:2px; + padding-bottom:2px; +} .serendipityImageButton { cursor: pointer; } +.serendipity_entry p { + margin: 0px; + padding-bottom: 0px; +} +/** Embedded images with the s9y image manager **/ .serendipity_imageComment_center, .serendipity_imageComment_left, .serendipity_imageComment_right { @@ -407,6 +324,9 @@ td.serendipity_calendarHeader a:hover { text-align: center; } +.serendipity_comments { +} + .serendipity_center { margin-left: auto; margin-right: auto; @@ -421,9 +341,9 @@ td.serendipity_calendarHeader a:hover { color: green; } -#copyright { - margin: 0px auto 0px auto; - text-align: center; +.serendipity_entry_author_self { } - +.serendipity_comment_author_self .serendipity_comment_source { + background-color: #EEEEFF; +}