Commit 43106029 authored by Leo Iannacone's avatar Leo Iannacone

Merge remote-tracking branch 'github/master' into portable

parents a844f32c d2525294
......@@ -294,6 +294,7 @@ function Page_Distrubion(socket) {
view.package.orig_name + '.datestamp';
debug(2, 'getting datestamp');
$.get(url, function (data) {
data = data.replace(/ (\d+:\d+(:\d+)?)$/mg, ' <b>$1</b>');
data = data.replace('Build finished', 'finished');
data = data.replace('Elapsed', 'elapsed');
data = data.replace(/\n$/g, '');
......
......@@ -165,9 +165,12 @@ footer .info {
}
#file .datestamp {
padding-top: 3px;
margin-top: 2px;
display: inline-block;
background: #f4f4f4;
padding: 4px 10px;
margin-bottom: 10px;
border-radius: 4px;
font-size: 75%;
}
#file pre.preview {
......
......@@ -65,7 +65,7 @@
</header>
<div id="welcome"></div>
<div id="file">
<h5><span class="label label-default datestamp"></span></h5>
<div class="datestamp"></div>
<pre></pre>
<div id="fileOffset"></div>
</div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment