From: Abijeet Patro <redacted>
Date: Sun, 18 Mar 2018 18:14:33 +0000 (+0530)
Subject: Merge branch 'master' into bug/image-upload
X-Git-Tag: v0.20.1~1^2~9^2^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/pull/754/head?hp=-c

Merge branch 'master' into bug/image-upload
---

0335f584783ee5a892aba751e27ce95e7b9921c3
diff --combined app/Http/Controllers/ImageController.php
index 17e690813,d71e38346..9782a94c4
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@@ -120,7 -120,7 +120,7 @@@ class ImageController extends Controlle
      {
          $this->checkPermission('image-create-all');
          $this->validate($request, [
-             'file' => 'image'
 -            'file' => 'required|is_image'
++            'file' => 'required|image'
          ]);
  
          if (!$this->imageRepo->isValidType($type)) {
diff --combined resources/assets/sass/_components.scss
index 0b5d767fa,f15528167..430b93757
--- a/resources/assets/sass/_components.scss
+++ b/resources/assets/sass/_components.scss
@@@ -10,8 -10,8 +10,8 @@@
    box-shadow: $bs-med;
    z-index: 999999;
    cursor: pointer;
-   max-width: 480px;
-   transition: transform ease-in-out 360ms;
+   max-width: 360px;
+   transition: transform ease-in-out 280ms;
    transform: translate3d(580px, 0, 0);
    display: grid;
    grid-template-columns: 64px 1fr;
@@@ -27,6 -27,7 +27,7 @@@
    }
    span {
      vertical-align: middle;
+     line-height: 1.3;
    }
    &.pos {
      background-color: $positive;
@@@ -43,6 -44,9 +44,9 @@@
    &.showing {
      transform: translate3d(0, 0, 0);
    }
+   &.showing:hover {
+     transform: translate3d(0, -2px, 0);
+   }
  }
  
  [chapter-toggle] {
@@@ -207,7 -211,6 +211,7 @@@ body.flexbox-support #entity-selector-w
    margin-left: 1px;
    padding: $-m $-l;
    overflow-y: auto;
 +  overflow-x: hidden;
    border-left: 1px solid #DDD;
    .dropzone-container {
      margin-top: $-m;
@@@ -312,7 -315,8 +316,7 @@@
  
  .dz-preview.dz-file-preview .dz-image {
    border-radius: 4px;
 -  background: #999;
 -  background: linear-gradient(to bottom, #eee, #ddd);
 +  background: #e9e9e9;
  }
  
  .dz-preview.dz-file-preview .dz-details {
@@@ -328,12 -332,11 +332,12 @@@
  }
  
  .dz-preview .dz-remove {
 -  font-size: 14px;
 +  font-size: 13px;
    text-align: center;
    display: block;
    cursor: pointer;
    border: none;
 +  margin-top: 3px;
  }
  
  .dz-preview .dz-remove:hover {
@@@ -382,7 -385,7 +386,7 @@@
    border: 1px solid transparent;
  }
  
 -.dz-preview .dz-details .dz-filename span, .dz-preview .dz-details .dz-size span {
 +.dz-preview .dz-details .dz-filename span {
    background-color: rgba(255, 255, 255, 0.4);
    padding: 0 0.4em;
    border-radius: 3px;
@@@ -418,13 -421,13 +422,13 @@@
  .dz-preview .dz-success-mark, .dz-preview .dz-error-mark {
    pointer-events: none;
    opacity: 0;
 -  z-index: 500;
 +  z-index: 1001;
    position: absolute;
    display: block;
    top: 50%;
    left: 50%;
    margin-left: -27px;
 -  margin-top: -27px;
 +  margin-top: -35px;
  }
  
  .dz-preview .dz-success-mark svg, .dz-preview .dz-error-mark svg {
@@@ -479,13 -482,9 +483,13 @@@
    display: block;
  }
  
 -.dz-preview.dz-error:hover .dz-error-message {
 -  opacity: 1;
 -  pointer-events: auto;
 +.dz-preview.dz-error {
 +  .dz-image, .dz-details {
 +    &:hover ~ .dz-error-message {
 +      opacity: 1;
 +      pointer-events: auto;
 +    }
 +  }
  }
  
  .dz-preview .dz-error-message {
@@@ -497,7 -496,7 +501,7 @@@
    opacity: 0;
    transition: opacity 0.3s ease;
    border-radius: 4px;
 -  font-size: 11.5px;
 +  font-size: 12px;
    line-height: 1.2;
    top: 88px;
    left: -26px;
@@@ -598,4 -597,4 +602,4 @@@
    .text-muted {
      color: #999;
    }
 -}
 +}
diff --combined resources/assets/sass/_pages.scss
index cb1cae19f,3555111d8..3749b5321
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@@ -2,6 -2,7 +2,7 @@@
    display: flex;
    flex-direction: column;
    align-items: stretch;
+   overflow: hidden;
    .faded-small {
      height: auto;
    }
@@@ -209,9 -210,6 +210,9 @@@
      flex: 1;
      padding-top: 0;
    }
 +  div[toolbox-tab-content] .padded.files {
 +	overflow-x: hidden;
 +  }
    h4 {
      font-size: 24px;
      margin: $-m 0 0 0;