From bc9f6be228a4e3efd1ce59e9842331ac80c073bf Mon Sep 17 00:00:00 2001
From: Felix Ebert <felix.ebert@if-core.de>
Date: Tue, 23 Apr 2013 14:27:29 +0200
Subject: [PATCH] modified spanX classes to fit to nested fluid grids

---
 froide/account/forms.py                     | 6 +++---
 froide/account/templates/account/login.html | 2 ++
 froide/foirequest/forms.py                  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/froide/account/forms.py b/froide/account/forms.py
index 310f72fe2..6cf618fd7 100644
--- a/froide/account/forms.py
+++ b/froide/account/forms.py
@@ -16,18 +16,18 @@ class NewUserForm(forms.Form):
     first_name = forms.CharField(max_length=30,
             label=_('First name'),
             widget=forms.TextInput(attrs={'placeholder': _('First Name'),
-                'class': 'span2'}))
+                'class': 'span5'}))
     last_name = forms.CharField(max_length=30,
             label=_('Last name'),
             widget=forms.TextInput(attrs={'placeholder': _('Last Name'),
-                'class': 'span2'}))
+                'class': 'span5'}))
     address = forms.CharField(max_length=300,
             required=False,
             label=_('Mailing Address'),
             help_text=_('Your address will not be displayed publicly and is only needed in case a public body needs to send you paper.'),
             widget=forms.Textarea(attrs={
                 'rows': '3',
-                'class': 'span3',
+                'class': 'span7',
                 'placeholder': _('Street, Post Code, City'),
             }))
     user_email = forms.EmailField(label=_('Email address'),
diff --git a/froide/account/templates/account/login.html b/froide/account/templates/account/login.html
index 7d315de23..ddc1a3d1b 100644
--- a/froide/account/templates/account/login.html
+++ b/froide/account/templates/account/login.html
@@ -46,7 +46,9 @@ <h3>{% blocktrans %}Don't have an account? Sign up!{% endblocktrans %}</h3>
   <form class="form-horizontal" method="post" action="{% url 'account-signup' %}">
     {% csrf_token %}
     {% if next %}<input type="hidden" name="next" value="{{ next }}"/>{% endif %}
+    <div class="row-fluid">
     {% form signup_form using "bootstrap/horizontal.html" %}
+    </div>
     <button type="submit" class="btn">{% blocktrans %}Sign Up{% endblocktrans %}</button>
   </form>
 </div>
diff --git a/froide/foirequest/forms.py b/froide/foirequest/forms.py
index f3e45654c..bd51785bd 100644
--- a/froide/foirequest/forms.py
+++ b/froide/foirequest/forms.py
@@ -33,12 +33,12 @@ class RequestForm(forms.Form):
     subject = forms.CharField(label=_("Subject"),
             widget=forms.TextInput(
                 attrs={'placeholder': _("Subject"),
-                "class": "span5"}))
+                "class": "span8"}))
     body = forms.CharField(label=_("Body"),
             widget=forms.Textarea(
                 attrs={
                     'placeholder': _("Specify your request here..."),
-                    "class": "span4"
+                    "class": "span11"
                 }))
     public = forms.BooleanField(required=False, initial=True,
             label=_("This request will be public immediately."))