Merge branch 'master' of github.com:gogits/gogs into dev

public/ng/less/gogs/settings.less

@@ -35,6 +35,7 @@
 #org-setting-form,
 #repo-setting-form,
 #user-profile-form,
+#add-email-form,
 .repo-setting-form {
     background-color: #FFF;
     padding: 30px 0;
@@ -69,6 +70,7 @@
 #repo-hooks-history-panel,
 #user-social-panel,
 #user-applications-panel,
+#user-email-panel,
 #user-ssh-panel {
     margin-bottom: 20px;
     .setting-list {

templates/user/settings/email.tmpl

@@ -36,19 +36,21 @@
 							   {{end}}
                             </li>
                             {{end}}
-                             <form action="{{AppSubUrl}}/user/settings/email" method="post">
-							{{.CsrfTokenHtml}}
-							<p class="panel-header"><strong>{{.i18n.Tr "settings.add_new_email"}}</strong></p>
-							<p class="field">
+                        </ul>
+                        <div class="panel-header">
+                             <strong>{{.i18n.Tr "settings.add_new_email"}}</strong>
+                        </div>
+                        <form class="form form-align panel-body" id="add-email-form" action="{{AppSubUrl}}/user/settings/email" method="post">
+                            {{.CsrfTokenHtml}}                            
+                            <p class="field">
                                 <label class="req" for="email">{{.i18n.Tr "email"}}</label>
-                                <input class="ipt ipt-radius" id="email" name="email" type="text" required />
+                                <input class="ipt ipt-large ipt-radius" id="email" name="email" type="text" required />
                             </p>
                             <p class="field">
                                 <label></label>
                                 <button class="btn btn-green btn-radius" id="email-add-btn">{{.i18n.Tr "settings.add_email"}}</button>
                             </p>
-							</form>
-                        </ul>
+                        </form>
                     </div>                    
                 </div>
             </div>