commit 6282d1574156f2395d3f51f63c53ebb5ffe8c1ad
parent 6045fb75b69b1e0cde8f5ff5313fdee081d267cd
Author: markseu <mark2011@mayberg.se>
Date: Thu, 7 Aug 2014 21:42:28 +0200
Core update (summer style remix)
Diffstat:
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Yellow 0.3.10
+Yellow 0.3.11
=============
Yellow is for people who make websites. [Visit website](http://datenstrom.se/yellow).
diff --git a/media/styles/default.css b/media/styles/default.css
@@ -1,4 +1,4 @@
-/* Yellow default style 0.3.3 */
+/* Yellow default style 0.3.11 */
html, body, div, form, pre, span, tr, th, td { margin:0; padding:0; border:0; vertical-align:baseline; }
body {
@@ -15,22 +15,22 @@ code { font-size:1.1em; }
a { color:#07d; }
a:hover { color:#07d; text-decoration:underline; }
a, img { border:none; text-decoration:none; }
-.header h1 { margin-top:0.5em; margin-bottom:0em; font-size:2.5em; }
-.header a { color:#111; text-decoration:none; }
+.sitename h1 { margin-top:0.5em; margin-bottom:0em; font-size:2.5em; }
+.sitename a { color:#111; text-decoration:none; }
.navigation { margin-bottom:1em; border-bottom:1px solid #ddd; line-height:2em; }
.navigation a { color:#111; padding:0 0.3em; display:inline-block; }
.navigation a:hover { color:#07d; }
+.navigation ul { margin:0 -0.3em; padding:0; list-style:none; }
.navigation li a.active { color:#111; }
.navigation li a.active:hover { color:#07d; }
.navigation li { display:inline; }
-.navigation ul { margin:0 -0.3em; padding:0; list-style:none; }
.pagination { margin:1em 0; }
.content h1 a:hover { text-decoration:none; }
.content img { max-width:100%; height:auto; }
.content form { margin:1em 0; }
.content .flexible { position:relative; padding-bottom:56.25%; padding-top:30px; }
.content .flexible iframe { position:absolute; top:0; left:0; width:100%; height:100%; }
-.footer { margin-top:1em; padding:0.5em 0em; border-top:1px solid #ddd; }
+.footer { margin-top:1em; padding:1em 0em; border-top:1px solid #ddd; }
.footer a { color:#717171; }
.footer a:hover { color:#07d; text-decoration:underline; }
.left { float:left; margin:0 1em 0 0; }
@@ -42,13 +42,12 @@ a, img { border:none; text-decoration:none; }
.page { margin:0 auto; max-width:62em; }
@media screen and (min-width:62em) {
- body { width:60em; margin:1em auto; }
- .page{ margin:0; max-width:none; }
+ body { width:62em; margin:1em auto; }
}
@media screen and (max-width:30em) {
body { margin:0.5em; font-size:0.9em; }
- .header h1, h1, h2 { font-size:1.3em; }
- .header h1, .header, .navigation, .footer, .page { margin:0; padding:0; }
+ .sitename h1, h1, h2 { font-size:1.3em; }
+ .sitename h1, .sitename, .navigation, .footer, .page { margin:0; padding:0; border:0; }
}
@media print {
body, h1, h2, h3, h4, h5, h6 { background-color:white; color:black; }
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
// Yellow main class
class Yellow
{
- const Version = "0.3.10";
+ const Version = "0.3.11";
var $page; //current page
var $pages; //pages from file system
var $config; //configuration
@@ -1550,7 +1550,7 @@ class YellowToolbox
{
if(!preg_match("/^\w+:/", html_entity_decode($location, ENT_QUOTES, "UTF-8")))
{
- if(preg_match("/^[^\/]+$/", $location))
+ if(!preg_match("/^\//", $location))
{
$location = $this->getDirectoryLocation($pageBase.$pageLocation).$location;
}
diff --git a/system/snippets/header.php b/system/snippets/header.php
@@ -12,5 +12,3 @@
</head>
<body>
<div class="page">
-<div class="header"><h1><a href="<?php echo $yellow->page->base."/" ?>"><?php echo $yellow->page->getHtml("sitename") ?></a></h1></div>
-<div class="header-banner"></div>
diff --git a/system/snippets/sitename.php b/system/snippets/sitename.php
@@ -0,0 +1,2 @@
+<div class="sitename"><h1><a href="<?php echo $yellow->page->base."/" ?>"><?php echo $yellow->page->getHtml("sitename") ?></a></h1></div>
+<div class="sitename-banner"></div>
diff --git a/system/templates/default.php b/system/templates/default.php
@@ -1,4 +1,5 @@
<?php $yellow->snippet("header") ?>
+<?php $yellow->snippet("sitename") ?>
<?php $yellow->snippet("navigation") ?>
<?php $yellow->snippet("content") ?>
<?php $yellow->snippet("footer") ?>
\ No newline at end of file
