This commit is contained in:
nikolark committed 2013-05-06 23:11:07 +02:00
1 parent deeafec302
commit 8403f0487d
4 files changed
+15 -11

No files matched your search

+3 -1
View File
@@ -548,6 +548,7 @@ header.header .nav-menu a:hover { background-color: #ff005c; }
.separator { height: 2px; background-color: #ff005c; margin: 2em 0; }
.separator.tiny-margin { margin-top: 0; margin-bottom: 0.4em; }
article { margin-bottom: 1em; }
article .article-header h1 a { color: inherit; }
article .article-header h1 a:hover { color: #007aff; }
article .article-header h4 a { color: #ff005c; }
@@ -579,6 +580,7 @@ article .article-footer { text-align: right; margin-bottom: 2em; }
.flying-megawhale { width: 719px; height: 582px; background-image: url("../images/megawhale.png"); background-size: 100% 100%; background-repeat: no-repeat; margin: auto; margin-top: 4em; position: relative; top: 50px; z-index: -1; }
.wave { position: fixed; left: 0px; bottom: 0px; height: 30px; width: 100%; background-color: #007aff; }
.wave .wavetop { position: relative; bottom: 12px; height: 12px; background-image: url("../images/wave_top.png"); background-size: 48px 12px; background-repeat: repeat-x; width: 100%; }
.wavetop { position: relative; bottom: 12px; height: 12px; background-image: url("../images/wave_top.png"); background-size: 48px 12px; background-repeat: repeat-x; width: 100%; }
.row { /* FIXME: responsive */ width: 1000px; max-width: 1000px; }
+1
View File
@@ -1,6 +1,7 @@
<div class="wave"><div class="wavetop"></div></div>
<div class="flying-megawhale"></div>
<footer class="footer" role="contentinfo">
<div class="wavetop"></div>
<div id="inner-footer">
<a href="http://studentersamfundet.no/"><img src="<?php echo get_template_directory_uri(); ?>/images/streamer.png" /></a>
<!--<nav role="navigation">
@@ -23,7 +23,6 @@
<?php if (is_sticky($post->ID)): ?>
<?php get_template_part( 'content', 'sticky' ); ?>
<?php else: ?>
<!-- FIXME: -->
<?php get_template_part( 'content' ); ?>
<?php endif; ?>
<?php endwhile; ?>
+11 -9
View File
@@ -177,6 +177,8 @@ header.header {
}
}
article {
margin-bottom: 1em;
.article-header {
h1 a {
color: inherit;
@@ -288,15 +290,15 @@ article {
width:100%;
background-color: $primary-color;
.wavetop {
position: relative;
bottom: 12px;
height: 12px;
background-image: url("../images/wave_top.png");
background-size: 48px 12px;
background-repeat: repeat-x;
width:100%;
}
}
.wavetop {
position: relative;
bottom: 12px;
height: 12px;
background-image: url("../images/wave_top.png");
background-size: 48px 12px;
background-repeat: repeat-x;
width:100%;
}
.row {
/* FIXME: responsive */