Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: corvallisswing/swingandblues.org
base: 2395ce33cf
...
head fork: corvallisswing/swingandblues.org
compare: 85fc63462c
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 45 additions and 30 deletions.
  1. +6 −1 css/main.css
  2. +2 −1  rsvp/payment.html
  3. +37 −28 schedule/default.aspx
7 css/main.css
View
@@ -33,7 +33,7 @@
}
/* Bootstrap replacement for spans */
-.max12, .max4 {
+.max12, .max4, .max8 {
float: left;
min-height: 1px;
max-width: 940px;
@@ -47,6 +47,11 @@
max-width: 300px;
min-width: 250px;
}
+.max8 {
+ max-width: 620px;
+ min-width: 225px;
+ margin-right: 0;
+}
body {
3  rsvp/payment.html
View
@@ -40,7 +40,8 @@ <h4 style="margin-top: 1ex">Payment</h4>
<input type="hidden" name="hosted_button_id" value="QEKM63V6CJ8H4">
<input type="hidden" name="on0" value="Registration email">
<ol>
- <li class="{{person.payment.method}}only">Need to <a href="#/payment/allThings">pay for a shirt, too</a>?</li>
+<!-- Shirts are no longer an option.
+ <li class="{{person.payment.method}}only">Need to <a href="#/payment/allThings">pay for a shirt, too</a>?</li> -->
<li class="{{person.payment.method}}only"><input type="text" name="os0" value="{{person.email}}"
maxlength="200" placeholder="RSVP email"></li>
<li><input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_buynow_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> for $50.</li>
65 schedule/default.aspx
View
@@ -6,16 +6,24 @@
<!--#include virtual = "/inc/head-common.html" -->
<style>
+ .container {
+ max-width: 940px;
+ width: auto;
+ }
+
+ .row-fluid .span4 {
+ min-width: 250px;
+ }
+
+ .left-align {
+ margin-left: 0;
+ }
+
.day {
/*margin-top: 2em;*/
/*clear: left;*/
}
- .container {
-/* padding: 0;
- padding-top: 1em;
-*/ }
-
.firstEvent {
border-top: 0 !important;
}
@@ -69,30 +77,31 @@
<body>
<!--#include virtual = "/inc/header.html" -->
<div class="container">
- <div class="span12">
+ <div class="max12">
<h1>Schedule of events</h1>
</div>
- <div class="swingEvent firstEvent row-fluid">
- <div class="span12">
- <div class="span4">
- <h4>Friday evening</h4>
- <p>The weekend starts with an evening at the OSU Women's Building, opening with swing music and dancing at our weekly dance venue.</p>
+ <div class="swingEvent firstEvent">
+ <div class="max12 left-align">
+ <div class="max4 left-align">
+ <h4>Friday evening</h4>
+ <p>The weekend starts with an evening at the OSU Women's Building, opening with swing music and dancing at our weekly dance venue.</p>
- <p>As night arrives, Walker T Ryan will take the stage with live blues.</p>
+ <p>As night arrives, Walker T Ryan will take the stage with live blues.</p>
- <div><span class="info">Dance:</span> 8:30 p.m. - midnight</div>
- <div><span class="info">Venue:</span> OSU Women's Building</div>
- <div><span class="info">Address:</span> 160 SW 26th St, Corvallis | <a href="http://goo.gl/maps/EQvlY">Map</a></div>
- <div><span class="info">Cover:</span> $12</div>
- </div>
+ <div><span class="info">Dance:</span> 8:30 p.m. - midnight</div>
+ <div><span class="info">Venue:</span> OSU Women's Building</div>
+ <div><span class="info">Address:</span> 160 SW 26th St, Corvallis | <a href="http://goo.gl/maps/EQvlY">Map</a></div>
+ <div><span class="info">Cover:</span> $12</div>
+ </div>
- <div class="span8">
- <img class="img-polaroid" src="/img/wbDance.jpg"
- style="margin-top: 0.7em"/>
- <div class="photoCredit">Photo credit: Martin &amp; Renee Norred</div>
- </div>
+ <div class="max8 left-align">
+ <img class="img-polaroid" src="/img/wbDance.jpg"
+ style="margin-top: 0.7em"/>
+ <div class="photoCredit">Photo credit: Martin &amp; Renee Norred</div>
+ </div>
</div>
+ &nbsp;
</div>
<div class="bluesEvent lastEvent">
@@ -100,7 +109,7 @@
<p>Dancing continues into the late night, until 3 a.m., at the 100-year-old Majestic Theatre with live swing music from Eugene's Breakers Yard.</p>
<div class="row-fluid">
- <div class="span8">
+ <div class="max8 left-align">
<img class="img-polaroid" src="/img/breakersYardWide.jpg"
style="margin-top: 0.7em"/>
<div class="photoCredit">Photo credit: Leslie Lucir</div>
@@ -121,7 +130,7 @@
</div>
<div class="swingEvent firstEvent row-fluid">
- <div class="span12">
+ <div class="max12 left-align">
<div class="span4">
<h4>Saturday evening</h4>
@@ -138,7 +147,7 @@
<div><span class="info">Cover:</span> $15</div>
</div>
- <div class="span8">
+ <div class="max8 left-align">
<img class="img-polaroid" src="/img/kevinSelfeBand.jpg"
style="margin-top: 0.7em"/>
<div class="photoCredit">Photo credit: Martin &amp; Renee Norred</div>
@@ -151,7 +160,7 @@
<p>After midnight, we return to the Majestic for swing and blues dancing in two halls until 3 a.m. Light fare will be provided.</p>
<div class="row-fluid">
- <div class="span8">
+ <div class="max8 left-align">
<img class="img-polaroid" src="/img/majesticSwing.jpg"/>
<div class="photoCredit" style="text-align: left; margin-left: 1em">
Photo credit: Martin &amp; Renee Norred</div>
@@ -171,7 +180,7 @@
<h4>Sunday afternoon</h4>
<div class="row-fluid">
- <div class="span8">
+ <div class="max8 left-align">
We'll be taking over Old World Deli in the afternoon with casual dancing in a relaxed atmosphere. Come get some lunch and hang out with your old and new friends.
</div>
@@ -199,7 +208,7 @@
<div><span class="info">Address:</span> 115 SW 2nd St, Corvallis | <a href="http://goo.gl/maps/OZEIT">Map</a></div>
<div><span class="info">Cover:</span> $10</div>
</div>
- <div class="span8">
+ <div class="max8 left-align">
<img class="img-polaroid" src="/img/majesticStage.jpg"
style="margin-top: 0.7em"/>
<div class="photoCredit">Photo credit: Martin &amp; Renee Norred</div>

No commit comments for this range

Something went wrong with that request. Please try again.