From b73241ceb175b437c114dae686c9cffb69396e41 Mon Sep 17 00:00:00 2001
From: Adam Strzelecki <ono@java.pl>
Date: Thu, 3 Dec 2015 01:15:40 +0100
Subject: [PATCH] UI: Display last-commit header without 2nd column
This uses a CSS trick making first th to be relative block with width equal to
first two columns, effectively working around inability to use colspan="2" on
first row that was breaking "fixed-layout" for tables.
Also use grey header for last-commit SHA1 tag.
---
public/css/gogs.css | 5 +++++
public/less/_repository.less | 5 +++++
templates/repo/view_list.tmpl | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/public/css/gogs.css b/public/css/gogs.css
index eb6188b37f..c3ac5ffce1 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1859,6 +1859,11 @@ footer .container .links > *:first-child {
padding-bottom: 5px;
font-weight: normal;
}
+.repository.file.list #repo-files-table thead th:first-child {
+ display: block;
+ position: relative;
+ width: 325%;
+}
.repository.file.list #repo-files-table thead .ui.avatar {
margin-bottom: 5px;
}
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 25a71078e1..ee17177fc1 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -146,6 +146,11 @@
padding-top: 8px;
padding-bottom: 5px;
font-weight: normal;
+ &:first-child {
+ display: block;
+ position: relative;
+ width: 325%;
+ }
}
.ui.avatar {
margin-bottom: 5px;
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 9b6c0aaa19..4acfa2b676 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -9,10 +9,10 @@
<img class="ui avatar image img-12" src="{{AvatarLink .LastCommit.Author.Email}}" />
<strong>{{.LastCommit.Author.Name}}</strong>
{{end}}
+ <a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.LastCommit.ID}}" rel="nofollow">{{ShortSha .LastCommit.ID.String}}</a>
+ <span class="grey">{{RenderCommitMessage .LastCommit.Summary .RepoLink}}</span>
</th>
<th class="nine wide">
- <a rel="nofollow" class="ui green sha label" href="{{.RepoLink}}/commit/{{.LastCommit.ID}}" rel="nofollow">{{ShortSha .LastCommit.ID.String}}</a>
- <span class="grey">{{RenderCommitMessage .LastCommit.Summary .RepoLink}}</span>
</th>
<th class="three wide text grey right age">{{TimeSince .LastCommit.Author.When $.Lang}}</th>
</tr>