Skip to content

Commit

Permalink
basic footer && new layout && some page styles && etc
Browse files Browse the repository at this point in the history
  • Loading branch information
AllanD authored and mattetti committed Apr 17, 2011
1 parent 8fa1926 commit 5283cd8
Show file tree
Hide file tree
Showing 10 changed files with 185 additions and 46 deletions.
25 changes: 22 additions & 3 deletions content/_footer.txt
@@ -1,6 +1,25 @@
---
filter: erb
---
<p>MacRuby is a free software project under the Ruby license.</p>
<p>Hosting provided by <a href="http://macosforge.org">Mac OS Forge</a>. Use of this site is subject to the <a href="http://www.macosforge.org/terms/">Mac OS Forge Terms of Use</a>.</p>
<p>Website designed by <a href="http://www.boboroshi.com/">John Athayde</a> and created with <a href="http://webby.rubyforge.org/">Webby</a>.</p>

<div class="footerLinks">
<div class="innerWrapper">
Links Here
</div>
</div>
<div class="footerNav">
<div class="innerWrapper">
<ul>
<li><a href="/" title="Home">Home</a></li>
<li><a href="/news/index.html" title="News">News</a></li>
<li><a href="/source.html" title="Source">Source</a></li>
<li><a href="/documentation.html" title="Documentation">Documentation</a></li>
<li><a href="/contact-us.html" title="Contact">Contact</a></li>
</ul>
</div>
</div>
<div class="footerLegal">
<div class="innerWrapper">
<p>MacRuby is a free software project under the Ruby license. Hosting provided by <a href="http://macosforge.org">Mac OS Forge</a>. Use of this site is subject to the <a href="http://www.macosforge.org/terms/">Mac OS Forge Terms of Use</a>. Website designed by <a href="http://www.boboroshi.com/">John Athayde</a> and created with <a href="http://webby.rubyforge.org/">Webby</a>.</p>
</div>
</div>
2 changes: 1 addition & 1 deletion content/_standard-head.txt
Expand Up @@ -20,7 +20,7 @@ $(document).ready(function() {
<script type="text/javascript" src="/javascripts/shCore.js"></script>
<script type="text/javascript" src="/javascripts/shBrushJScript.js"></script>
<link rel="stylesheet" href="/stylesheets/shCore.css" type="text/css" media="screen" />
<link rel="stylesheet" href="/stylesheets/shThemeDefault.css" type="text/css" media="screen" />
<link rel="stylesheet" href="/stylesheets/shThemeEclipse.css" type="text/css" media="screen" />
<script type="text/javascript">SyntaxHighlighter.all();</script>


2 changes: 2 additions & 0 deletions content/contact-us.txt
Expand Up @@ -7,6 +7,7 @@ filter:
---
h2(headerText lobsterFont). <%= h(@page.title) %>

<section class="blockMain">
MacRuby is a free software project by Apple Inc. Many folks inside and outside of Apple contribute to this great project and we have a "MacRuby Project Team":/project.html page to list them. Please feel free to contact us if you have any questions, ideas or bugs to report.

Here's all the ways of getting ahold of us:
Expand Down Expand Up @@ -34,4 +35,5 @@ h2. Contributions
Please "file a ticket":https://www.macruby.org/trac/newticket on the "MacRuby Trac":https://www.macruby.org/trac/report component, if you want to contribute an enhancement request or a bug report. Patches with test cases are welcome.
You can also send your feedback to the MacRuby-devel mailing-list.
If you want to help us, do not hesitate to introduce yourself in the mailing-list; we will give you an overview of things that need to be done. If you want to commit your code directly in the repository, please note that you will have to sign a committer agreement first; we will provide this to you.
</section>
</section>
3 changes: 3 additions & 0 deletions content/documentation.txt
Expand Up @@ -8,6 +8,7 @@ filter:
---
h2(headerText lobsterFont). <%= h(@page.title) %>

<section class="blockMain">
<p>
Welcome to MacRuby's documentation center. Here you will find the information you need to get up and running and building OS X applications with MacRuby in no time. If you have not read the "Introductory Tutorial":/documentation/tutorial.html, its a great way to get started.
</p>
Expand All @@ -21,6 +22,7 @@ h2(headerText lobsterFont). <%= h(@page.title) %>
In addition to the documentation available here, MacRuby team member, "Matt Aimonetti":http://merbist.com keeps a HTML version of the manuscript of his "O'Reilly book":http://ofps.oreilly.com/titles/9781449380373/ online and available for free at "this url":http://ofps.oreilly.com/titles/9781449380373/.
</p>


h3(headerText lobsterFont). Screencasts

<section class="block">
Expand Down Expand Up @@ -83,4 +85,5 @@ h3(headerText lobsterFont). Talks
<% end -%>
</ul>
</section>
</section>

1 change: 1 addition & 0 deletions content/index.txt
Expand Up @@ -2,6 +2,7 @@
title: Home
created_at: 2008-08-02 14:06:40.000000 -06:00
dirty: true
layout: home
filter:
- erb
---
Expand Down
33 changes: 26 additions & 7 deletions content/source.txt
Expand Up @@ -7,17 +7,24 @@ filter:
---
h2(headerText lobsterFont). <%= h(@page.title) %>

<section class="blockMain">
<p>
Block of main text here
</p>

MacRuby development happens in the master branch of our "GitHub":https://github.com/MacRuby/MacRuby repository. However, be careful, because it may not work (or even compile) all of the time.
h3(headerText lobsterFont). MacRuby Development

<pre class="commands">
$ git clone git://github.com/MacRuby/MacRuby.git macruby
<section class="block">
MacRuby development happens in the trunk Subversion branch. However, be careful, because trunk may not work (or even compile) all of the time.

<pre class="brush: js">
$ svn co http://svn.macosforge.org/repository/ruby/MacRuby/trunk MacRuby-trunk
</pre>

If you want to grab the sources of a specific release, look for the specific branch. For example, to grab the sources of the latest release:
If you want to grab the sources of a specific release, look into the tags directory. For example, to grab the sources of the 0.7.1 release:

<pre class="commands">
$ git clone -b 0.10 git://github.com/MacRuby/MacRuby.git macruby-0.10
<pre class="brush: js;">
$ svn co http://svn.macosforge.org/repository/ruby/MacRuby/tags/0.7.1 MacRuby-0.7.1
</pre>

For building instructions, please refer to README.rdoc file, but the basic build instructions are:
Expand All @@ -27,4 +34,16 @@ $ rake
$ sudo rake install
</pre>

You can also "browse the repository":https://github.com/MacRuby/MacRuby online.
You can also "browse the repository":http://svn.macosforge.org/repository/ruby/MacRuby/trunk online.
</section>

h3(headerText lobsterFont). Git

<section class="block">
Git aficionados will be glad to learn that there is an official mirror of the SVN trunk repository available:

<pre class="brush: js;">
$ git clone git://git.macruby.org/macruby/MacRuby.git
</pre>
</section>
</section>
90 changes: 75 additions & 15 deletions content/stylesheets/main.css
Expand Up @@ -105,9 +105,6 @@ h3.headerText {
}

/* General */
html, body {
height: 100%;
}
body {
color: #404040;
font-family: verdana, sans-serif;
Expand Down Expand Up @@ -139,20 +136,19 @@ p:last-child {
margin-bottom: 0;
}

a {color: #b71515}
a:hover {color: black}
a {
color:#b71515;
outline: 0;
}
a:hover {
color: black;
}

ul {
list-style-type: none;
}
.wrapper {
position: relative;
min-height: 100%;
}
.innerWrapper {
width: 960px;
padding: 0 20px;
padding: 0 20px 20px;
margin: 0 auto;
}
/* Header */
Expand Down Expand Up @@ -272,7 +268,7 @@ header h1.logo a {

.grid,
.mainContent {
padding-bottom: 150px; /* Height of footer */
xxxpadding-bottom: 150px; /* Height of footer */
}


Expand All @@ -286,15 +282,79 @@ section.block {
-webkit-box-shadow:inset 0 0 2px white;
box-shadow:inset 0 0 2px white;
}
section.blockMain {
border: 1px solid #cecece;
padding: 20px;
-moz-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow:inset 0 0 2px white;
-webkit-box-shadow:inset 0 0 2px white;
box-shadow:inset 0 0 2px white;
}


/* Footer */
footer {
font-size: 80%;
}
footer .footerLinks {
background: #3f3f3f;
}
footer .footerNav {
width: 100%;
height: 100px;
position: absolute;
bottom: 0;
overflow:hidden;
position:relative;
background: black;
padding: 10px 0;
}
footer .footerNav a {
text-decoration: none;
color: #e4e4e5;
-moz-border-radius: 5px;
border-radius: 5px;
display: block;
border: 1px solid transparent;
padding: 0 10px;
}
footer .footerNav a:hover {
border-top: 1px solid #252525;
border-left: 1px solid #252525;
border-right: 1px solid #434343;
border-bottom: 1px solid #434343;
background: #292929;
}
footer .footerNav ul {
clear:left;
float:left;
list-style:none;
position:relative;
left:50%;
text-align:center;
}
footer .footerNav ul li {
display:block;
float:left;
list-style:none;
margin:0;
position:relative;
right:50%;
}
footer .footerLinks {}

footer .footerLegal {
background: #971111;
color: white;
padding: 10px;
text-align: center;
}
footer .footerLegal a {
color: #FBB7B7;
}
footer .footerLegal a:hover {
color: black;
}
footer p {
margin: 0;
}


Expand Down
14 changes: 9 additions & 5 deletions layouts/blog_entry.txt
Expand Up @@ -2,11 +2,15 @@
extension: html
filter: erb
---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<%= render :partial => "/standard-head" %>
<!doctype html>
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
<!--[if lt IE 7 ]> <html class="no-js ie6" lang="en"> <![endif]-->
<!--[if IE 7 ]> <html class="no-js ie7" lang="en"> <![endif]-->
<!--[if IE 8 ]> <html class="no-js ie8" lang="en"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<%= render :partial => "/standard-head" %>
</head>
<body>
<div id="nest">
<%= render :partial => "/header" %>
Expand Down
26 changes: 11 additions & 15 deletions layouts/default.txt
Expand Up @@ -13,24 +13,20 @@ filter: erb
</head>
<body>

<div class="wrapper clearfix">
<div class="innerWrapper clearfix">
<header>
<%= render :partial => "/header" %>
</header>

<div class="mainContent">
<%= @content %>
</div>
</div> <!-- End Inner Wrapper -->
<div class="wrapper clearfix">

<header>
<%= render :partial => "/header" %>
</header>
<div class="mainContent">
<%= @content %>
</div>

</div> <!-- End Wrapper -->

<footer>
<div class="innerWrapper">
<%= render :partial => "/footer" %>
</div>
</footer>
</div><!-- End Wrapper -->



<!-- Dont forget analytics -->
</body>
Expand Down
35 changes: 35 additions & 0 deletions layouts/home.txt
@@ -0,0 +1,35 @@
---
extension: html
filter: erb
---
<!doctype html>
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
<!--[if lt IE 7 ]> <html class="no-js ie6" lang="en"> <![endif]-->
<!--[if IE 7 ]> <html class="no-js ie7" lang="en"> <![endif]-->
<!--[if IE 8 ]> <html class="no-js ie8" lang="en"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<%= render :partial => "/standard-head" %>
</head>
<body>

<div class="wrapper clearfix">

<header>
<%= render :partial => "/header" %>
</header>
<div class="mainContent">
<%= @content %>
</div>

</div> <!-- End Wrapper -->

<footer>
<%= render :partial => "/footer" %>
</footer>

<!-- Dont forget analytics -->
</body>
</html>


0 comments on commit 5283cd8

Please sign in to comment.