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

This commit is contained in:
Kasper Rynning-Tønnesen
2015-04-16 11:43:47 +02:00
2 changed files with 14 additions and 6 deletions

View File

@@ -17,13 +17,13 @@
<div class="navbar-fixed">
<nav id="nav">
<div class="nav-wrapper">
<a href="/" class="brand-logo hide-on-small-only">
<a href="/" class="brand-logo hide-on-small-only zbrand">
<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 hide" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></span>
<span id="chan" class="chan" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></span>
</div>
<ul class="right">
<li>

View File

@@ -60,6 +60,11 @@ main {
flex: 1 0 auto;
}
nav .zbrand{
display: inline;
position: relative;
}
.fullwidth{
width:100%;
}
@@ -120,7 +125,7 @@ hide mdi-action-visibility mdi-action-visibility-off
/* INDEX PAGE */
#zicon{
height: 100%;
height: 64px;
transition: padding 1s ease;
}
@@ -172,12 +177,15 @@ hide mdi-action-visibility mdi-action-visibility-off
.list-image{
width: 34%;
height: 11%;
height: 66px;
float: left;
}
.list-song{background-color: rgba(255, 255, 255, 0.1);}
.list-song{
background-color: rgba(255, 255, 255, 0.04);
height:66px;
}
.list-song .card-content{padding:0;}
.list-title{
display:block;