portico: Remove usage of `control-group` and `control-label` class.

static/styles/portico/portico.css

@@ -854,11 +854,7 @@ input.new-organization-button {
 
 .login-form,
 .register-form {
-    .control-label {
+    .controls {
-        margin-bottom: 2px;
-    }
-
-    .control-group {
         margin-right: 10px;
     }
 }
@@ -924,10 +920,6 @@ input.new-organization-button {
         margin-top: 20px;
     }
 
-    .control-group .control-label {
-        display: block;
-    }
-
     .pitch {
         width: auto;
     }
@@ -1018,6 +1010,17 @@ input.new-organization-button {
     text-align: center;
 }
 
+#registration-email {
+    label {
+        float: left;
+        padding-top: 5px;
+        width: 100%;
+        display: block;
+        margin: 0;
+        text-align: left;
+    }
+}
+
 .center-block {
     text-align: left;
     display: inline-block;
@@ -1027,21 +1030,10 @@ input.new-organization-button {
         margin-bottom: 20px;
     }
 
-    .control-group {
-        margin-bottom: 10px;
-
-        label {
-            width: 100%;
-            display: block;
-            margin: 0;
-            text-align: left;
-        }
-
     .controls {
         margin: 0;
         text-align: left;
     }
-    }
 
     #send_confirm input[type="text"] {
         margin-top: 20px;

static/styles/portico/portico_signin.css

@@ -303,7 +303,7 @@ html {
     .center-block {
         max-width: 800px;
 
-        .control-group {
+        .controls {
             margin-bottom: 5px;
         }
     }

templates/zerver/accounts_accept_terms.html

@@ -16,8 +16,8 @@ the registration flow has its own (nearly identical) copy of the fields below in
         <div class="form-horizontal white-box">
             <form method="post" class="form-horizontal" id="registration" action="{{ url('accept_terms') }}">
                 {{ csrf_input }}
-                <div class="control-group">
+                <div id="registration-email">
-                    <label for="id_email" class="control-label">{{ _("Email") }}</label>
+                    <label for="id_email">{{ _("Email") }}</label>
                     <div class="controls fakecontrol">
                         <p>{{ email }}</p>
                     </div>
@@ -52,12 +52,10 @@ the registration flow has its own (nearly identical) copy of the fields below in
                         {% endfor %}
                     {% endif %}
                 </div>
-                <div class="control-group">
                 <div class="controls">
                     <button id="accept_tos_button" type="submit">{{ _('Accept') }}</button>
                     <input type="hidden" name="next" value="{{ next }}" />
                 </div>
-                </div>
             </form>
         </div>
     </div>

templates/zerver/development/dev_login.html

@@ -16,7 +16,6 @@ page can be easily identified in it's respective JavaScript file -->
         <p class="devlogin_subheader">(Or visit the <a href="/login/">normal login page</a>.)</p>
         <form name="direct_login_form" id="direct_login_form" method="post" class="login-form">
             <input type="hidden" name="next" value="{{ next }}" />
-            <div class="control-group">
             <div class="controls">
                 <div class="group">
                     {% if realm_web_public_access_enabled %}
@@ -86,7 +85,6 @@ page can be easily identified in it's respective JavaScript file -->
                     {% endif %}
                 </div>
             </div>
-            </div>
         </form>
         <form name="change_realm" action="{{ url('login_page') }}" method="post">
             {{ csrf_input }}

templates/zerver/login.html

@@ -90,7 +90,7 @@ page can be easily identified in it's respective JavaScript file. -->
                                 <input id="id_password" name="password" class="required" type="password" autocomplete="off"
                                   {% if email %} autofocus {% endif %}
                                   required />
-                                <label for="id_password" class="control-label">{{ _('Password') }}</label>
+                                <label for="id_password">{{ _('Password') }}</label>
                                 <i class="fa fa-eye-slash password_visibility_toggle" role="button"></i>
                             </div>
                             {% else %}