Skip to content

Commit

Permalink
Tackle most of the home index page, along with putting copyediting in…
Browse files Browse the repository at this point in the history
… en.yml and tweaking some bootstrap defaults.
  • Loading branch information
DeadSuperHero committed Jun 26, 2013
1 parent b0a216b commit c34065f
Show file tree
Hide file tree
Showing 11 changed files with 359 additions and 6 deletions.
Binary file added app/assets/images/aspects.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/decentralized-stamp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/earthD2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/features.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/freedom-stamp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/keyhole-stamp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/question-stamp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/services.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 103 additions & 1 deletion app/assets/stylesheets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ html, body {
margin: 0 auto -60px;
}

.navbar .navbar-inner {
padding: 0px 15px;
}

.find_out_more {
text-align: right;
}

#pusher {
height: 60px;
}
Expand All @@ -23,6 +31,89 @@ footer {
}
}

body {
font-size: 13px;
}

h1 {
font-size: 30px;
}

h1 small {
font-size: 18px;
}

h2 {
font-size: 24px;
line-height: 36px;
text-align: center;
color: rgb(52, 124, 170);
font-weight: normal;
margin: 0;
padding: 0;
}

#masthead {
text-align: center;
}

.container {
width: 940px;
margin-left: auto;
margin-right: auto;
}

.container-fluid {
padding: 0;
}

.container h1 {
text-align: center;
}

#masthead.hero {
background-color: rgb(252, 252, 252);
background-image: radial-gradient(circle farthest-corner at 50% 50% , rgb(252, 252, 252), rgb(230, 230, 230) 100%);
}

#masthead {
position: relative;
background-color: rgb(252, 252, 252);
box-shadow: 0px -1px 5px rgba(0, 0, 0, 0.5) inset;
border-bottom: 1px solid rgb(153, 153, 153);
padding-top: 20px;
}

#masthead h1 {
font-size: 54px;
line-height: 1.3;
margin-bottom: 0px;
text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.8), 0px 0px 10px white;
color: rgb(17, 17, 17);
}

#masthead h2 {
font-size: 24px;
line-height: 36px;
color: rgb(52, 124, 170);
font-weight: normal;
}

#masthead .container {
text-align: center;
}

.center {
text-align: center;
}

p{
font-size: 13px;
font-weight: normal;
line-height: 18px;
margin-bottom: 9px;
}

.navbar-fixed-top {
#mainnav {
margin-top: 20px;
Expand All @@ -42,7 +133,7 @@ footer {
}

#main-container {
padding-top: 90px;
padding-top: 70px;
}

@media (max-width: 767px) {
Expand All @@ -61,3 +152,14 @@ footer {
padding-right: 40px;
}
}


.span-one-third {
width: 300px;
margin-left: 20px;
margin-top: 5px;
}

.span12 {
width: 700px;
}
232 changes: 229 additions & 3 deletions app/views/pages/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,231 @@
<div class="page-header">
<h1><%= t('pages.home.headline') %></h1>
<div id="masthead", class="hero">
<div class="container">
<h1><%= t('pages.home.headline') %></h1>
<h2><%= t('pages.home.welcome_paragraph') %></h2>
</div>
</div>

<p><%= t('pages.home.welcome_paragraph') %></p>
<div class="container">
<div class="row"> <br>&nbsp;
<div class="center">
<img alt="Earthd*" src="/assets/earthD2.png">
</div>
</div>
</div>


<br>&nbsp;<br>&nbsp;

<div class="container">
<div class="row">
<h1><%= t('pages.home.key_philosophies') %></h1>
</div>
<div class="row">
<div class="span-one-third">
<img alt="Decentralized-stamp" src="/assets/decentralized-stamp.png">
</div>
<div class="span-one-third">
<img alt="Freedom-stamp" src="/assets/freedom-stamp.png">
</div>
<div class="span-one-third">
<img alt="Keyhole-stamp" src="/assets/keyhole-stamp.png">
</div>
</div>
<div class="row">
<div class="span-one-third">
<h2><%= t('pages.home.decentralization') %></h2>
<p><%= t('pages.home.decentralization_about') %></p>

<p class="find_out_more">
<a href="/more_info.html" class="btn primary">
Find out more &raquo;
</a>
</p>
</div>
<div class="span-one-third">
<h2><%= t('pages.home.freedom') %></h2>
<p><%= t('pages.home.freedom_about') %></p>

