summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2011-06-01 17:51:39 +0200
committerPhilip Häusler <msquare@notrademark.de>2011-06-01 17:51:39 +0200
commit54aa90e6414b2e23d02915495b66d64e8ba6e286 (patch)
tree542a3f0f9acc981bc9182cc46dec79d80f7cd911
parentac8dbe835e368b9c7d97584c3722206b134db890 (diff)
html5, css rewrite
-rw-r--r--includes/funktion_activeUser.php2
-rw-r--r--includes/funktion_menu.php2
-rw-r--r--includes/header.php6
-rw-r--r--includes/menu.php8
-rw-r--r--www-ssl/css/base.css21
-rw-r--r--www-ssl/css/style1.css85
6 files changed, 64 insertions, 60 deletions
diff --git a/includes/funktion_activeUser.php b/includes/funktion_activeUser.php
index ca6e3aaa..631ec2d1 100644
--- a/includes/funktion_activeUser.php
+++ b/includes/funktion_activeUser.php
@@ -11,7 +11,7 @@ $SQL = "SELECT UID, Nick, lastLogIn " .
$Erg = mysql_query($SQL, $con);
-echo "<ul>";
+echo "<ul class=\"content\">";
for ($i = 0; $i < mysql_num_rows($Erg); $i++) {
echo "<li>";
diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php
index 3d20420b..8246dcc5 100644
--- a/includes/funktion_menu.php
+++ b/includes/funktion_menu.php
@@ -37,6 +37,6 @@ function ShowMenu($MenuName) {
}
}
if ($Gefunden)
- echo '<nav><h4>' . Get_Text("$MenuName/") . '</h4><ul>' . $Text . '</ul></nav>';
+ echo '<nav class="container"><h4>' . Get_Text("$MenuName/") . '</h4><ul class="content">' . $Text . '</ul></nav>';
} //function ShowMenue
?>
diff --git a/includes/header.php b/includes/header.php
index 750c82fb..d4f212d9 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -40,7 +40,7 @@ echo "</head>\n";
/////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////// B O D Y
/////////////////////////////////////////////////////////////////////////////////////////////
-echo "<body>\n";
+echo "<body class=\"background\">\n";
echo '<header><a href="' . $url . $ENGEL_ROOT . '" id="logo"></a></header>';
@@ -69,12 +69,12 @@ if ($_SESSION['Menu'] == "L")
include ("menu.php");
?>
</div>
-<div id="content">
+<div id="content" class="container">
<?php
echo '<h1>' . (strlen($header) == 0 ? Get_Text($Page["Name"]) : $header) . '</h1>';
-echo '<article>';
+echo '<article class="content">';
if (isset ($_SESSION['UID'])) {
if (isset ($_SESSION['oldurl']))
diff --git a/includes/menu.php b/includes/menu.php
index 61a3ea73..3ca5e8ae 100644
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -31,26 +31,28 @@ if ($submenus >= 1) {
<br />
<?php
+
}
}
if (isset ($_SESSION['UID'])) {
?>
-<nav>
+<nav class="container">
<?php include("funktion_activeUser.php"); ?>
</nav>
<?php
+
}
?>
-<nav>
+<nav class="container">
<h4><?php echo Get_Text("Sprache") ?></h4>
<?php
+
include ("funktion_flag.php");
?>
</nav>
- </td>
<!-- ende des menue parts //-->
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 27e20788..6c0bc298 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -4,7 +4,6 @@
}
body {
- background: #f0f0f0;
font-family: Arial;
sans-serif;
font-size:
@@ -78,18 +77,22 @@ nav {
margin: 0 10px 10px 0;
}
-nav, #content {
- border: 1px solid #888;
-}
-
#content article {
padding: 10px;
}
-nav ul, nav p, #content article {
- background: #fff;
-}
-
a.sprache img {
margin: 5px;
}
+
+.background {
+ background: #f0f0f0;
+}
+
+.container {
+ border: 1px solid #888;
+}
+
+.content {
+ background: #fff;
+}
diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css
index 8fec5db0..fd8426f1 100644
--- a/www-ssl/css/style1.css
+++ b/www-ssl/css/style1.css
@@ -1,84 +1,83 @@
-body {
- background-color: #131313;
-
- color: #424242;
-
- line-height: 150%;
- font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif;
-
- margin-bottom: 20px;
+body, .background {
+ background-color: #131313;
+ color: #424242;
+ line-height: 150%;
+ font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif;
}
a {
- text-decoration: none;
- color: #424242
+ text-decoration: none;
+ color: #424242
}
td {
- font-size: small
+ font-size: small
}
a:active, a:hover {
- font-weight: bold
+ font-weight: bold
}
-
+
li {
- font-size: small
+ font-size: small
}
.content {
- background-color: #131313;
- color: #424242;
+ background-color: #131313;
+ color: #424242;
}
-.contenttopic {
- font-weight: bold;
- font-size: small;
- color: #000000;
- background-color: #333333
+.contenttopic, h1 {
+ font-weight: bold;
+ font-size: small;
+ color: #000000;
+ background-color: #333333
}
-.border {
- background-color: #333333
+.border, .container {
+ background-color: #333333;
+ border: 1px solid #424242;
}
.menu {
- background-color: #131313;
- color: #424242;
- font-size: small
+ background-color: #131313;
+ color: #424242;
+ font-size: small
}
-h4.menu {
- background-color: #333333;
- font-weight: bold;
- font-size: small;
- color: #000000
+
+h4 {
+ background-color: #333333;
+ font-weight: bold;
+ font-size: small;
+ color: #000000
}
.linkbox {
- background-color: #ffffff
+ background-color: #ffffff
}
.linkboxtitle {
- font-weight: bold;
- background-color: #000000;
- color: #ffffff
+ font-weight: bold;
+ background-color: #000000;
+ color: #ffffff
}
.question {
- font-weight: bold;
- font-size: 9pt
+ font-weight: bold;
+ font-size: 9pt
}
.engeltreffen {
- font-weight: bold;
- font-size: 9pt;
- color: #ff0000;
+ font-weight: bold;
+ font-size: 9pt;
+ color: #ff0000;
}
.answer {
- font-size: 9pt;
+ font-size: 9pt;
}
+
.comment {
- font-size : 6pt;
+ font-size: 6pt;
}