Commit de41233a
Changed files (39)
app
views
layouts
public
images
stylesheets
app/views/layouts/application.html.erb
@@ -8,39 +8,158 @@
<meta name="author" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="/favicon.ico">
- <link rel="stylesheet" media="handheld" href="stylesheets/handheld.css?v=2">
<script src="javascripts/libs/modernizr-1.7.min.js"></script>
<%= stylesheet_link_tag :all %>
<%= csrf_meta_tag %>
</head>
<body>
- <div id="container">
- <header>
- <div id="user-nav">
+ <div id="main" style="background-color: pink;"><!-- Main starts here -->
+ <header>
+ <div id="header"><!-- Header starts here -->
+ <div class="searchBar" style="background-color: pink;">
+ <div class="search">
+ <div class="txt"><input type="text" /></div>
+ <div class="searchBt"><input type="button" value="search" /></div>
+ </div>
<% if user_signed_in? %>
- signed in as: <%= current_user.email %>. Not you?
- <%= link_to "sign out", destroy_user_session_path %> </p>
+ <%= current_user.email %>
+ <div class="signOut">
+ <%= link_to "sign out", destroy_user_session_path, :class => 'blah' %> </p>
+ </div>
<% else %>
- <%= link_to "sign up", new_user_registration_path %> or <%= link_to "sign in", new_user_session_path %>
+ <%= link_to "sign up", new_user_registration_path %> or
+ <div class="signIn">
+ <%= link_to "sign in", new_user_session_path %>
+ </div>
<% end %>
</div>
+ <div class="logo" style="background-color: pink;">
+ <a href="#"><img src="images/logo.png" alt="" /></a>
+ </div>
+
+ <div class="menu">
+ <ul id="menu">
+ <li class="home"><a href="#">home</a></li>
+ <li class="commit"><a href="#">our commitment</a></li>
+ <li class="organic"><a href="#">organic vegetables</a></li>
+ <li class="contact"><a href="#">contact us</a></li>
+ </ul>
+ </div>
+ <div class="subs">
+ <p>SUBCRIBE to RSS</p><img src="images/rss.png" alt="" />
+ </div>
+ </div><!-- Header ends here -->
</header>
- <div id="main" role="main">
+ <div class="clear"></div>
+
+ <div id="contentTop"></div><!-- Content starts here -->
+ <div id="content">
+
+ <div class="welcomeHolder">
+ <div class="welcome">
+ <img src="images/img01.jpg" alt="" />
+ <h1>Welcome to CakeSide</h1>
+ <p><em>Introduce your company here. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. </em></p>
+ <p align="right"><input type="button" value="VIEW OUR PACKAGES" class="view" /></p>
+ <div class="clear"></div>
+ </div>
+ <div class="welcomeBottom"></div>
+ </div>
+
+ <div class="heading">Why Organic?</div>
<p class="notice"><%= notice %></p>
<p class="alert"><%= alert %></p>
-
<%= yield %>
+ <div class="organic">
+ <div class="organicHolder">
+ <div class="organicContent">
+ <img src="images/img02.jpg" alt="" />
+ <h2>Header One</h2>
+ <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco </p>
+ </div>
+ </div>
+
+ <div class="organicHolder">
+ <div class="organicContent">
+ <img src="images/img03.jpg" alt="" />
+ <h2>Header Two</h2>
+ <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco </p>
+ </div>
+ </div>
+
+ <div class="organicHolder">
+ <div class="organicContent">
+ <img src="images/img04.jpg" alt="" />
+ <h2>Header Three</h2>
+ <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim </p>
+ </div>
+ </div>
+ </div>
+
+ <div class="space"></div>
+
+ <div class="organic">
+ <div class="organicHolder">
+ <div class="organicContent">
+ <img src="images/img05.jpg" alt="" />
+ <h2>Header Four</h2>
+ <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud.</p>
+ </div>
+ </div>
+
+ <div class="organicHolder">
+ <div class="organicContent">
+ <img src="images/img06.jpg" alt="" />
+ <h2>Header Five</h2>
+ <p>Organic fruit and vegetables Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim </p>
+ </div>
+ </div>
+
+ <div class="organicHolder">
+ <div class="vegetable">
+ <h3>Learn About Our Organic Vegetables</h3>
+ </div>
+ </div>
+ </div>
+ <div class="clear"></div>
+
+ <div class="hr"></div>
+ <div class="space"></div>
+
+ <footer>
+ <div id="footer"><!-- Footer starts here -->
+
+ <div class="contactHeading">Contact Us</div>
+ <div class="footerHolder">
+ <div class="footerLeft">
+ <p class="left">Address:</p>
+ <p class="right">123 Street St<br /> Vancouver BC<br /> Canada</p>
+ </div>
+
+ <div class="footerRight">
+ <p class="left">Phone: <br /> Fax: <br />Email: <br /> Twitter:</p>
+ <p class="right">1 800 600 0000 <br /> 1 800 600 0000 <br /> organic@organic.com <br /> @organics</p>
+ </div>
+ <div class="clear"></div>
+ </div>
+
+ </div><!-- Footer ends here -->
+ </footer>
+ </div>
+ <div id="contentBottom"></div><!-- Content ends here -->
+
+ <div class="bottomHolder">
+ <div class="copy">Copyright 2011 CakeSide</div>
+ <div class="design"><a href="http://studio7designs.com">Design by STUDIO7DESIGNS</a></div>
</div>
+ </div><!-- Main ends here -->
- <footer>
- </footer>
- </div>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
<%= javascript_include_tag :all %>
@@ -52,8 +171,8 @@
<script>
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']]; // Change UA-XXXXX-X to be your site's ID
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
- g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
- s.parentNode.insertBefore(g,s)}(document,'script'));
+ g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+ s.parentNode.insertBefore(g,s)}(document,'script'));
</script>
</body>
</html>
public/images/commitA.png
Binary file
public/images/commitAhover.png
Binary file
public/images/contactA.png
Binary file
public/images/contactAhover.png
Binary file
public/images/contactHeading.png
Binary file
public/images/contentBg.png
Binary file
public/images/contentBottom.png
Binary file
public/images/contentTop.png
Binary file
public/images/headingBg.png
Binary file
public/images/homeA.png
Binary file
public/images/homeAhover.png
Binary file
public/images/hr.jpg
Binary file
public/images/img01.jpg
Binary file
public/images/img02.jpg
Binary file
public/images/img03.jpg
Binary file
public/images/img04.jpg
Binary file
public/images/img05.jpg
Binary file
public/images/img06.jpg
Binary file
public/images/img07.jpg
Binary file
public/images/logo.png
Binary file
public/images/logo02.jpg
Binary file
public/images/organicA.png
Binary file
public/images/organicAhover.png
Binary file
public/images/organicContent.jpg
Binary file
public/images/organicHolder.jpg
Binary file
public/images/rss.png
Binary file
public/images/searchBg.png
Binary file
public/images/searchBtBg.png
Binary file
public/images/signInBg.png
Binary file
public/images/subsBg.png
Binary file
public/images/Thumbs.db
Binary file
public/images/view.png
Binary file
public/images/welcomeBg.png
Binary file
public/images/welcomeBottom.png
Binary file
public/images/welcomeTop.png
Binary file
public/stylesheets/organic.css
@@ -0,0 +1,421 @@
+*{
+margin:0px;
+padding:0px;
+background-color: pink;
+}
+
+img {
+border:none;
+}
+
+.clear{
+clear:both;
+}
+
+
+.space{
+clear:both;
+height:10px;
+background: none;
+}
+
+body{
+ background:#2f0f0f;
+ color:#29371d;
+ font-family:Arial, Helvetica, sans-serif;
+ font-size:14px;
+}
+
+#main{
+ width:1200px;
+ margin:0px auto;
+ height:1400px;
+}
+
+#header{
+ width:980px;
+ margin:0px auto;
+}
+
+.searchBar{
+background:none;
+float:left;
+text-align:right;
+width:100%;
+}
+
+.signIn{
+ background:transparent url(../images/signInBg.png) no-repeat top center;
+ width:102px;
+ height:25px;
+ color:#e7daaa;
+ text-transform:uppercase;
+ text-align:center;
+ padding:10px 5px;
+ float:right;
+}
+.signOut{
+ background:transparent url(../images/signInBg.png) no-repeat top center;
+ width:102px;
+ height:25px;
+ color:#e7daaa;
+ text-transform:uppercase;
+ text-align:center;
+ padding:10px 5px;
+ float:right;
+}
+.signIn a{ background: none;color:#e7daaa; }
+.signOut a{ background: none;color:#e7daaa; }
+
+.search{
+float:right;
+background:url(../images/searchBg.png) no-repeat top center;
+height:45px;
+width:400px;
+padding:6px 20px;
+}
+
+input{
+margin:0px 0px;
+}
+
+.txt input{
+ border:1px solid #b0c5a4;
+ height:16px;
+ padding:5px;
+ width:285px;
+ float:left;
+}
+
+.searchBt input{
+ background:url(../images/searchBtBg.png) no-repeat center bottom;
+ width:97px;
+ height:28px;
+ color:#ffffff;
+ border:none;
+ text-transform:uppercase;
+ padding:3px 15px 3px 0px;
+ float:right;
+}
+
+.logo{
+clear:both;
+padding-left:20px;
+}
+
+.menu{
+float:left;
+margin-top:75px;
+width:auto;
+}
+
+.menu ul{
+ margin:0px 15px;
+}
+
+.menu ul li{
+ display:inline;
+ text-transform:uppercase;
+ font-size:15px;
+ color:#6b4916;
+ font-weight:bold;
+}
+
+.menu ul li a{
+ text-decoration:none;
+ color:#6b4916;
+}
+
+.menu ul li a:hover{
+ color:#ffffff;
+}
+
+.menu .home a{
+background:url(../images/homeA.png) no-repeat bottom center;
+padding:10px 22px 5px;
+}
+
+.menu .home a:hover{
+background:url(../images/homeAhover.png) no-repeat bottom center;
+padding:10px 22px 5px;
+}
+
+.menu .commit a{
+background:url(../images/commitA.png) no-repeat bottom center;
+padding:10px 18px 5px;
+}
+
+.menu .commit a:hover{
+background:url(../images/commitAhover.png) no-repeat bottom center;
+padding:10px 18px 5px;
+}
+
+.menu .organic a{
+background:url(../images/organicA.png) no-repeat bottom center;
+padding:10px 18px 5px;
+}
+
+.menu .organic a:hover{
+background:url(../images/organicAhover.png) no-repeat bottom center;
+padding:10px 18px 5px;
+}
+
+.menu .contact a{
+background:url(../images/contactA.png) no-repeat bottom center;
+padding:10px 22px 5px;
+}
+
+.menu .contact a:hover{
+background:url(../images/contactAhover.png) no-repeat bottom center;
+padding:10px 22px 5px;
+}
+
+.subs{
+background:url(../images/subsBg.png) no-repeat center bottom;
+width:158px;
+float:right;
+padding:10px 20px;
+margin-top:60px;
+margin-bottom:-10px;
+}
+
+.subs img{
+float:right;
+}
+
+.subs p{
+float:left;
+color:#e9dbac;
+text-transform:uppercase;
+width:auto;
+background: none;
+}
+
+#contentTop{
+background:url(../images/contentTop.png) no-repeat top;
+height:10px;
+width:988px;
+margin:0px auto;
+padding:0px 10px;
+}
+
+#contentBottom{
+background:url(../images/contentBottom.png) no-repeat bottom;
+height:10px;
+width:988px;
+margin:0px auto;
+padding:0px 10px;
+}
+
+#content{
+background:url(../images/contentBg.png) repeat-y top center;
+padding:10px 15px;
+width:978px;
+margin:0px auto;
+}
+#content h1{ background: none; }
+#content h3{ background: none; }
+#content p{ background: none; }
+
+.welcomeHolder{
+background:url(../images/welcomeTop.png) no-repeat top center;
+width:940px;
+margin:0px auto;
+padding-top:7px;
+}
+
+.welcome{
+background:url(../images/welcomeBg.png) repeat-y top center;
+width:910px;
+margin:0px auto;
+padding:5px 15px;
+line-height:20px;
+clear:both;
+}
+
+.welcome img{
+float:right;
+margin:0px 0px 0px 30px;
+}
+.welcome em{ background: none; }
+
+.welcomeBottom{
+background:url(../images/welcomeBottom.png) no-repeat bottom center;
+height:5px;
+width:940px;
+}
+
+h1{
+color:#6b4916;
+font-size:28px;
+font-style:italic;
+line-height:normal;
+margin:5px 0px 10px;
+}
+
+.view{
+ background:url(../images/view.png) no-repeat center;
+ width:192px;
+ height:29px;
+ color:#ffffff;
+ border:none;
+ text-transform:uppercase;
+ padding:1px 15px 3px 0px;
+ margin:25px 0px 0px;
+ line-height:25px;
+ cursor:pointer;
+}
+
+.view:hover { color:#f7cc1e; }
+
+.heading{
+background:url(../images/headingBg.png) no-repeat center top;
+height:25px;
+margin:15px -10px;
+color:#f7eee2;
+font-weight:bold;
+font-style:italic;
+font-size:18px;
+padding:5px 30px;
+}
+
+.organic{
+clear:both;
+width:980px;
+margin:15px auto 0px 10px;
+}
+
+.organicHolder{
+float:left;
+width:300px;
+background:url(../images/organicHolder.jpg) no-repeat bottom center;
+padding-bottom:5px;
+margin:0px 10px;
+}
+
+.organicContent{
+background:url(../images/organicContent.jpg) repeat-y top center;
+padding:0px 0px 10px;
+height:275px;
+}
+
+.organicContent h2{
+margin:10px 15px;
+font-size:15px;
+color:#674512;
+background: none;
+}
+
+.organicContent p{
+margin:0px 12px;
+color:#29371d;
+text-align:justify;
+font-size:14px;
+line-height:19px;
+background: none;
+}
+
+.vegetable{
+background:url(../images/img07.jpg) no-repeat bottom center;
+margin-bottom:-5px;
+height:290px;
+}
+
+h3{
+color:#6b4916;
+font-size:28px;
+font-style:italic;
+padding:10px;
+}
+
+.hr {border: none 0;
+background:url(../images/hr.jpg) repeat-x left;
+height: 2px;/*whatever the total width of the border-top and border-bottom equal*/
+margin:20px 17px;
+}
+
+#footer{
+ width:980px;
+ margin:10px auto;
+/* background:url(../images/contentBg.png) repeat-y top center;*/
+ background: #f7eee2;
+}
+
+.contactHeading{
+background:url(../images/contactHeading.png) no-repeat left top;
+height:25px;
+width:149px;
+margin:-20px 0px 0px -8px;
+color:#f7eee2;
+font-weight:bold;
+font-style:italic;
+font-size:18px;
+padding:5px 25px;
+position:relative;
+z-index:100;
+}
+
+.footerHolder{
+ background:url(../images/footerBg.jpg) no-repeat center bottom;
+ font-size:17px;
+ font-style:italic;
+ font-weight:bold;
+ height:58px;
+ padding:35px 50px;
+ margin-top:-10px;
+}
+
+.footerLeft{
+width:190px;
+float:left;
+background: none;
+}
+
+.footerRight{
+width:240px;
+float:left;
+margin-left:150px;
+margin-top:-10px;
+background: none;
+}
+
+.left{
+ float:left;
+ color:#7e9c23;
+ text-align:right;
+ width:auto;
+}
+
+.right{
+color:#51350c;
+float:right;
+width:auto;
+}
+
+.bottomHolder{
+ font-size:12px;
+ color:#26120f;
+ margin:5px auto;
+ width:980px;
+}
+
+.copy{
+float:left;
+width:auto;
+}
+
+.design{
+ float:right;
+ width:auto;
+}
+
+.design a{
+ color:#26120f;
+ text-decoration:none;
+}
+
+.design a:hover{
+ color:#26120f;
+ text-decoration:underline;
+}
+
public/stylesheets/style.css → public/stylesheets/style.bak
File renamed without changes