Pulled from remote and merged locally.

This commit is contained in:
Nils N Haukas 2012-07-06 20:33:04 +02:00
parent 1fe8caa089
commit f7e4bd05a0
2 changed files with 36 additions and 21 deletions

View File

@ -5,8 +5,8 @@
website: http://ogp.me/ns/website#">
<title>infoSoul - the game</title>
<link rel="icon" href="pill_red.ico" type="image/x-icon" />
<link rel="shortcut icon" href="pill_red.ico" type="image/x-icon" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="style.css" />
<script type="text/javascript" src="jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="infosoul.js"></script>
@ -33,7 +33,6 @@
<div id="wrapper">
<div id="header" class="wrappertext">
<h1>infoSoul</h1>
<p class="tagline">"Searching for yourself, </br>
drowning in information."</p>

View File

@ -4,8 +4,8 @@ p, h2, h1 {
font-family: 'CallunaRegular', arial;
}
h1, h2 {
color: #87a585;
h1, h2, p strong {
color: #2f2f2f;
}
h1 {
@ -17,22 +17,29 @@ h2 {
margin: 0;
}
a:link {
color:#2f2f2f;
text-decoration: none;
}
a:visited {
color:#2f2f2f;
}
a:hover {
color:#0b0b0b;
text-decoration: underline;
}
a:active {
color:#0b0b0b;
}
html {
overflow: hidden;
}
.wrappertext {
margin: 0 0 0 17px;
}
/*
#header {
width: 250px;
}*/
/*
#header > * {
float: left;
display:inline-block;
width: 250px;
}
*/
body {
background-image:url('images/bg_tile3.png');
margin: 0;
@ -48,7 +55,6 @@ body {
-webkit-box-shadow: 0px 0px 10px 0px #ccc;
-moz-box-shadow: 0px 0px 10px 0px #ccc;
box-shadow: 0px 0px 10px 0px #ccc;
}
#gamediv{
@ -62,11 +68,17 @@ body {
padding: 15px 14px 15px 14px;
font-family: 'VerilySerifMonoBook',monospace;
font-size: 1em;
margin-bottom: 18px;
margin-bottom: 18px;
}
#Soundcloud {
.Soundcloud {
width: 190px;
position: relative;
top: 5px;
}
.Soundcloud-credit {
font-size: 75%;
}
.infobox {
@ -93,4 +105,8 @@ body {
/* For IE 6/7 (trigger hasLayout) */
.cf {
zoom:1;
}
}
.fb_edge_widget_with_comment {
left: 132px;
top: 9px;
}