From: Dan Brown <redacted>
Date: Thu, 7 Dec 2017 18:47:07 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/Abijeet/BookStack
X-Git-Tag: v0.19.0~1^2~11
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6063ac4a119f6defaf06b282540d815df7b040ae?ds=inline;hp=-c

Merge branch 'master' of git://github.com/Abijeet/BookStack
---

6063ac4a119f6defaf06b282540d815df7b040ae
diff --combined resources/assets/sass/_grid.scss
index b42ad37bb,4cef2cebd..c145f4280
--- a/resources/assets/sass/_grid.scss
+++ b/resources/assets/sass/_grid.scss
@@@ -135,7 -135,7 +135,7 @@@ body.flexbox 
      width: 30%;
      left: 0;
      height: 100%;
-     overflow-y: scroll;
+     overflow-y: auto;
      -ms-overflow-style: none;
      //background-color: $primary-faded;
      border-left: 1px solid #DDD;
@@@ -195,14 -195,6 +195,14 @@@ div[class^="col-"] img 
    display: inline-block;
  }
  
 +@include larger-than(991px) {
 +  .row.auto-clear .col-md-4:nth-child(3n+1){clear:left;}
 +}
 +
 +@include smaller-than(992px) {
 +  .row.auto-clear .col-xs-6:nth-child(2n+1){clear:left;}
 +}
 +
  .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
    position: relative;
    min-height: 1px;
diff --combined resources/assets/sass/_lists.scss
index 4bc31bbb0,298ce32cb..0496d794e
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@@ -82,6 -82,9 +82,9 @@@
    .h6 {
      margin-left: $nav-indent*4;
    }
+   .current-heading {
+     font-weight: bold;
+   }
  }
  
  // Sidebar list
@@@ -373,51 -376,3 +376,51 @@@ ul.pagination 
      border-bottom: 1px solid #DDD;
    }
  }
 +
 +// Books grid view
 +.featured-image-container {
 +  position: relative;
 +  overflow: hidden;
 +  background: #F2F2F2;
 +  border: 1px solid #ddd;
 +  border-bottom: 0;
 +  img {
 +    display: block;
 +    max-width: 100%;
 +    height: auto;
 +    transition: all .5s ease;
 +  }
 +  img:hover {
 +    transform: scale(1.15);
 +    opacity: .5;
 +  }
 +}
 +
 +.book-grid-content {
 +  padding: 30px;
 +  border: 1px solid #ddd;
 +  border-top: 0;
 +  border-bottom-width: 2px;
 +  h2 {
 +    font-size: 1.5em;
 +    margin: 0 0 10px;
 +  }
 +  h2 a {
 +    display: block;
 +    line-height: 1.2;
 +    color: #009688;;
 +    text-decoration: none;
 +  }
 +  p {
 +    font-size: .85em;
 +    margin: 0 0 10px;
 +    line-height: 1.6em;
 +  }
 +  p.small {
 +    font-size: .8em;
 +  }
 +}
 +
 +.book-grid-item {
 +  margin-bottom : 20px;
 +}