Compare commits

..

No commits in common. "86b607cf4ef11a0037690a6935a0de01990bda55" and "e913127d4d468d92a084cbe729fc17ac874500c6" have entirely different histories.

13 changed files with 203 additions and 184 deletions

View file

@ -1,4 +1,4 @@
{include file="cpheader.tpl"} {include file=cpheader.tpl}
<div id="cpmain"> <div id="cpmain">
<div class="entry"> <div class="entry">
<ul id="admin-small-nav"> <ul id="admin-small-nav">
@ -12,4 +12,4 @@
{/page} {/page}
</div> </div>
</div> </div>
{include file="footer.tpl"} {include file=footer.tpl}

View file

@ -1,8 +1,8 @@
{include file="header.tpl"} {include file=header.tpl}
<div id="main"> <div id="main">
{entry_block} {entry_block}
{entry} {entry}
{include file="entry-default.tpl"} {include file=entry-default.tpl}
{comment_block} {comment_block}
<ol id="comments"> <ol id="comments">
{comment} {comment}
@ -11,7 +11,7 @@
{$url|notempty:"<a href=\"$url\" title=\"Permalink to $name's comment\">$name"|default:$name}</a> {$url|notempty:"<a href=\"$url\" title=\"Permalink to $name's comment\">$name"|default:$name}</a>
</strong> </strong>
{include file="shared:commentadminctrls.tpl"} {* this shows edit/delete links*} {include file=shared:commentadminctrls.tpl} {* this shows edit/delete links*}
<div class="date"> <div class="date">
{$date|date_format:"%B %d, %Y - %H:%M"} {$date|date_format:"%B %d, %Y - %H:%M"}
@ -29,8 +29,8 @@
{nextpage}{prevpage} {nextpage}{prevpage}
</div> </div>
{/entry_block} {/entry_block}
{include file=""shared:comments.tpl""} {include file="shared:comments.tpl"}
</div> </div>
{include file="widgets.tpl"} {include file=widgets.tpl}
<hr /> <hr />
{include file="footer.tpl"} {include file=footer.tpl}

View file

@ -1,15 +1,15 @@
{include file="header.tpl"} {include file=header.tpl}
<div id="main"> <div id="main">
<div class="entry"> <div class="entry">
{page} {page}
<h3 class="title">{$subject}</h3> <h3 class="title">{$subject}</h3>
<div class="body"> <div class="body">
{if $rawcontent} {$content} {if $rawcontent} {$content}
{else} {include file="$content}{/if} {else} {include file=$content}{/if}
</div> </div>
{/page} {/page}
</div> </div>
</div> </div>
{include file="widgets.tpl"} {include file=widgets.tpl}
{include file="footer.tpl"} {include file=footer.tpl}

View file

@ -1,7 +1,7 @@
<div id="{$id}" class="entry"> <div id="{$id}" class="entry">
<h3 class="entrytitle"> <a href="{$id|link:post_link}">{$subject|tag:the_title}</a></h3> <h3 class="entrytitle"> <a href="{$id|link:post_link}">{$subject|tag:the_title}</a></h3>
{$date|date_format:'<h2 class="date">%B %d, %Y @ %H:%M</h2>'} {$date|date_format:'<h2 class="date">%B %d, %Y @ %H:%M</h2>'}
{include file="shared:entryadminctrls.tpl"} {include file=shared:entryadminctrls.tpl}
{$content|tag:the_content} {$content|tag:the_content}

View file

@ -1,9 +1,9 @@
{include file="header.tpl"} {include file=header.tpl}
{include file="widgets.tpl"} {include file=widgets.tpl}
<div id="main"> <div id="main">
{entry_block} {entry_block}
{entry} {entry}
{include file="entry-default.tpl"} {include file='entry-default.tpl'}
{/entry} {/entry}
<div class="navigation"> <div class="navigation">
{nextpage}{prevpage} {nextpage}{prevpage}
@ -11,4 +11,4 @@
{/entry_block} {/entry_block}
</div> </div>
{include file="footer.tpl"} {include file=footer.tpl}

View file

@ -17,6 +17,7 @@ body {
color: #CCCCCC; color: #CCCCCC;
padding: 0; padding: 0;
text-align: center; text-align: center;
/*background: #315A94;*/
background-image: url("../imgs/background.jpg"); background-image: url("../imgs/background.jpg");
background-size: cover; background-size: cover;
background-position: bottom center; background-position: bottom center;
@ -24,7 +25,7 @@ body {
background-size:cover; background-size:cover;
background-attachment:fixed; background-attachment:fixed;
background-color: #222; background-color: #222;
text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.8);
} }
hr { display: none } hr { display: none }
@ -35,6 +36,7 @@ blockquote {
width: 90%; width: 90%;
margin: 1em 1em; margin: 1em 1em;
padding: 0 10px; padding: 0 10px;
/*border-left: 10px solid white;*/
border-left: 10px solid #daaa55; border-left: 10px solid #daaa55;
background-image: linear-gradient(to bottom, rgba(0,0,0,0.2), rgba(0,0,0,0.1)); background-image: linear-gradient(to bottom, rgba(0,0,0,0.2), rgba(0,0,0,0.1));
} }
@ -45,7 +47,10 @@ pre, code {
} }
pre { pre {
border: 1px solid #555; border: 1px solid #555;
/*background-color: #444444;*/
background-color: rgba(0, 0, 0, 0.3); background-color: rgba(0, 0, 0, 0.3);
color: #CCCCCC; color: #CCCCCC;
overflow: auto; overflow: auto;
@ -59,7 +64,7 @@ pre {
:not(pre) > code { :not(pre) > code {
background-color: rgba(0, 0, 0, 0.3); background-color: rgba(0, 0, 0, 0.3);
border-radius: 3px; border-radius: 3px;
padding: 3px 4px; padding: 0px 3px;
} }
ul, li, ol { margin: 0; padding: 0 } ul, li, ol { margin: 0; padding: 0 }
@ -108,12 +113,14 @@ textarea {
/* ===== LINKS GENERAL ===== */ /* ===== LINKS GENERAL ===== */
a:link, a:visited { a:link, a:visited {
/*color: #0066ff;*/
color: #e69138; color: #e69138;
font-weight: bold; font-weight: bold;
text-decoration: none text-decoration: none
} }
a:hover { a:hover {
/*color: #1100FF;*/
color: #f6b26b; color: #f6b26b;
text-decoration: underline text-decoration: underline
} }
@ -132,17 +139,17 @@ h6 { font-size: 0.9em }
text-align: left; text-align: left;
width: 72% !important; width: 72% !important;
width: 72%; /* fix for I.E. */ width: 72%; /* fix for I.E. */
margin: 0 auto 20px auto; margin: 0 auto 0 auto;
padding: 5px; padding: 5px;
/* background-color: #2D2D2D;*/
background-color: rgba(45, 45, 45, 0.8); background-color: rgba(45, 45, 45, 0.8);
box-shadow: 3px 3px 15px rgba(0,0,0,0.8);
overflow: hidden; overflow: hidden;
border-radius: 15px; border-radius: 15px;
} }
/* ===== HEAD ===== */ /* ===== HEAD ===== */
#head { #head {
/*background: url("../imgs/logo.jpg") no-repeat;*/
width: 680px; !important; width: 680px; !important;
width: 680px; width: 680px;
height: 128px; height: 128px;
@ -150,6 +157,7 @@ h6 { font-size: 0.9em }
float: center; float: center;
} }
#head-bubble { #head-bubble {
/* background-color: rgba(0, 0, 0, 0.2);*/
background-image: linear-gradient(to bottom, rgba(0,0,0,0.2), rgba(0,0,0,0.1)); background-image: linear-gradient(to bottom, rgba(0,0,0,0.2), rgba(0,0,0,0.1));
border-radius: 15px; border-radius: 15px;
width: 100% !important; width: 100% !important;
@ -168,6 +176,7 @@ h6 { font-size: 0.9em }
} }
#logo-img { #logo-img {
/*background: url("../imgs/Mandrake-Tux_redraw.png");*/
max-height: 120px; max-height: 120px;
max-width: 90px; max-width: 90px;
} }
@ -232,6 +241,8 @@ ol li, ul li { padding-bottom: 0.9em }
#comments li { #comments li {
margin: 0 0 1.5em 0; margin: 0 0 1.5em 0;
padding: 5px; padding: 5px;
/*border-top: 2px solid #6699FF;
border-bottom: 2px solid #6699FF;*/
border-top: 2px solid #f6b26b; border-top: 2px solid #f6b26b;
border-bottom: 2px solid #f6b26b; border-bottom: 2px solid #f6b26b;
background: #2D2D2D; background: #2D2D2D;
@ -244,7 +255,9 @@ ol li, ul li { padding-bottom: 0.9em }
#comments li.comment-admin strong.comment-name { font-size:160% } #comments li.comment-admin strong.comment-name { font-size:160% }
#comments li.comment-admin { #comments li.comment-admin {
/*background-color: #DAAA55;*/
background-color: #393939; background-color: #393939;
/*color: black;*/
padding: 1em; padding: 1em;
} }
@ -267,6 +280,8 @@ ol li, ul li { padding-bottom: 0.9em }
.entry p { font-size: 16px } .entry p { font-size: 16px }
.entry-title { .entry-title {
/*color: #26a269;*/
/* ubuntu color background term color: #380c2a; */
color: #daaa55; color: #daaa55;
} }
@ -308,6 +323,8 @@ ol li, ul li { padding-bottom: 0.9em }
/* ===== FOOTER ===== */ /* ===== FOOTER ===== */
#footer { #footer {
text-align: center; text-align: center;
/* background: #2D2D2D;*/
/* background-color: rgba(0, 0, 0, 0.2);*/
background-image: linear-gradient(to bottom, rgba(0,0,0,0.0), rgba(0,0,0,0.2)); background-image: linear-gradient(to bottom, rgba(0,0,0,0.0), rgba(0,0,0,0.2));
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
@ -317,4 +334,6 @@ ol li, ul li { padding-bottom: 0.9em }
font-size: 80%; font-size: 80%;
padding: 8px; padding: 8px;
margin: 0px 5px 5px 5px; margin: 0px 5px 5px 5px;
/*border-top: #315A94 2px solid*/
/*border-top: #393939 2px solid*/
} }

View file

@ -1,4 +1,4 @@
{include file="header.tpl"} {include file=header.tpl}
<div id="main"> <div id="main">
{static_block} {static_block}
{static} {static}
@ -11,5 +11,5 @@
{/static_block} {/static_block}
</div> </div>
{include file="widgets.tpl"} {include file=widgets.tpl}
{include file="footer.tpl"} {include file=footer.tpl}