We use cookies to ensure you get the best experience on our website
Начало Каталог Помощ
Регистрация Вход
0ct0pu5
/
yellow
1
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

Core update (summer style remix)

markseu преди 11 години
родител
6045fb75b6
ревизия
6282d15741
променени са 6 файла, в които са добавени 14 реда и са изтрити 14 реда
Обединен изглед Покажи статистика за разликите
  1. 1 1
      README.md
  2. 8 9
      media/styles/default.css
  3. 2 2
      system/core/core.php
  4. 0 2
      system/snippets/header.php
  5. 2 0
      system/snippets/sitename.php
  6. 1 0
      system/templates/default.php

+ 1 - 1
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).

 Yellow is for people who make websites. [Visit website](http://datenstrom.se/yellow).

+ 8 - 9
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; }
 
 html, body, div, form, pre, span, tr, th, td { margin:0; padding:0; border:0; vertical-align:baseline; }
 
 body { 
 body { 
@@ -15,22 +15,22 @@ code { font-size:1.1em; }
 
 a { color:#07d; }
 
 a { color:#07d; }
 
 a:hover { color:#07d; text-decoration:underline; }
 
 a:hover { color:#07d; text-decoration:underline; }
 
 a, img { border:none; text-decoration:none; }
 
 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 { margin-bottom:1em; border-bottom:1px solid #ddd; line-height:2em; }
 
 .navigation a { color:#111; padding:0 0.3em; display:inline-block; }
 
 .navigation a { color:#111; padding:0 0.3em; display:inline-block; }
 
 .navigation a:hover { color:#07d; }
 
 .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 { color:#111; }
 
 .navigation li a.active:hover { color:#07d; }
 
 .navigation li a.active:hover { color:#07d; }
 
 .navigation li { display:inline; }
 
 .navigation li { display:inline; }
 
-.navigation ul { margin:0 -0.3em; padding:0; list-style:none; }
 
 .pagination { margin:1em 0; }
 
 .pagination { margin:1em 0; }
 
 .content h1 a:hover { text-decoration:none; }
 
 .content h1 a:hover { text-decoration:none; }
 
 .content img { max-width:100%; height:auto; }
 
 .content img { max-width:100%; height:auto; }
 
 .content form { margin:1em 0; }
 
 .content form { margin:1em 0; }
 
 .content .flexible { position:relative; padding-bottom:56.25%; padding-top:30px; }
 
 .content .flexible { position:relative; padding-bottom:56.25%; padding-top:30px; }
 
 .content .flexible iframe { position:absolute; top:0; left:0; width:100%; height:100%; }
 
 .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 { color:#717171; }
 
 .footer a:hover { color:#07d; text-decoration:underline; }
 
 .footer a:hover { color:#07d; text-decoration:underline; }
 
 .left { float:left; margin:0 1em 0 0; }
 
 .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; }
 
 .page { margin:0 auto; max-width:62em; }
 
 
 
 @media screen and (min-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) { 
 @media screen and (max-width:30em) { 
 	body { margin:0.5em; font-size:0.9em; }
 
 	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 {
 
 @media print {
 
 	body, h1, h2, h3, h4, h5, h6 { background-color:white; color:black; }
 
 	body, h1, h2, h3, h4, h5, h6 { background-color:white; color:black; }

+ 2 - 2
system/core/core.php
Целия файл 

@@ -5,7 +5,7 @@
 
 // Yellow main class
 
 // Yellow main class
 
 class Yellow
 
 class Yellow
 
 {
 
 {
 
-	const Version = "0.3.10";
 
+	const Version = "0.3.11";
 
 	var $page;				//current page
 
 	var $page;				//current page
 
 	var $pages;				//pages from file system
 
 	var $pages;				//pages from file system
 
 	var $config;			//configuration
 
 	var $config;			//configuration
 
@@ -1550,7 +1550,7 @@ class YellowToolbox
 
 	{
 
 	{
 
 		if(!preg_match("/^\w+:/", html_entity_decode($location, ENT_QUOTES, "UTF-8")))
 
 		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;
 
 				$location = $this->getDirectoryLocation($pageBase.$pageLocation).$location;
 
 			}
 
 			}

+ 0 - 2
system/snippets/header.php
Целия файл 

@@ -12,5 +12,3 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <div class="page">
 
 <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>

+ 2 - 0
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>

+ 1 - 0
system/templates/default.php
Целия файл 

@@ -1,4 +1,5 @@
 
 <?php $yellow->snippet("header") ?>
 
 <?php $yellow->snippet("header") ?>
 
+<?php $yellow->snippet("sitename") ?>
 
 <?php $yellow->snippet("navigation") ?>
 
 <?php $yellow->snippet("navigation") ?>
 
 <?php $yellow->snippet("content") ?>
 
 <?php $yellow->snippet("content") ?>
 
 <?php $yellow->snippet("footer") ?>
 
 <?php $yellow->snippet("footer") ?>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5