bold label inputs, moving first password label into form

notebook/templates/login.html

@@ -20,14 +20,13 @@
       <div class="navbar-inner">
         <div class="container">
           <div class="center-nav">
-          {% if token_available %}
-            <p class="navbar-text nav">{% trans %}Password or token:{% endtrans %}</p>
-          {% else %}
-            <p class="navbar-text nav">{% trans %}Password:{% endtrans %}</p>
-          {% endif %}
             <form action="{{base_url}}login?next={{next}}" method="post" class="navbar-form pull-left">
               {{ xsrf_form_html() | safe }}
-              <label for="password_input">Password</label>
+              {% if token_available %}
+                <label for="password_input"><strong>{% trans %}Password or token:{% endtrans %}</strong></label>
+              {% else %}
+                <label for="password_input"><strong>{% trans %}Password:{% endtrans %}</strong></label>
+              {% endif %}
               <input type="password" name="password" id="password_input" class="form-control">
               <button type="submit" id="login_submit">{% trans %}Log in{% endtrans %}</button>
             </form>
@@ -93,13 +92,12 @@ http://localhost:8888/?token=c8de56fa... :: /Users/you/notebooks
         <form action="{{base_url}}login?next={{next}}" method="post" class="">
                 {{ xsrf_form_html() | safe }}
           <div class="form-group">
-            <label for="token_input">Token</label>
-            <input type="password" name="password" id="token_input" class="form-control" placeholder="Token">
+            <label for="token_input"><h4>Token</h4></label>
+            <input type="password" name="password" id="token_input" class="form-control">
           </div>
           <div class="form-group">
-            <label for="new_password_input">New Password</label>
-            <input type="password" name="new_password" id="new_password_input"
-            class="form-control" placeholder="New password" required>
+            <label for="new_password_input"><h4>New Password</h4></label>
+            <input type="password" name="new_password" id="new_password_input" class="form-control" required>
           </div>
           <div class="form-group">
             <button type="submit" id="login_new_pass_submit">{% trans %}Log in and set new password{% endtrans %}</button>