coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:gogits/gogs

This commit is contained in:
Lunny Xiao 2014-03-23 17:41:14 +08:00
parent 0119675480 c9e830cefb
commit ace20602b5
7 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/markdown.css
View File

@ -175,6 +175,10 @@
margin-bottom: 0; margin-bottom: 0;
} }
.markdown img {
max-width: 100%;
}
.markdown .btn { .markdown .btn {
color: #fff; color: #fff;
} }

BIN
public/img/404.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
public/img/500.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

2
public/js/app.js
View File

@ -98,7 +98,7 @@ var Gogits = {
}; };
// fix dropdown inside click // fix dropdown inside click
Gogits.initDropDown = function(){ Gogits.initDropDown = function(){
$('.dropdown-menu').on('click','a,button,input,select',function(e){ $('.dropdown-menu.no-propagation').on('click',function(e){
e.stopPropagation(); e.stopPropagation();
}); });
}; };

2
templates/repo/nav.tmpl
View File

@ -18,7 +18,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<div class="dropdown-menu clone-group-btn dropdown-menu-right"> <div class="dropdown-menu clone-group-btn dropdown-menu-right no-propagation">
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default" data-link="{{.CloneLink.SSH}}" type="button">SSH</button> <button class="btn btn-default" data-link="{{.CloneLink.SSH}}" type="button">SSH</button>

5
templates/status/404.tmpl
View File

@ -1,7 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
{{template "base/navbar" .}} {{template "base/navbar" .}}
<div id="gogs-body" class="container"> <div id="gogs-body" class="container text-center">
<h4>This page is not found !</h4> <p style="margin-top: 80px"><img src="/img/404.png" alt="404"/></p>
<hr/>
<p>Application Version: {{AppVer}}</p> <p>Application Version: {{AppVer}}</p>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

5
templates/status/500.tmpl
View File

@ -1,7 +1,10 @@
{{template "base/head" .}} {{template "base/head" .}}
{{template "base/navbar" .}} {{template "base/navbar" .}}
<div id="gogs-body" class="container"> <div id="gogs-body" class="container text-center">
<p style="margin-top: 80px"><img src="/img/500.png" alt="404"/></p>
<hr/>
<p>An error is occurred : {{.ErrorMsg}}</p> <p>An error is occurred : {{.ErrorMsg}}</p>
<hr/>
<p>Application Version: {{AppVer}}</p> <p>Application Version: {{AppVer}}</p>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}