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

This commit is contained in:
Unknwon 2014-09-23 10:29:52 -04:00
commit 1476a1a729
8 changed files with 343 additions and 226 deletions

View file

@ -1610,12 +1610,16 @@ The register and sign-in page style
background-color: #FFF;
border-color: #DDD;
}
.pr-title {
padding: 4px 0;
}
.pr-title .pr-num {
font-weight: normal;
color: #888;
}
.pr-meta {
color: #888;
padding: 4px 0 8px 0;
}
.pr-meta .pr-author {
margin: 0 8px;
@ -1689,7 +1693,7 @@ The register and sign-in page style
.issue-line,
.issue-merge,
.issue-add-comment {
margin-bottom: 16px;
margin-bottom: 24px;
}
.issue-comment .author-avatar img {
margin-right: 12px;
@ -1793,6 +1797,7 @@ textarea#issue-add-content {
width: 100%;
box-sizing: border-box;
height: 120px;
resize: vertical;
}
.org-header-alert .alert {
margin-top: 10px;
@ -1827,7 +1832,11 @@ textarea#issue-add-content {
color: #d9453d;
}
#org-header > div > .menu-line > li.right > a .octicon {
margin-right: 6px;
margin-right: 4px;
}
#org-header > div > .menu-line > li.right > a .label {
margin-left: 4px;
font-size: .6em;
}
#org-header > div > .menu-line > li.right .current {
border-bottom: 2px solid #D26911;