Merge branch 'master' of https://github.com/MakerTim/PHP-template

MakerTim · Jun 12, 2015 · 8efbe58 · 8efbe58
2 parents 58268c4 + 1a36a18
commit 8efbe58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CSS/style.css b/CSS/style.css
@@ -66,7 +66,7 @@ body {
 .Pagina .Menu ul li {
 	display: inline;
 	margin: 0;
-	padding: 15px;
+	padding: 7px;
 	padding-top: 18px;
 	border: 0px solid $Menu_Outline;
 }

diff --git a/Classes/Header.php b/Classes/Header.php
@@ -28,7 +28,7 @@ public static function getMetaTags() {
 				$ret .= '<meta name="Slurp" content="noydir" />'. PHP_EOL;
 			}
 			$ret .= '<meta name="description" content=' . str_replace(array('\n.', '\n\n', '\n', '  '), ' ', 
-					json_encode(strip_tags(implode(' ', array_slice(explode(' ', $GLOBALS['pageContent']->content), 0, 25))))) . ' />'. PHP_EOL;
+					json_encode(strip_tags(implode(' ', array_slice(explode(' ', $GLOBALS['pageContent']->content), 0, 20))))) . ' />'. PHP_EOL;
 			$builder = '';
 			foreach(MktConfig::$keys as $key) {
 				$builder .= $key . ', ';

diff --git a/Content/Pages/contact.xml b/Content/Pages/contact.xml
@@ -0,0 +1,13 @@
+<Page>
+	<Menu>
+		<Index>Contact</Index>
+		<Banner>true</Banner>
+		<SideBar>true</SideBar>
+		<Sub>test</Sub>
+	</Menu>
+	<Md>
+# Contact
+---
+
+	</Md>
+</Page>