Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:nityaoberoi/wedding

  • Loading branch information...
commit d7d0bee79bca561bdc32352da35f9a47a68c7c1b 2 parents ad2d6d8 + 943010a
Nitya Oberoi authored
Showing with 8 additions and 8 deletions.
  1. +8 −8 templates/index.html
View
16 templates/index.html
@@ -43,7 +43,7 @@
<section id="the-bride" class="story" data-speed="6" data-type="background" data-offsety="150">
<article>
<h2>The Bride</h2>
- <p>Nitya grew up in Kuwait but her roots still lie in India. She went to UT Austin to pursue Bachelors in Computer Science and Advertising. After a summer internship in Goldman Sachs, she decided she had to partake in doing "God's work" and joined Goldman Sachs in New York full-time in 2006.</p>
+ <p>Nitya grew up in Kuwait but her roots still lie in India. She went to UT Austin to pursue Bachelors in Computer Science and Advertising. After a summer internship at Goldman Sachs in New York City, she decided she had to aid in doing "God's work" and joined the firm full-time in 2006.</p>
<p>After 4 years in the financial world, Nitya decided she'd had enough and decided to pursue her true passions - technology and web development. After a short stint in Lime Wire, she joined Yipit as their 6th employee and has been happily hacking away ever since.</p>
<p>Nitya closely fits both the cancerian and lefty (though she claims "ambidextrous") stereotypes. She is highly creative and obsessive about her artwork. In fact, Nitya has never lived in an apartment that she didn't paint and decorate herself. Luckily (for me), she takes very little help while doing so.</p>
<p>Nitya's biggest passion is probably still travel, specifically adventure travel. Besides trying out various adventure sports, she occasionally pushes the envelope with outrageously daring experiences like spending a week with minimal supplies learning survival skills in the Utah wilderness. Perhaps for this reason, if not any other, she'd be the person I pick to be with if I were stranded on a deserted island.</p>
@@ -53,7 +53,7 @@
<section id="the-groom" class="story" data-speed="6" data-type="background" data-offsety="265">
<article>
<h2>The Groom</h2>
- <p>Sriram was born and brought up in Chennai where he grew up with his sister, parents, and patti (grandmother). He went to UT, Austin for his Bachelors in Electrical Engineering and on graduating, joined Google as a software engineer, in California. After much coaxing (by me), he finally relented and left the west coast for New York, three years later. Last year, he moved to Spotify to pursue his interest in solving core backend engineering problems and loves it there.</p>
+ <p>Sriram was born and brought up in Chennai where he grew up with his sister, parents, and patti (grandmother). He went to UT Austin for his Bachelors in Electrical Engineering and on graduating, joined Google as a software engineer in California. Three years later, and after much coaxing (by me), he finally relented and left the west coast for New York. Last year, he moved to Spotify to pursue his interest in solving core backend engineering problems and loves it there.</p>
<p>Sriram is extremely passionate about music; he loves everything from psychedelic rock to classical carnatic. He's also an extremely adept percussionist, in all senses of the word. He first started playing the mirundangam at age 6 after some prodding from his mom and developed a natural sense of rhythm. At university, Sriram played for a band called Omkara. Later, he taught himself the tabla and drums, and he now regularly jams with friends to the tunes of Led Zep, Floyd etc. His other passions include traveling - he's travelled across 17 countries in 6 continents over the past 5 years and is always willing to partake in the next adventure even if it means hiccuping all the way up to the summit of Kilimanjaro.</p>
</article>
</section>
@@ -62,7 +62,7 @@
<section id="our-story" class="story" data-speed="9" data-type="background" data-offsety="300">
<article>
<h2>Our Story</h2>
- <p>One of my first memories of Sriram was from UT, Austin, when I was at the library, attempting to procure a book stamp for an art project. Sriram worked as a library proctor, and so I asked if he could help out. Not knowing him very well at the time, I was a bit taken aback when he replied with a grin, "What's in it for me?"</p>
+ <p>One of my first memories of Sriram was from UT Austin, when I was at the library, attempting to procure a book stamp for an art project. Sriram worked as a library proctor, and so I asked if he could help out. Not knowing him very well at the time, I was a bit taken aback when he replied with a grin, "What's in it for me?"</p>
<p>Over the next couple of years at school, we met intermittently and became good friends. When we finally realized we liked each other, it was time for me to graduate and move to New York. Sriram moved to California six months later.</p>
<p>Today, we've travelled six continents together, over the course of five years, visited four of the world's wonders, survived three long distance years, lived in two home cities, and overall it's been one amazing adventure. Last summer, Sriram took me aback once more with another grin and question when we trekked up Mt. Kilimanjaro. Only this time, his question was, "Will you marry me?"
</p>
@@ -93,13 +93,13 @@
</p>
<p><h5 class="event-tip" title="The <strong>baraat</strong> is the groom's wedding procession where the groom rides on a horse, accompanied by a band. Once the groom's party arrives at the wedding, they are received by the bride's side. Later, the bride and the groom exchange garlands (<strong>jaimala</strong>).">Baraat Swagat, Jaimala &amp; Sangeet: 7pm onwards.</h5>
- <span style="float:right">Attire: Ethnic</span>
+ <span style="float:right">Attire: Traditional Indian</span>
</p>
<h4>Sunday, June 10th, 2012</h4>
<p><h5 class="event-tip" title="<strong>Nichayathartham</strong>, the engagement ceremony, followed by <strong>Muhurtham</strong>, traditional Tamil Iyer style.">
The Wedding: 10am - 12pm.</h5>
- <span style="float:right">Attire: Ethnic</span>
+ <span style="float:right">Attire: Traditional Indian</span>
</p>
<p><h5>Reception, Dance: 7.30pm onwards.</h5>
@@ -115,11 +115,11 @@
<h2>Guest Information</h2>
<div class="textbox">
<ul>
- <li>We request all our guests to RSVP via the icon on the top left corner of the screen.</li>
- <li>For our non-indian citizen guests, we encourage that you acquire your <a href="https://www.indian-visa.com/" target="_blank">Indian Visas</a> well before May and send us a copy in email so we can provide it to the hotel.</li>
+ <li>We request all our guests to RSVP via the icon on the top left corner of the screen. Please keep us updated of your plans and leave us a message, if you'd like.</li>
+ <li>For our non-indian citizen guests, we encourage that you acquire your <a href="https://www.indian-visa.com/" target="_blank">Indian Visas</a> well before May and send us a copy in email so we can provide it to the hotel prior to your arrival.</li>
</ul>
<h2>Recommended Reading</h2>
- <p>Spend a few hours enjoying <a href="www.bonboutique.com/recreation.asp" target="_blank">Bonboutique Hotel</a>.</p>
+ <p>Spend a few hours enjoying <a href="http://www.bonboutique.com/recreation.asp" target="_blank">Bonboutique Hotel</a>.</p>
<p>Look around Pune (refer: <a href="http://wikitravel.org/en/Pune#b" target="_blank">Wikitravel</a>, <a href="http://www.lonelyplanet.com/india/maharashtra/pune" target="_blank">Lonely planet</a>)</p>
<p>If you are traveling around after or before, <a href="http://www.lonelyplanet.com/india/mumbai-bombay" target="_blank">Mumbai</a> is a great city to check out.</p>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.