moved location of col-* blocks from within label's and input's to just outside...

moved location of col-* blocks from within label's and input's to just outside form-group to improve rendering on mobile

roomlist/welcome/templates/welcome_name.html

@@ -58,8 +58,8 @@
             {% endfor %}
           {% endif %}
           <div class="form-group">
-            <label for="{{ my_form.first_name.id_for_label }}" class="col-md-2">First Name</label>
-              <div class="col-md-4">
+            <div class="col-md-6">
+              <label for="{{ my_form.first_name.id_for_label }}">First Name</label>
                 {% if not my_form.first_name.errors %}
                   {{ my_form.first_name }}
                 {% else %}
@@ -69,8 +69,8 @@
                   </div>
                 {% endif %}
               </div>
-            <label for="{{ my_form.last_name.id_for_label }}" class="col-md-2">Last Name</label>
-              <div class="col-md-4">
+            <div class="col-md-6">
+              <label for="{{ my_form.last_name.id_for_label }}">Last Name</label>
                 {% if not my_form.last_name.errors %}
                   {{ my_form.last_name }}
                 {% else %}
@@ -88,11 +88,12 @@
             {% endfor %}
           {% endif %}
           <div class="form-group">
-            <label for="{{ my_form.gender.id_for_label }}" class="col-md-3">
-              Gender Identity<br />(choose all that apply)
+            <label for="{{ my_form.gender.id_for_label }}" class="col-xs-12">
+              Gender Identity
+              <p class="help-block">(choose all that apply)</p>
             </label>
               {% for checkbox in my_form.gender %}
-                <div class="checkbox col-md-3">
+                <div class="checkbox col-md-3 col-sm-3 col-sm-offset-1 col-xs-5 col-xs-offset-1">
                   <label for="{{ checkbox.id_for_label }}">
                     {{ checkbox.choice_label|gender_icon }}
                     {{ checkbox.tag }}
@@ -106,12 +107,14 @@
             {% endfor %}
           {% endif %}
           <div class="form-group">
-            <label for "{{ my_form.show_gender.id_for_label }}" class="col-md-3">
+            <div class="col-md-6">
+            <label for "{{ my_form.show_gender.id_for_label }}">
               Show Gender on Profile?
-            </label>
+            </label><br />
               {% for radio in my_form.show_gender %}
                 <label class="radio-inline">{{ radio.choice_label }}{{ radio.tag }}</label>
               {% endfor %}
+            </div>
           </div>
 
           </fieldset>

roomlist/welcome/templates/welcome_privacy.html

@@ -55,7 +55,6 @@
       <div class="panel-body">
         {% if not request.user.student.recent_changes > 2 %}
         {% spaceless %}
-        <hr />
         {% if my_form.non_field_errors %}
         <ul class="text-center">
           {% for error in my_form.non_field_errors %}
@@ -72,28 +71,29 @@
               {% endfor %}
             {% endif %}
             <div class="form-group">
-              <label for="{{ my_form.on_campus.id_for_label }}" class="col-md-3">
+              <div class="col-md-4">
+              <label for="{{ my_form.on_campus.id_for_label }}">
                 Do You Live on Campus?
-              </label>
+              </label><br/>
                 {% for option in my_form.on_campus %}
                   <label class="radio-inline">{{ option.choice_label }}{{ option.tag }}</label>
                 {% endfor %}
               </div>
+            </div>
             <div id="lives-on-campus">
-              <p><small>
+              <hr />
+              <p class="help-block">
                 The Global Center, the Townhouses, and Beacon Hall are not currently supported.
                 We'll let everyone know when we add them. Until then, if you live there, you're
                 still welcome to browse around.
-              </small></p>
+              </p>
               {% if my_form.room.errors %}
                 {% for error in form.room.errors %}
                   <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
                 {% endfor %}
               {% endif %}
               <div class="form-group">
-                <div class="col-md-12">
-                  {{ my_form.room }}
-                </div>
+                {{ my_form.room }}
               </div>
               {% if my_form.privacy.errors %}
                 {% for error in form.privacy.errors %}
@@ -101,10 +101,12 @@
                 {% endfor %}
               {% endif %}
               <div class="form-group">
-                <label for="{{ my_form.privacy.id_for_label }}" class="col-md-2">
+                <div class="col-md-3 col-sm-6">
+                <label for="{{ my_form.privacy.id_for_label }}">
                   Privacy
-                </label>
+                </label><br/>
                   {{ my_form.privacy }}
+                </div>
               </div>
             </div>
           </fieldset>
@@ -137,6 +139,5 @@
 
 {% block javascript %}
 <script type="text/javascript" src="/static/js/chained.min.js"></script>
-<script type="text/javascript" src="/static/js/chosen.min.js"></script>
 {% include 'room_selection_script.html' %}
 {% endblock javascript %}