Merge branch 'dev' of https://github.com/nixolas1/Zoff into dev

This commit is contained in:
Kasper Rynning-Tønnesen
2015-04-16 13:33:17 +02:00
2 changed files with 13 additions and 6 deletions

View File

@@ -12,18 +12,18 @@
<?php include("php/header.php"); ?>
<link rel="stylesheet" type="text/css" href="static/css/controlstyle.css" />
</head>
<body>
<body id="channelpage">
<header>
<div class="navbar-fixed">
<nav id="nav">
<div class="nav-wrapper">
<a href="/" class="brand-logo hide-on-small-only zbrand">
<a href="/" class="brand-logo hide-on-small-only">
<img id="zicon" src="static/images/squareicon_small.png" alt="zöff" title="Zöff">
</a>
<div class="brand-logo">
<div class="brand-logo zbrand">
<a href="//zoff.no" class="hide-on-med-and-up">Zöff</a>
<span class="hide-on-med-and-up">/</span>
<span id="chan" class="chan" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></span>
<span id="chan" class="chan clickable" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></span>
</div>
<ul class="right">
<li>

View File

@@ -61,8 +61,7 @@ main {
}
nav .zbrand{
display: inline;
position: relative;
left:90px;
}
.fullwidth{
@@ -142,6 +141,9 @@ hide mdi-action-visibility mdi-action-visibility-off
margin-left: 25%;
}
#channelpage{
background-color:#2D2D2D;
}
.main{
width: 100%;
@@ -164,6 +166,11 @@ hide mdi-action-visibility mdi-action-visibility-off
position: relative;
}
.chan{
opacity: 0.9;
text-shadow: 4px 4px 9px rgba(0, 0, 0, 0.42);
}
.nav-btn
{