Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
BIN  app/assets/images/preparedly-bigblue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
75 app/assets/stylesheets/application.css
@@ -298,7 +298,7 @@ td { vertical-align: top; }
}
/*-----------------------------prepared.ly logo ---*/
#logo {
- background: url('preparedly-red.png') no-repeat;
+ /*background: url('preparedly-red.png') no-repeat;*/
height:100px;
width:200px;
position: relative;
@@ -367,18 +367,66 @@ td { vertical-align: top; }
#about-logo {
}
+
+#about-main {
+ margin: -40px 40px;
+ padding: 0px 50px;
+ z-index:10;
+ }
#about-wrap {
background:url('blue-sky.png')repeat-x;
- height:400px;
+ height:300px;
}
-#about-green {
- background: #336633;
- height:100%;
- position: relative;
- top: -119px;
- z-index: -3;
+
+#column-wrapper {
+ margin:10px;
+ padding:10px;
+}
+.column {
+ float:left;
+ width:50%;
+ position: relative;
+ padding-bottom:40px;
+}
+#space {
+ height:200px;
+ width:100%;
+ }
+#column-wrapper h1{
+ font-size: 48px;
+ font-style: normal;
+ font-weight: 700;
+ color: #99CCCC;
+ text-align:center;
+ border-bottom:solid 1px #99CCCC;
+ font-family: "museo-sans", sans-serif;
+}
+#column-wrapper h3{
+ font-size: 17px;
+ font-style: normal;
+ font-weight: 300;
+ color: #339999;
+ text-align:center;
}
+
+.column p, .column h2 {
+ margin:5px;
+ padding:5px;
+ }
+.column p{
+ height: 100px;
+ color:#ffffff;
+}
+
+.column h2{
+ font-weight: 700;
+ color:#ffffff;
+}
+.column-full {
+ width:100%;
+ position: relative;
+}
#skyline {
background: url('footer.png') no-repeat;
height: 113px;
@@ -388,7 +436,16 @@ td { vertical-align: top; }
position: relative;
top: -94px;
}
-
+#about-green {
+ background: #336633;
+ height:1800px;
+ position: relative;
+}
+#green {
+ background:#336633;
+ top:-36px;
+ position:relative;
+ }
/*------------------------------------------------footer stuff---*/
#wrap {min-height: 100%;}
View
80 app/views/about/index.html.erb
@@ -3,5 +3,81 @@
<%= render 'devise/menu/login_items' %>
<li><%= link_to "About", page_path("about") %></li>
<% end %>
-<h1>About#index</h1>
-<p>Find me in app/views/about/index.html.erb</p>
+<div id="column-wrapper">
+ <div class="column-full">
+ <h3><a href="/">
+ <img src="assets/preparedly-bigblue.png" height="150px" width="300px">
+ </a></br>
+ Make staying prepared simple and easy</h3>
+ </div><!--end column-full-->
+ <div id="space">
+ &nbsp;
+ </div>
+ <div class="column-full">
+ <h1>What is it?</h1>
+ </div><!--end column-full-->
+ <div class="column-full">
+ <div class="column">
+ <h2>overview</h2>
+ <p>Prepared.ly is a simple way for you stay informed and proactive about the ongoing threat of wildfires.</p>
+ <h2>Notifications</h2>
+ <p>Receive timely reminders from Austin Fire Department experts when there is a particular risk in your area, suggestions to remain proactive and National Weather Service “Red Flag” and “High Risk” warnings.</p>
+ </div>
+
+ <div class="column">
+ <h2>Assessment</h2>
+ <p>Visualize your home’s proximity to the Wildland Urban Interface (WUI), understand local conditions and view your estimated realtime risk.
+</p>
+ <h2>Customized Advice</h2>
+ <p>Submit questions and receive answers unique to your property or situation.</p>
+ </div>
+ </div><!--end column-full-->
+ <div class="column-full">
+ <h1>Features</h1>
+ </div> <!--end column-full-->
+ <div class="column-full">
+ <div class="column">
+ <h2>Local Conditions</h2>
+ <p>Review realtime conditions and understand how they relate to your area’s wildfire risk.
+ </p>
+ <h2>Goodwill</h2>
+ <p>Submit questions to the fire department about your home or property.
+ </p>
+ <h2>Q &amp; A</h2>
+ <p>Use Prepared.ly to help less tech savvy neighbors with prevention efforts.
+ </p>
+ <h2>Get started!</h2>
+ <p>Prepare your home and property with simple tasks suggested by wildfire prevention experts.
+ </p>
+ </div>
+ <div class="column">
+ <h2>Sharing</h2>
+ <p>Invite your neighbors and friends to participate in prevention efforts and community cleanup days.
+ </p>
+ <h2>On-Site Education</h2>
+ <p>Schedule on-site consultations for your home and neighborhood with wildfire prevention experts.
+ </p>
+ <h2>Guidance</h2>
+ <p>Review nationally accepted safety standards before making home and property improvements.
+ </p>
+ </div>
+ </div> <!--end column-full-->
+</div> <!--end column wrapper-->
+
+
+
+
+
+
+
+
+
+
+<div id="about-bg">
+ </div>
+
+<!-- <div id="skyline">
+ </div>
+ <div id="about-green">
+ </div>
+ -->
View
110 app/views/layouts/about_layout.html.erb
@@ -1,59 +1,55 @@
-<!DOCTYPE html>
-<html>
-<head>
+ <!DOCTYPE html>
+ <html>
+ <head>
+
+ <title>Preparedly</title>
+ <%= stylesheet_link_tag "application", :media => "all" %>
+ <%= yield :stylesheet_yield %>
+ <%= yield :fb_og_tags %>
+ <%= csrf_meta_tags %>
+ <!-- Google Analytics -->
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-30366897-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
- <title>Preparedly</title>
- <%= stylesheet_link_tag "application", :media => "all" %>
- <%= yield :stylesheet_yield %>
- <%= yield :fb_og_tags %>
- <%= csrf_meta_tags %>
- <!-- Google Analytics -->
- <script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-30366897-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
- </script>
-</head>
-<body>
-<div id="beta">
-</div>
- <p class="notice"><%= notice %></p>
- <p class="alert"><%= alert %></p>
- <div class="nav-bar">
- <ul class="nav-bar-items">
- <%= yield :nav_bar_items %>
- </ul>
- </div>
- <a href="/">
- <div id="logo" title="preparedly">
+ </head>
+ <body>
+ <div id="beta">
+ </div>
+ <p class="notice"><%= notice %></p>
+ <p class="alert"><%= alert %></p>
+ <div class="nav-bar">
+ <ul class="nav-bar-items">
+ <%= yield :nav_bar_items %>
+ </ul>
</div>
- </a>
-<div id="about-wrap">
- <div id="main">
- <%= yield %>
- </div>
-</div>
-
-<div id="about-bg">
-</div>
-
- <div id="skyline">
- </div>
- <div id="about-green">
- </div>
-
-<script type="text/javascript" src="http://use.typekit.com/osj8jgk.js"></script>
-<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-<%= yield :javascript_yield %>
-<%= javascript_include_tag "application" %>
-
-</body>
-</html>
+ <a href="/">
+ <div id="logo" title="preparedly">
+ </div>
+ </a>
+ <div id="about-green">
+ <div id="about-wrap">
+ <div id="about-main">
+ <%= yield %>
+ </div>
+ </div>
+ <div id="skyline">
+ </div>
+ </div>
+ <script type="text/javascript" src="http://use.typekit.com/osj8jgk.js"></script>
+ <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+ <%= yield :javascript_yield %>
+ <%= javascript_include_tag "application" %>
+
+ </body>
+ </html>
View
7 app/views/layouts/application.html.erb
@@ -34,10 +34,11 @@
<%= yield :nav_bar_items %>
</ul>
</div>
- <a href="/">
<div id="logo" title="preparedly">
- </div>
- </a>
+ <a href="/">
+ <img src="assets/preparedly-red.png" height="95px" width="217px">
+ </a>
+ </div>
<div id="main">
<%= yield %>
</div>

No commit comments for this range

Something went wrong with that request. Please try again.