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

public/css/markdown.css

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

public/js/app.js

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

templates/repo/nav.tmpl

@@ -18,7 +18,7 @@
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                         <span class="caret"></span>
                     </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">
                             <span class="input-group-btn">
                                 <button class="btn btn-default" data-link="{{.CloneLink.SSH}}" type="button">SSH</button>

templates/status/404.tmpl

@@ -1,7 +1,8 @@
 {{template "base/head" .}}
 {{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>
 </div>
 {{template "base/footer" .}}

templates/status/500.tmpl

@@ -1,7 +1,10 @@
 {{template "base/head" .}}
 {{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>
+    <hr/>
     <p>Application Version: {{AppVer}}</p>
 </div>
 {{template "base/footer" .}}