From e458878eb1b5bd91bc64b73d033ac1f7843d3fc6 Mon Sep 17 00:00:00 2001
From: Thibaut Horel <thibaut.horel@gmail.com>
Date: Mon, 23 Mar 2015 02:07:00 -0400
Subject: CSS cleaning

---
 static/banner2.jpg    | Bin 0 -> 60771 bytes
 static/wedding.css    |  40 ++++++++++++++++++++++++++++++++++++++++
 templates/en/main.htm |  19 ++++++++-----------
 templates/en/rsvp.htm |  36 ++++++++++++++++++------------------
 templates/layout.htm  |  14 +++++++-------
 5 files changed, 73 insertions(+), 36 deletions(-)
 create mode 100644 static/banner2.jpg

diff --git a/static/banner2.jpg b/static/banner2.jpg
new file mode 100644
index 0000000..2b52af0
Binary files /dev/null and b/static/banner2.jpg differ
diff --git a/static/wedding.css b/static/wedding.css
index fb72463..2b302af 100644
--- a/static/wedding.css
+++ b/static/wedding.css
@@ -1,3 +1,28 @@
+html {
+    background-color: #E4EDE6;
+}
+
+body {
+    font-size: 16px;
+    font-family: "Open Sans", Verdana;
+    line-height: 150%;
+    margin: 0 auto;
+    max-width: 1150px;
+    border: 1px solid #D1D1D1;
+}
+
+header {
+    border-color: 1px solid #D1D1D1;
+}
+
+.row {
+    margin: 0;
+}
+
+.main {
+    padding: 1em 0;
+}
+
 #login {
     margin: 1.5em auto;
     width: 50%;
@@ -12,3 +37,18 @@ img {
     width: 80%;
     margin: 1.5em auto
 }
+
+.info {
+    text-align: center;
+    font-style: italic;
+    margin: 2em 0;
+}
+
+#banner {
+    width: 100%;
+}
+
+h3 {
+    margin-bottom: 1em;
+    text-align: center;
+}
diff --git a/templates/en/main.htm b/templates/en/main.htm
index c0da84c..0e6add6 100644
--- a/templates/en/main.htm
+++ b/templates/en/main.htm
@@ -1,25 +1,22 @@
 {%extends 'layout.htm' %}
 {%block content%}
-<h3 style="text-align:center">
+<h3>
   Welcome to the homepage of 
   <br>
-  Iva and Guillaume's 
-  <br>
-  wedding! 
+  Iva and Guillaume’s wedding! 
 </h3>
-<p style="text-align:center">
+<p class="info">
   The wedding will take place 
   <br>
-  Friday September 4th, 2015
+  Friday September 4<sup>th</sup>, 2015
   <br>
   in Le Lavandou, France.
 </p>
-<p style="text-align:center">
+<p>
   This website will be updated periodically to include more 
-  information. For now we just ask you to complete the RSVP 
+  information. For now we just ask you to complete the <a href="/rsvp">RSVP</a>
   form. Please let us know if you have any questions.  
 </p>
-<p style="text-align:center">
-  We are looking forward to sharing this experience with you! 
-</p>
+<p class="info">
+    We are looking forward to sharing this experience with you! </b>
 {% endblock %}
diff --git a/templates/en/rsvp.htm b/templates/en/rsvp.htm
index b190ffc..5871b2b 100644
--- a/templates/en/rsvp.htm
+++ b/templates/en/rsvp.htm
@@ -14,24 +14,24 @@
   {% endif %}
   {% endwith %}
   <div class="form-group">
-	<label for="name" class="col-md-2 control-label">Username:</label>
+	<label for="name" class="col-md-4 control-label">Username:</label>
     <div class="col-md-5">
       <p class="form-control-static">{{form['user_name']}}</p>
     </div>
   </div>
   <div class="form-group">
-	<label for="fullname" class="col-md-2 control-label">Full Name:</label>
+	<label for="fullname" class="col-md-4 control-label">Full Name:</label>
     <div class="col-md-5">
 	  <input type="text" id="fullname" class="form-control"
              name="full_name" placeholder="Your full name" value="{{form['full_name'] if form['full_name']}}"/>
     </div>
   </div>
-  <p style="text-indent:3em">
+  <p>
     Will you be able to make it to our wedding?
   </p>
   <div class="form-group">
-    <label for="rsvp" class="col-md-2 control-label">RSVP:</label>
-    <div class="col-md-9">
+    <label for="rsvp" class="col-md-4 control-label">RSVP:</label>
+    <div class="col-md-5">
       <label class="radio-inline">
         <input type="radio" value="1" name="rsvp"
                {%if form['rsvp'] %}checked {% endif %}>Yes
@@ -43,7 +43,7 @@
     </div>
   </div>
   <div class="form-group">
