... | ... |
@@ -1778,3 +1778,99 @@ button.close { |
1778 | 1778 |
margin-bottom:30px; |
1779 | 1779 |
border-radius: 0 0 2px 2px; |
1780 | 1780 |
} |
1781 |
+ |
|
1782 |
+.commits { |
|
1783 |
+ margin-top:20px; |
|
1784 |
+} |
|
1785 |
+ |
|
1786 |
+.commits-date-container { |
|
1787 |
+ border-left:#f3f3f3 2px solid; |
|
1788 |
+ margin:3px 6px; |
|
1789 |
+ padding:10px 0; |
|
1790 |
+} |
|
1791 |
+ |
|
1792 |
+.commit-date { |
|
1793 |
+ color: #767676; |
|
1794 |
+} |
|
1795 |
+ |
|
1796 |
+.commit-date i { |
|
1797 |
+ margin-right:15px; |
|
1798 |
+} |
|
1799 |
+ |
|
1800 |
+.commits-date-container li:first-child { |
|
1801 |
+ border-top: 1px solid #e5e5e5; |
|
1802 |
+} |
|
1803 |
+ |
|
1804 |
+.commits-date-container li { |
|
1805 |
+ margin-left:20px; |
|
1806 |
+ border: 1px solid #e5e5e5; |
|
1807 |
+ border-top:none; |
|
1808 |
+ padding:8px 20px 8px 15px; |
|
1809 |
+ overflow:hidden; |
|
1810 |
+} |
|
1811 |
+ |
|
1812 |
+.commit-left { |
|
1813 |
+ float:left; |
|
1814 |
+ width:70%; |
|
1815 |
+} |
|
1816 |
+ |
|
1817 |
+.commit-left-title a { |
|
1818 |
+ color:#333; |
|
1819 |
+} |
|
1820 |
+ |
|
1821 |
+.commit-left-author { |
|
1822 |
+ color: #767676; |
|
1823 |
+ margin-top:1px; |
|
1824 |
+} |
|
1825 |
+ |
|
1826 |
+.commit-right { |
|
1827 |
+ float:left; |
|
1828 |
+ width:30%; |
|
1829 |
+} |
|
1830 |
+ |
|
1831 |
+.commit-right-container { |
|
1832 |
+ float:right; |
|
1833 |
+} |
|
1834 |
+ |
|
1835 |
+.commit-right-commit-id { |
|
1836 |
+ float:left; |
|
1837 |
+ width:80px; |
|
1838 |
+} |
|
1839 |
+ |
|
1840 |
+.commit-right-commit-id a { |
|
1841 |
+ border: 1px solid #e5e5e5; |
|
1842 |
+ display:block; |
|
1843 |
+ width:100%; |
|
1844 |
+ padding:6px 10px; |
|
1845 |
+ text-align:center; |
|
1846 |
+ margin-top:3px; |
|
1847 |
+ border-radius:3px; |
|
1848 |
+} |
|
1849 |
+ |
|
1850 |
+.commit-right-commit-id a:hover { |
|
1851 |
+ text-decoration:none; |
|
1852 |
+ color:white; |
|
1853 |
+ background:#4169e1; |
|
1854 |
+} |
|
1855 |
+ |
|
1856 |
+.commit-right-browse-repository { |
|
1857 |
+ float:left; |
|
1858 |
+} |
|
1859 |
+ |
|
1860 |
+.commit-right-browse-repository a { |
|
1861 |
+ border: 1px solid #e5e5e5; |
|
1862 |
+ display:block; |
|
1863 |
+ width:100%; |
|
1864 |
+ padding:6px 5px; |
|
1865 |
+ margin-left:10px; |
|
1866 |
+ text-align:center; |
|
1867 |
+ font-weight:bold; |
|
1868 |
+ margin-top:3px; |
|
1869 |
+ border-radius:3px; |
|
1870 |
+} |
|
1871 |
+ |
|
1872 |
+.commit-right-browse-repository a:hover { |
|
1873 |
+ text-decoration:none; |
|
1874 |
+ color:white; |
|
1875 |
+ background:#4169e1; |
|
1876 |
+} |
... | ... |
@@ -59,7 +59,7 @@ |
59 | 59 |
<a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>"> |
60 | 60 |
<%= substr($commit->{id}, 0, 7) %> |
61 | 61 |
</a> |
62 |
- <%= $commit->{age_string} %> |
|
62 |
+ <span title="<%= $commit->{age_string_datetime_local} %>"><%= $commit->{age_string} %></span> |
|
63 | 63 |
</div> |
64 | 64 |
</div> |
65 | 65 |
|
... | ... |
@@ -118,56 +118,59 @@ |
118 | 118 |
%= include '/include/header'; |
119 | 119 |
|
120 | 120 |
<div class="container"> |
121 |
- <div style="margin-bottom:20px;"> |
|
121 |
+ <div> |
|
122 | 122 |
%= include '/include/branch_select', display => 'commits'; |
123 | 123 |
</div> |
124 |
- |
|
125 |
- % for my $date (reverse sort keys %$commits_date) { |
|
126 |
- <div style="margin-bottom:20px"> |
|
124 |
+ |
|
125 |
+ <div class="commits"> |
|
126 |
+ % for my $date (reverse sort keys %$commits_date) { |
|
127 | 127 |
% my $commits = $commits_date->{$date}; |
128 |
- |
|
129 |
- <div class="bk-blue-light border-blue radius-top" style="padding:5px 8px;color:#3a505b"> |
|
130 |
- <b>Commits on <%= $date %></b> |
|
128 |
+ <div class="commit-date"> |
|
129 |
+ <i class="icon-off"></i><span>Commits on <%= $date %></span> |
|
131 | 130 |
</div> |
132 |
- % my $num = 0; |
|
133 |
- % for my $commit (sort {$b->{author_epoch} <=> $a->{author_epoch}} @$commits) { |
|
134 |
- <div class="border-gray" style="font-size:14px;padding-bottom:0;border-top:none;border-bottom:none;padding:5px 5px 1px 5px"> |
|
135 |
- <div class="row"> |
|
136 |
- <div class="span8"> |
|
137 |
- <a class="font-black" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>"> |
|
138 |
- <b><%= $commit->{title_short} %></b> |
|
139 |
- </a> |
|
140 |
- % if (app->config->{basic}{show_ignore_space_change_link}) { |
|
141 |
- (<a class="font-black" style="font-size:90%;color:#9999FF" href="<%= url_for("/$user/$project/commit/$commit->{id}?w=") %>"> |
|
142 |
- ignore space |
|
143 |
- </a>) |
|
144 |
- % } |
|
145 |
- </div> |
|
146 |
- <div class="text-right"> |
|
147 |
- <a class="btn" style="width:90px;padding:0px 10px;color:#3a505b;font-size:12px" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>"> |
|
148 |
- <%= substr($commit->{id}, 0, 10) %> |
|
149 |
- <i class="icon-circle-arrow-right"></i> |
|
150 |
- </a> |
|
151 |
- </div> |
|
152 |
- </div> |
|
153 |
- </div> |
|
154 |
- <div class="border-blue <%= $num eq @$commits - 1 ? 'radius-bottom' : '' %>" style="font-size:12px;border-top:none; padding:1px 5px 5px 5px"> |
|
155 |
- <div class="row"> |
|
156 |
- <div class="span8"> |
|
157 |
- <span title="<%= $commit->{author_email} %>"><%= $commit->{author_name} %></span> <span class="muted" title="<%= $commit->{age_string_datetime_local} %>"><%= $commit->{age_string} %></span> |
|
131 |
+ |
|
132 |
+ <ul class="commits-date-container"> |
|
133 |
+ % my $num = 0; |
|
134 |
+ % for my $commit (sort {$b->{author_epoch} <=> $a->{author_epoch}} @$commits) { |
|
135 |
+ <li> |
|
136 |
+ <div class="commit-left"> |
|
137 |
+ <div class="commit-left-title"> |
|
138 |
+ <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>"> |
|
139 |
+ <b><%= $commit->{title_short} %></b> |
|
140 |
+ </a> |
|
141 |
+ % if (app->config->{basic}{show_ignore_space_change_link}) { |
|
142 |
+ (<a href="<%= url_for("/$user/$project/commit/$commit->{id}?w=") %>"> |
|
143 |
+ ignore space |
|
144 |
+ </a>) |
|
145 |
+ % } |
|
146 |
+ </div> |
|
147 |
+ <div class="commit-left-author"> |
|
148 |
+ <span title="<%= $commit->{author_email} %>"><%= $commit->{author_name} %></span> |
|
149 |
+ <span class="muted" title="<%= $commit->{age_string_datetime_local} %>"><%= $commit->{age_string} %></span> |
|
150 |
+ </div> |
|
158 | 151 |
</div> |
159 |
- <div class="text-right"> |
|
160 |
- <a class="muted" style="padding-right:18px;font-weight:bold" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>"> Browse code |
|
161 |
- </a> |
|
152 |
+ <div class="commit-right"> |
|
153 |
+ <div class="commit-right-container"> |
|
154 |
+ <div class="commit-right-commit-id"> |
|
155 |
+ <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>"> |
|
156 |
+ <%= substr($commit->{id}, 0, 7) %> |
|
157 |
+ </a> |
|
158 |
+ </div> |
|
159 |
+ <div class="commit-right-browse-repository"> |
|
160 |
+ <a title="Browse the repository at this point in the history" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>"> |
|
161 |
+ <> |
|
162 |
+ </a> |
|
163 |
+ </div> |
|
164 |
+ </div> |
|
162 | 165 |
</div> |
163 |
- </div> |
|
164 |
- </div> |
|
165 |
- % $num++; |
|
166 |
- % } |
|
167 |
- </div> |
|
168 |
- % } |
|
169 |
- |
|
170 |
- <ul class="pager" style="text-align:left"> |
|
166 |
+ % $num++; |
|
167 |
+ </li> |
|
168 |
+ % } |
|
169 |
+ </ul> |
|
170 |
+ % } |
|
171 |
+ </div> |
|
172 |
+ |
|
173 |
+ <ul class="pager"> |
|
171 | 174 |
% if ($page == 0) { |
172 | 175 |
<li class="disabled">« Newer</li> |
173 | 176 |
% } else { |