Merge branch 'master' into feat/integrate-with-hackmd

CHANGES.md

@@ -9,6 +9,7 @@ CHANGES
 
 * Improvement: Show help for header search box
 * Fix: Couldn't delete page completely from search result page
+* Fix: Tabs of trash page are broken
 
 ## 3.1.13
 

lib/views/widget/page_tabs.html

@@ -58,6 +58,7 @@
         {% endif %}
       </ul>
     </li>
+    {% endif %}
   {% endif %}
 
   <li class="nav-main-right-tab pull-right">

resource/styles/scss/theme/_override-agileadmin.scss

@@ -76,33 +76,33 @@ a {
  * Alert
  */
 .alert {
-  a {
+  a:not(.btn) {
     color: white;
   }
 
   &.alert-info {
-    a {
+    a:not(.btn) {
       &:hover, &:focus {
         color: lighten($info, 40%);
       }
     }
   }
   &.alert-success {
-    a {
+    a:not(.btn) {
       &:hover, &:focus {
         color: lighten($success, 40%);
       }
     }
   }
   &.alert-warning {
-    a {
+    a:not(.btn) {
       &:hover, &:focus {
         color: lighten($warning, 30%);
       }
     }
   }
   &.alert-danger {
-    a {
+    a:not(.btn) {
       &:hover, &:focus {
         color: lighten($danger, 30%);
       }