<p class="find_out_more">
<a href="/more_info.html#freedom" class="btn primary">
Find out more &raquo;
</a>
</p>
</div>
<div class="span-one-third">
<h2><%= t('pages.home.privacy') %></h2>
<p><%= t('pages.home.privacy_about') %></p>

<p class="find_out_more">
<a href="/more_info.html#privacy" class="btn primary">
Find out more &raquo;
</a>
</p><br>&nbsp;<br>&nbsp;

<div id="signup">
</div>
<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;
</div>
</div>
<div class="clearfix">
</div>
<div class="page-header">
<h1>
<%= t('pages.home.get_started') %>
<small><%= t('pages.home.get_started_sub') %></small></h1>
</div>
<div class="row">
</div>
<div class="clearfix">
</div>
<div class="row">
<div class="span-one-third">
<h2>
<%= t('pages.home.choose_pod') %>
</h2>
<p>
<%= t('pages.home.choose_pod_exp') %>
<a href="http://podupti.me/">Pod Uptime</a>.
</p>
</div>
<div class="span-one-third">
<h2>
<%= t('pages.home.sign_up') %>
</h2>
<p>
<%= t('pages.home.sign_up_ex1') %>
<a href="http://podupti.me/">
Pod Uptime
</a>
<%= t('pages.home.sign_up_ex2') %>
</p>
<p class="find_out_more">
<a href="http://podupti.me/" class="btn primary" data-backdrop="true" data-controls-modal="my-modal">
Sign up
</a>
</p>
</div>
<div class="span-one-third">
<h2>
<%= t('pages.home.join_convo') %>
</h2>
<p>
<%= t('pages.home.join_convo_ex') %>
</p>
</div>
</div>
<br>&nbsp;<br>&nbsp;<br>&nbsp;

<hr>

<br>
<br>

<div class="row">
<div class="span-one-third">
<img alt="Aspects" src="/assets/aspects.png">
</div>
<div class="span-one-third">
<img alt="Features" src="/assets/features.png">
</div>
<div class="span-one-third">
<img alt="Ways to help" src="/assets/question-stamp.png">
</div>
</div>
<div class="row">
<div class="span-one-third">
<h2>
<%= t('pages.home.aspects') %>
</h2>
<p>
<%= t('pages.home.aspects_ex') %>
</p>
<p class="find_out_more">
<a href="/more_info.html#aspects" class="btn primary">
Find out more &raquo;
</a>
</p>
</div>
<div class="span-one-third">
<h2>
<%= t('pages.home.features') %>
</h2>
<p>
<%= t('pages.home.features_ex') %>
</p>
<p class="find_out_more">
<a href="/more_info.html#features" class="btn primary">
Find out more &raquo;
</a>
</p>
</div>
<div class="span-one-third">
<h2>
<%= t('pages.home.help') %>
</h2>
<p>
<%= t('pages.home.help_ex') %>
</p>
<p class="find_out_more">
<a href="/get_involved.html#ways_to_help" class="btn primary">
Find out more &raquo;
</a>
</p>
</div>
</div>
<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;

<div class="row">
<div class="span4">
<img alt="Services" src="/assets/services.png" />
</div>
<div class="span12">
<h1>
<%= t('pages.home.socialint') %>
</h1>
<p>
<%= t('pages.home.socialint_ex') %>
</p>
<br>
<br>
</div>
</div>

</div>

</body>
</html>

<div class="modal fade" id="my-modal">
<div class="modal-header">
<a href="#" class="close">
x
</a>
<h3>
Join an open pod.
</h3>
</div>
<div class="modal-body">
<p>
The Diaspora&#42; ecosystem consists of numerous pods, which all connect together
to form our new social web.
</p>
<p>
On the next page, you’ll see a list of the open pods. There are stats for each,
showing how long it's been running and how much 'down-time' if any it has. Simply
pick one, click on the link or that pod (in the left-hand column) and follow the
simple steps on that pod’s home page to create your account.
</p>
<p>
Note: You may find that some of these pods are not open to the public.
In that case, we encourage you to try another one.
</p>
</div>
<div class="modal-footer">
<a href="http://podupti.me" target="_blank">
Click here to choose a pod to join.
</a>
<p class="note">
Note: podupti.me is a community resource and not run by the core team.
</p>
</div>
Loading

0 comments on commit c34065f

Please sign in to comment.