-	<label for="email" class="col-md-2 control-label">Email:</label>
+	<label for="email" class="col-md-4 control-label">Email:</label>
     <div class="col-md-5">
 	  <input type="email" id="email" class="form-control"
              name="email" placeholder="email"
@@ -52,7 +52,7 @@
     </div>
   </div>
   <div class="form-group">
-	<label for="mailing" class="col-md-2 control-label">Mailing Address:</label>
+	<label for="mailing" class="col-md-4 control-label">Mailing Address:</label>
     <div class="col-md-5">
       <textarea id="mailing" name="mailing"
                 placeholder="Your mailing address"
@@ -60,12 +60,12 @@
                 class="form-control" rows="3" {% if not form['rsvp'] %}disabled {%endif%}></textarea>
 	</div>
   </div>
-  <p style="text-indent:3em">
+  <p>
     Will you be accompanied by a plus one?
   </p>
   <div class="form-group">
-    <label for="plusone" class="col-md-2 control-label">+1:</label>
-    <div class="col-md-9">
+    <label for="plusone" class="col-md-4 control-label">+1:</label>
+    <div class="col-md-5">
       <label class="radio-inline">
         <input id="plusoneyes" type="radio" value="1" name="plusone"
                {%if form['plusone'] %}checked {% endif %} >Yes
@@ -77,7 +77,7 @@
     </div>
   </div>
   <div class="form-group">
-	<label for="mailing" class="col-md-2 control-label">+1's Full Name:</label>
+	<label for="mailing" class="col-md-4 control-label">+1's Full Name:</label>
     <div class="col-md-5">
 	  <input type="text" id="plusonename" class="form-control"
              name="plusonename" placeholder="+1's Name"
@@ -85,12 +85,12 @@
              {% if not form['plusone']%}disabled{% endif %}/>
     </div>
   </div>
-  <p style="text-indent:3em">
+  <p>
     Will you be coming with kids?
   </p>
   <div class="form-group">
-    <label for="plusone" class="col-md-2 control-label">Kids:</label>
-    <div class="col-md-9">
+    <label for="plusone" class="col-md-4 control-label">Kids:</label>
+    <div class="col-md-5">
       <label class="radio-inline">
         <input id="kidsyes" type="radio" value="1" name="kids"
                {%if form['kids'] %}checked {% endif %}>Yes
@@ -102,26 +102,26 @@
     </div>
   </div>
   <div class="form-group">
-	<label for="mailing" class="col-md-2 control-label">Kids' names:</label>
+	<label for="mailing" class="col-md-4 control-label">Kids' names:</label>
     <div class="col-md-5">
       <textarea id="kidsnames" name="kidsnames" placeholder="Your kids' names"
                 class="form-control" rows="3"
                 {%if not form['kids']%} disabled{% endif %}>{{form['kidsnames'] if form['kidsnames']}}</textarea>
 	</div>
   </div>
-  <p style="text-indent:3em">
+  <p>
     Please let us know if you have any dietary restrictions or comments:
   </p>
 
   <div class="form-group">
-	<label for="mailing" class="col-md-2 control-label">Comments:</label>
+	<label for="mailing" class="col-md-4 control-label">Comments:</label>
     <div class="col-md-5">
       <textarea id="comments" name="comments" placeholder="Your comments"
                 class="form-control" rows="3">{{form['comments'] if form['comments']}}</textarea>
 	</div>
   </div>
   <div class="form-group">
-    <div class="col-md-offset-2 col-md-5">
+    <div class="col-md-offset-3 col-md-5">
       <button type="submit" class="btn btn-primary">
         Update
       </button>
diff --git a/templates/layout.htm b/templates/layout.htm
index 4dd7690..e42c48e 100644
--- a/templates/layout.htm
+++ b/templates/layout.htm
@@ -18,12 +18,12 @@
     <link href="{{url_for('static',filename='wedding.css')}}" rel="stylesheet">
   </head>
   <body>
-    <div class="row">
-      <img class="center-block" src="{{url_for('static',filename='banner1.jpg')}}" alt="banner">
-    </div>
-    <div class="row container">
-      <div class="col-md-3">
-        <ul class="nav nav-tabs nav-stacked">
+    <header class="row">
+      <img id="banner" class="center-block" src="{{url_for('static',filename='banner2.jpg')}}" alt="banner">
+    </header>
+    <div class="row main">
+      <div class="col-md-3 menu ">
+        <ul class="nav nav-pills nav-stacked">
           {%if lang=="en" %}
           <li role="presentation" class="active"><a href="../home">Home</a></li>
           <li role="presentation"><a href="../rsvp">RSVP</a></li>
@@ -50,7 +50,7 @@
           {% endif %}
         </ul>
       </div>
-      <div class="col-md-7">
+      <div class="col-md-9">
         {% block content %}
         {% endblock %}
       </div>
-- 
cgit v1.2.3-70-g09d2