Permalink
Browse files

Merge branch 'master' of github.com:nodebox/nodebox.net

  • Loading branch information...
fdb committed Jun 27, 2012
2 parents 3d391bd + 1a6f50f commit cbf0dc53b7af04578d923d4e96dfcff8dcf860ec
View
@@ -52,37 +52,37 @@ <h3><a target="_parent" href="/">Generative software for creatives</a></h3>
</ul>
</div>
</nav>
-<div class="headerb">
+<!--<div class="headerb">
<div class="container">
<div class="sixteen columns">
<h1>.</h1>
</div>
- </div>
-</div>
+ </div>
+</div> -->
<div id="content" class="container">
{{ content }}
</div> <!-- .content -->
<footer>
<div class="container">
- <div class="four columns">
+ <div class="four columns footlink">
<h2><a href="/software/">Software</a></h2>
<ul>
<li><a href="/node/">NodeBox 3</a></li>
<li><a href="/code/">NodeBox 1</a></li>
<li><a href="/opengl/">NodeBox OpenGL</a></li>
</ul>
</div>
- <div class="four columns">
+ <div class="four columns footlink">
<h2><a href="/exhibition/">Exhibition</a></h2>
<ul>
<li><a href="/gallery/">Gallery</a></li>
<li><a href="/projects/">Projects</a></li>
<li><a href="/workshops/">Workshops</a></li>
</ul>
</div>
- <div class="four columns">
+ <div class="four columns footlink">
<h2><a href="/documentation/">Documentation</a></h2>
<ul>
<li><a href="/node/tutorial/">Tutorial</a></li>
@@ -91,7 +91,7 @@ <h2><a href="/documentation/">Documentation</a></h2>
<li><a href="/node/reference/">Reference</a></li>
</ul>
</div>
- <div class="four columns">
+ <div class="four columns footlink">
<h2><a href="/community/">Community</a></h2>
<ul>
<li><a href="http://forum.nodebox.net/">Forum</a></li>
View
@@ -76,15 +76,15 @@ <h2>Blog</h2>
<div class="eight columns community">
<h2>Stay in touch</h2>
- <div class="four columns alpha">
+ <div class="four columns omega">
<h3>Newsletter</h3>
<p>Sign up for the monthly newsletter.</p>
<form method="post">
<input type="email" placeholder="Email address" /><br>
<input class="sign" type="submit" value="Signup" />
</form>
</div>
- <div class="four columns omega">
+ <div class="four columns alpha">
<h3>Community</h3>
<ul>
<li><a href="http://forum.nodebox.net/">Forum</a></li>
View
@@ -213,6 +213,8 @@ nav li a:hover {
/* border-right: 1px solid #999;*/
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
+ margin-bottom:5px;
+ margin-top:5px;
}
#content img + small {
@@ -271,7 +273,7 @@ hr {
float:left;
height:25px;
width:50%;
- margin-top:10px;
+ margin-top:15px;
background-color:rgb(112,175,180);
border-left: 1px solid #999;
border-top-left-radius: 0px;
@@ -295,10 +297,17 @@ hr {
/* Footer */
footer {
+ background: rgb(0,0,0) url(../img/header-gradientb-flip.jpg) repeat-x top left;
margin: 2em 0;
padding: 1em 0;
font-size: 75%;
border-top: 1px solid #5a5d6a;
+ color: #fff;
+}
+
+footer .container{
+background: url(../img/foot-background.jpg) no-repeat top left;
+margin-top:15px;
}
footer h2 {
@@ -308,7 +317,7 @@ footer h2 {
}
footer a {
- color: #302f6a;
+ color: #eee;
text-decoration: none;
}
@@ -331,6 +340,38 @@ footer .copyright {
margin-top: 10px;
}
+.four.columns.footlink h2{
+ background-color:#000;
+ float:left;
+ height:25px;
+ width:100%;
+ margin-top: -25px;
+ background-color:rgb(112,175,180);
+ border-left: 1px solid #999;
+ border-top-left-radius: 0px;
+ border-top-right-radius: 0px;
+ border-right: 1px solid #999;
+ border-bottom-right-radius: 8px;
+ border-bottom-left-radius: 8px;
+ padding-left:10px;
+ padding-top:10px;
+ font-size: 14px;
+ text-transform: uppercase;
+ color: #fff;
+}
+
+.four.columns span{
+ margin-bottom:10px;
+ margin-left:0px;
+ width:100%;
+ text-transform:uppercase;
+ font-size:80%;
+ line-height: 5px;
+
+
+}
+
+
/* Homepage */
#home #page-wrap {
@@ -388,6 +429,11 @@ footer .copyright {
border: 0px;
box-shadow: 0 0 0px;
}
+
+#home .app img{
+margin-top:-5px;
+}
+
#home .app .screenshot{
margin-top:-10px;
border-left: 1px solid #999;
@@ -648,6 +694,14 @@ img.node-icon {
font-weight: bold;
}
+.four.columns.omega h3,.four.columns.omega p{
+ margin-bottom:6githpx;
+}
+
+.four.columns.alpha h3{
+ margin-left:15px;
+}
+
/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
@media only screen and (min-width: 480px) and (max-width: 767px) {
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cbf0dc5

Please sign in to comment.