Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Unknwon 2015-02-03 06:51:44 -05:00
commit 26bccef297
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/ng/less/gogs/settings.less
View file

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

10
templates/user/settings/email.tmpl
View file

@ -36,19 +36,21 @@
{{end}} {{end}}
</li> </li>
{{end}} {{end}}
<form action="{{AppSubUrl}}/user/settings/email" method="post"> </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}} {{.CsrfTokenHtml}}
<p class="panel-header"><strong>{{.i18n.Tr "settings.add_new_email"}}</strong></p>
<p class="field"> <p class="field">
<label class="req" for="email">{{.i18n.Tr "email"}}</label> <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>
<p class="field"> <p class="field">
<label></label> <label></label>
<button class="btn btn-green btn-radius" id="email-add-btn">{{.i18n.Tr "settings.add_email"}}</button> <button class="btn btn-green btn-radius" id="email-add-btn">{{.i18n.Tr "settings.add_email"}}</button>
</p> </p>
</form> </form>
</ul>
</div> </div>
</div> </div>
</div> </div>