Merge pull request #9 from OsmosysSoftware/feature-181

Feature 181
BookStackApp · Jul 13, 2017 · 21a8df7 · 21a8df7
2 parents f375090 + 7f8351e
commit 21a8df7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/public/default.png b/public/default.png
diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss
@@ -280,7 +280,7 @@ $btt-size: 40px;
   margin-bottom: 32px;
   height: 330px;
   overflow: hidden;
-  border: 1px solid #9e9e9e;
+  border: 1px solid #ccc;
   h4 {
     font-size: 1.2em;
     text-align: center;
@@ -301,4 +301,10 @@ $btt-size: 40px;
   img {
     border-radius: 3px;
   }
-}
+}
+
+.cover {
+    height: 192px;
+    width: 120px;
+    border-radius: 3px;
+  }
diff --git a/resources/views/books/form.blade.php b/resources/views/books/form.blade.php
@@ -21,7 +21,7 @@
             'currentImage' => @isset($model) ? $model->getBookCover(80) : baseUrl('/default.png') ,
             'currentId' => @isset($model) ? $model->image : 0,
             'name' => 'image',
-            'imageClass' => 'avatar cover'
+            'imageClass' => 'cover'
         ])
 </div>
 <div class="form-group">

diff --git a/resources/views/books/grid-item.blade.php b/resources/views/books/grid-item.blade.php
@@ -1,4 +1,4 @@
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3"  data-entity-type="book" data-entity-id="{{$book->id}}">
+<div class="col-xs-6 col-sm-4 col-md-4 col-lg-3"  data-entity-type="book" data-entity-id="{{$book->id}}">
     <div class="gallery-item">
     <h4>
         <a class="text-book entity-list-item-link" href="{{$book->getUrl()}}"><i class="zmdi zmdi-book"></i><span class="entity-list-item-name">{{$book->name}}</span>

diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
@@ -24,12 +24,14 @@
                 <h1>{{ trans('entities.books') }}</h1>
                 @if(count($books) > 0)
                     @if($books_display=='grid')
+                      <div class="row">
                         @foreach($books as $book)
                             @include('books/grid-item', ['book' => $book])
                         @endforeach
                         <div class="col-xs-12">
                             {!! $books->render() !!}
                         </div>
+                      </div>
                     @else
                         @foreach($books as $book)
                             @include('books/list-item', ['book' => $book])