Merge branch 'master' of github.com:jeena/seinheit.ch

This commit is contained in:
Logsol 2013-07-18 11:44:05 +02:00
commit d350e231b2
2 changed files with 12 additions and 17 deletions

View file

@ -1,23 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>
<?php if(Navigation::getTitle()): ?>
<?php echo Navigation::getTitle(); ?> -
<?php endif ?>
Seinheit
</title>
<link href='http://fonts.googleapis.com/css?family=Amaranth' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="<?php echo $this->base ?>/style/main.css" />
<?php if(Access::isLoggedIn()) { ?>
<link rel="stylesheet" type="text/css" href="<?php echo $this->base ?>/style/admin.css" />
<script src="<?php echo $this->base ?>/script/admin.js"></script>
<?php } ?>
<link rel="shortcut icon" href="<?php echo $this->base ?>/img/favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="Description" content="" />
<meta name="keywords" content="" />
<meta charset="utf-8">
<title><?php if(Navigation::getTitle()) echo Navigation::getTitle() . " - "; ?>Seinheit</title>
<link rel="stylesheet" type="text/css" href="<?php echo $this->base ?>/style/main.css" />
<?php if(Access::isLoggedIn()): ?>
<link rel="stylesheet" type="text/css" href="<?php echo $this->base ?>/style/admin.css" />
<script src="<?php echo $this->base ?>/script/admin.js"></script>
<?php endif ?>
</head>
<body<?php if(Access::isLoggedIn()): ?> class="admin"<?php endif ?>>

View file

@ -70,6 +70,11 @@ textarea {
box-sizing: border-box;
}
.admin textarea {
font-family: "monospace";
font-size: 0.8em;
}
#admin dl {
margin: 15px 0;
}