Skip to content
This repository has been archived by the owner on Nov 11, 2017. It is now read-only.

Commit

Permalink
Fixed after-party bugs and changes some images
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil LaPier committed Feb 4, 2011
1 parent b524823 commit b21b9ac
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/views/parties/_party.html.erb
@@ -1,6 +1,6 @@
<div id="after-party" class="clearfix">
<div class="wreath left">
<img src="/images/angel-investors.png" alt="angel-investors" width="215" height="200" />
<img src="/images/wreath-developers.png" alt="angel-investors" width="215" height="200" />
</div>
<div id="after-party-description">
<%= link_to "http://maps.google.com/maps?cid=11425628393869581370" do %>
Expand All @@ -11,7 +11,7 @@
<% end %>
</div>
<div class="wreath right">
<img src="/images/venture-capitalists.png" alt="venture-capitalists" width="215" height="200" />
<img src="/images/wreath-designers.png" alt="venture-capitalists" width="215" height="200" />
</div>
</div>
<hr class="bottom" />
10 changes: 8 additions & 2 deletions app/views/parties/show.html.erb
Expand Up @@ -6,7 +6,7 @@
<% if current_user %>
<section id="registration">
<header id="registration-banner">
<img src="/images/registration-banner.png" alt="registration-banner" width="422" height="145" />
<img src="/images/RSVP-banner.png" alt="registration-banner" width="422" height="145" />
</header>
<%= semantic_form_for current_user, :remote => true,
:html => { :id => "event-registration",
Expand All @@ -31,7 +31,13 @@
<% end %>
</section>
<% else %>
<%= link_to "RSVP via Twitter", "/auth/twitter" %>
<% link_to "/auth/twitter" do %>
<div class="register-button top clearfix">
<div class="hand left"></div>
<h2><a href="#registration">rsvp via twitter</a></h2>
<div class="hand right"></div>
</div>
<% end %>
<% end %>

<hr class="alternate" />
Expand Down
Binary file added public/images/RSVP-banner.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/wreath-designers.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/wreath-developers.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/stylesheets/sass/screen.scss
Expand Up @@ -937,6 +937,15 @@ ul.ui-menu {
header#logo {
padding: 0px 60px 0px 60px;
}
section#main-continue section#registration {
margin: 0;
padding: 30px 0;

header#registration-banner {
margin-bottom: 20px;
}
}

}
.party-main {
padding-top: 30px;
Expand Down
5 changes: 5 additions & 0 deletions public/stylesheets/screen.css
Expand Up @@ -1273,5 +1273,10 @@ ul.ui-menu {

.parties-show #container header#logo {
padding: 0px 60px 0px 60px; }
.parties-show #container section#main-continue section#registration {
margin: 0;
padding: 30px 0; }
.parties-show #container section#main-continue section#registration header#registration-banner {
margin-bottom: 20px; }
.parties-show .party-main {
padding-top: 30px; }

0 comments on commit b21b9ac

Please sign in to comment.