diff options
| author | Unknwon <joe2010xtmf@163.com> | 2015-02-03 06:51:44 -0500 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2015-02-03 06:51:44 -0500 |
| commit | 26bccef297913a6bc679edee809159616a98b0af (patch) | |
| tree | d02238f7a8dc6772937139c7786471cd0f5a6e6d | |
| parent | 4de0b19cece439dceb285c56dde1e5ce2f67b098 (diff) | |
| parent | e8b62e8957c28bc8746924ebb02d49f844c27b03 (diff) | |
| download | gitea-26bccef297913a6bc679edee809159616a98b0af.tar.gz gitea-26bccef297913a6bc679edee809159616a98b0af.zip | |
Merge branch 'master' of github.com:gogits/gogs into dev
| -rw-r--r-- | public/ng/less/gogs/settings.less | 2 | ||||
| -rw-r--r-- | templates/user/settings/email.tmpl | 16 |
2 files changed, 11 insertions, 7 deletions
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 { 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> |