pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

finish transforming to v2

Browse source
This commit is contained in:
Unknwon 2015-08-10 00:23:20 +08:00
parent 7372042441
commit 8a3ee795d2
8 changed files with 79 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/css/gogs.min.css vendored
View file

File diff suppressed because one or more lines are too long

4
public/less/_base.less
View file

@ -105,10 +105,6 @@ footer {
text-align: center; text-align: center;
} }
.text-error {
color: #d95c5c !important;
}
.generate-img(16); .generate-img(16);
.generate-img(@n, @i: 1) when (@i =< @n) { .generate-img(@n, @i: 1) when (@i =< @n) {
.img-@{i} { .img-@{i} {

72
public/less/_repository.less
View file

@ -160,42 +160,46 @@
} }
} }
} }
// &.new.milestone { &.new.milestone {
// textarea { textarea {
// height: 200px; height: 200px;
// } }
// } #deadline {
width: 150px;
// &.settings { }
// .content { }
// padding-left: 20px!important;
// }
// }
} }
// .settings .key.list { .settings .key.list {
// .item:not(:first-child) { .item:not(:first-child) {
// border-top: 1px solid #eaeaea; border-top: 1px solid #eaeaea;
// } }
// .ssh-key-state-indicator { .ssh-key-state-indicator {
// float: left; float: left;
// color: gray; color: gray;
// padding-left: 10px; padding-left: 10px;
// padding-top: 10px; padding-top: 10px;
// &.active { &.active {
// color: #6cc644; color: #6cc644;
// } }
// } }
// .meta { .meta {
// padding-top: 5px; padding-top: 5px;
// } }
// .print { .print {
// color: #767676; color: #767676;
// } }
// .activity { .activity {
// color: #666; color: #666;
// } }
// } }
.ui.vertical.menu {
.header.item {
font-size: 1.1em;
background: #f0f0f0;
}
}
.edit-label.modal, .edit-label.modal,
.new-label.segment { .new-label.segment {

26
templates/repo/issue/milestone_new.tmpl
View file

@ -1,7 +1,7 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository new milestone"> <div class="repository new milestone">
{{template "repo/header" .}} {{template "repo/header" .}}
<div class="ui middle page grid body"> <div class="ui container">
<div class="navbar"> <div class="navbar">
{{template "repo/issue/navbar" .}} {{template "repo/issue/navbar" .}}
{{if and .IsRepositoryAdmin .PageIsEditMilestone}} {{if and .IsRepositoryAdmin .PageIsEditMilestone}}
@ -11,7 +11,6 @@
{{end}} {{end}}
</div> </div>
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="sixteen wide column page grid">
<h2 class="ui dividing header"> <h2 class="ui dividing header">
{{if .PageIsEditMilestone}} {{if .PageIsEditMilestone}}
{{.i18n.Tr "repo.milestones.edit"}} {{.i18n.Tr "repo.milestones.edit"}}
@ -21,13 +20,9 @@
<div class="sub header">{{.i18n.Tr "repo.milestones.new_subheader"}}</div> <div class="sub header">{{.i18n.Tr "repo.milestones.new_subheader"}}</div>
{{end}} {{end}}
</h2> </h2>
{{template "base/alert" .}}
<form class="ui form grid" action="{{.Link}}" method="post"> <form class="ui form grid" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
{{if .Flash}}
<div class="sixteen wide column">
{{template "base/alert" .}}
</div>
{{end}}
<div class="eleven wide column"> <div class="eleven wide column">
<div class="field {{if .Err_Title}}error{{end}}"> <div class="field {{if .Err_Title}}error{{end}}">
<label>{{.i18n.Tr "repo.milestones.title"}}</label> <label>{{.i18n.Tr "repo.milestones.title"}}</label>
@ -38,7 +33,7 @@
<textarea name="content">{{.content}}</textarea> <textarea name="content">{{.content}}</textarea>
</div> </div>
</div> </div>
<div class="three wide column"> <div class="four wide column">
<div class="field {{if .Err_Deadline}}error{{end}}"> <div class="field {{if .Err_Deadline}}error{{end}}">
<label> <label>
{{.i18n.Tr "repo.milestones.due_date"}} {{.i18n.Tr "repo.milestones.due_date"}}
@ -50,21 +45,24 @@
<input class="milestone datepicker" data-lang="{{.DateLang}}" data-start-date="{{.deadline}}"> <input class="milestone datepicker" data-lang="{{.DateLang}}" data-start-date="{{.deadline}}">
</div> </div>
</div> </div>
<div class="ui container">
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui right">
{{if .PageIsEditMilestone}} {{if .PageIsEditMilestone}}
<button class="ui right green button"> <a class="ui blue basic button" href="{{.RepoLink}}/milestones">
{{.i18n.Tr "repo.milestones.modify"}}
</button>
<a class="ui right blue basic button" href="{{.RepoLink}}/milestones">
{{.i18n.Tr "repo.milestones.cancel"}} {{.i18n.Tr "repo.milestones.cancel"}}
</a> </a>
<button class="ui green button">
{{.i18n.Tr "repo.milestones.modify"}}
</button>
{{else}} {{else}}
<button class="ui right green button"> <button class="ui green button">
{{.i18n.Tr "repo.milestones.create"}} {{.i18n.Tr "repo.milestones.create"}}
</button> </button>
{{end}} {{end}}
</form>
</div> </div>
</div> </div>
</form>
</div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

26
templates/repo/settings/deploy_keys.tmpl
View file

@ -1,16 +1,17 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository settings"> <div class="repository settings">
{{template "repo/header" .}} {{template "repo/header" .}}
<div class="ui page grid"> <div class="ui container">
<div class="ui grid">
{{template "repo/settings/navbar" .}} {{template "repo/settings/navbar" .}}
<div class="twelve wide column content"> <div class="twelve wide column content">
{{template "base/alert" .}} {{template "base/alert" .}}
<h4 class="ui top attached header"> <h3 class="ui top attached header">
{{.i18n.Tr "repo.settings.deploy_keys"}} {{.i18n.Tr "repo.settings.deploy_keys"}}
<div class="ui right"> <div class="ui right">
<div id="add-deploy-key" class="ui blue tiny button">{{.i18n.Tr "repo.settings.add_deploy_key"}}</div> <div id="add-deploy-key" class="ui blue tiny button">{{.i18n.Tr "repo.settings.add_deploy_key"}}</div>
</div> </div>
</h4> </h3>
<div class="ui attached segment"> <div class="ui attached segment">
{{if .Deploykeys}} {{if .Deploykeys}}
<div class="ui key list"> <div class="ui key list">
@ -31,7 +32,7 @@
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
</div> </div>
</div> </div>
<div class="three wide column"> <div class="two wide column">
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> <button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
{{$.i18n.Tr "settings.delete_key"}} {{$.i18n.Tr "settings.delete_key"}}
</button> </button>
@ -67,31 +68,26 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="ui basic delete modal"> <div class="ui small basic delete modal">
<div class="header"> <div class="ui icon header">
<i class="trash icon"></i>
{{.i18n.Tr "repo.settings.deploy_key_deletion"}} {{.i18n.Tr "repo.settings.deploy_key_deletion"}}
</div> </div>
<div class="content"> <div class="content">
<div class="image">
<i class="trash icon"></i>
</div>
<div class="description">
<p>{{.i18n.Tr "repo.settings.deploy_key_deletion_desc"}}</p> <p>{{.i18n.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
</div> </div>
</div>
<div class="actions"> <div class="actions">
<div class="two fluid ui inverted buttons"> <div class="ui red basic inverted cancel button">
<div class="ui red basic inverted button">
<i class="remove icon"></i> <i class="remove icon"></i>
{{.i18n.Tr "modal.no"}} {{.i18n.Tr "modal.no"}}
</div> </div>
<div class="ui green basic inverted positive button"> <div class="ui green basic inverted ok button">
<i class="checkmark icon"></i> <i class="checkmark icon"></i>
{{.i18n.Tr "modal.yes"}} {{.i18n.Tr "modal.yes"}}
</div> </div>
</div> </div>
</div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

1
templates/repo/settings/navbar.tmpl
View file

@ -1,5 +1,6 @@
<div class="four wide column"> <div class="four wide column">
<div class="ui vertical menu"> <div class="ui vertical menu">
<div class="header item">{{.i18n.Tr "repo.settings"}}</div>
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings"> <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings">
{{.i18n.Tr "repo.settings.options"}} {{.i18n.Tr "repo.settings.options"}}
</a> </a>