From e43bd15b968523ec86dba143b9634397f2d8bc40 Mon Sep 17 00:00:00 2001
From: Alexey Makhov <makhov.alex@gmail.com>
Date: Tue, 3 Feb 2015 10:32:55 +0300
Subject: [PATCH 1/2] fix settings/email html&css

---
 public/ng/css/gogs.css             |  5 ++++-
 templates/user/settings/email.tmpl | 16 +++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 12ae89ed4b..653b4dc934 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1761,6 +1761,7 @@ The register and sign-in page style
 #org-setting-form,
 #repo-setting-form,
 #user-profile-form,
+#add-email-form,
 .repo-setting-form {
   background-color: #FFF;
   padding: 30px 0;
@@ -1789,6 +1790,7 @@ The register and sign-in page style
 #org-setting-form .ipt,
 #repo-setting-form .ipt,
 #user-profile-form .ipt,
+#add-email-form .ipt,
 .repo-setting-form .ipt {
   width: 360px;
 }
@@ -1819,7 +1821,7 @@ The register and sign-in page style
 #repo-hooks-panel .setting-list,
 #repo-hooks-history-panel .setting-list,
 #user-social-panel .setting-list,
-#user-applications-panel .setting-list,
+#user-applications-panel .setting-list, 
 #user-ssh-panel .setting-list {
   background-color: #FFF;
 }
@@ -1827,6 +1829,7 @@ The register and sign-in page style
 #repo-hooks-history-panel .setting-list li,
 #user-social-panel .setting-list li,
 #user-applications-panel .setting-list li,
+#user-email-panel .setting-list li,
 #user-ssh-panel .setting-list li {
   padding: 8px 20px;
   border-bottom: 1px solid #eaeaea;
diff --git a/templates/user/settings/email.tmpl b/templates/user/settings/email.tmpl
index fc8bcbbcf9..c5dfbeb7e1 100644
--- a/templates/user/settings/email.tmpl
+++ b/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>

From 32fb5ea5d08d6e3d53e898a5b5b75f3b5401d1ef Mon Sep 17 00:00:00 2001
From: Alexey Makhov <makhov.alex@gmail.com>
Date: Tue, 3 Feb 2015 11:05:13 +0300
Subject: [PATCH 2/2] fix settings/email html&css in less

---
 public/ng/css/gogs.css            | 5 +----
 public/ng/less/gogs/settings.less | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 653b4dc934..12ae89ed4b 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1761,7 +1761,6 @@ The register and sign-in page style
 #org-setting-form,
 #repo-setting-form,
 #user-profile-form,
-#add-email-form,
 .repo-setting-form {
   background-color: #FFF;
   padding: 30px 0;
@@ -1790,7 +1789,6 @@ The register and sign-in page style
 #org-setting-form .ipt,
 #repo-setting-form .ipt,
 #user-profile-form .ipt,
-#add-email-form .ipt,
 .repo-setting-form .ipt {
   width: 360px;
 }
@@ -1821,7 +1819,7 @@ The register and sign-in page style
 #repo-hooks-panel .setting-list,
 #repo-hooks-history-panel .setting-list,
 #user-social-panel .setting-list,
-#user-applications-panel .setting-list, 
+#user-applications-panel .setting-list,
 #user-ssh-panel .setting-list {
   background-color: #FFF;
 }
@@ -1829,7 +1827,6 @@ The register and sign-in page style
 #repo-hooks-history-panel .setting-list li,
 #user-social-panel .setting-list li,
 #user-applications-panel .setting-list li,
-#user-email-panel .setting-list li,
 #user-ssh-panel .setting-list li {
   padding: 8px 20px;
   border-bottom: 1px solid #eaeaea;
diff --git a/public/ng/less/gogs/settings.less b/public/ng/less/gogs/settings.less
index de923daba8..9816454458 100644
--- a/public/ng/less/gogs/settings.less
+++ b/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 {