Removed throttling from web-end requests

Generally seems to cause issues when secure images are in use.
Was added during laravel upgrade but laravel does not use this directly
for its web middleware anyway.

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 4517deb903213aa06c8a9c95e7ca0cabfda6cf8c..a0c45ea896acdb18aed235ec7b51b14133c5a32f 100644 (file)
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -26,7 +26,6 @@ class Kernel extends HttpKernel
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-            \Illuminate\Routing\Middleware\ThrottleRequests::class,

             \BookStack\Http\Middleware\VerifyCsrfToken::class,
             \BookStack\Http\Middleware\Localization::class,
             \BookStack\Http\Middleware\GlobalViewData::class,
             \BookStack\Http\Middleware\VerifyCsrfToken::class,
             \BookStack\Http\Middleware\Localization::class,
             \BookStack\Http\Middleware\GlobalViewData::class,

diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index 824c229bd7e28df6ef10be61043c127adb816e8e..32d873642f46c41d7ebc8fa33c742a7014989290 100644 (file)
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -385,7 +385,7 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] {
   button {
     background-color: transparent;
     border: none;
   button {
     background-color: transparent;
     border: none;

-    fill: #666;
+    @include lightDark(color, #666, #AAA);

     padding: 0;
     cursor: pointer;
     position: absolute;
     padding: 0;
     cursor: pointer;
     position: absolute;

diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss
index 1c4bf948ff0f3c9366a048b29ca3290ace6df3b3..e0a8ad1a42fda5e77f50c1218d7bbcf3c191d6b4 100644 (file)
--- a/resources/sass/_header.scss
+++ b/resources/sass/_header.scss
@@ -98,6 +98,7 @@ header .search-box {
   button {
     z-index: 1;
     left: 16px;
   button {
     z-index: 1;
     left: 16px;

+    @include lightDark(color, rgba(255, 255, 255, 0.8), #AAA);

     @include rtl {
       left: auto;
       right: 16px;
     @include rtl {
       left: auto;
       right: 16px;


@@ -264,7 +265,7 @@ header .search-box {
       display: none;
     }
     > span:first-child {
       display: none;
     }
     > span:first-child {

-      margin-block-end: 0;
+      margin-inline-end: 0;

     }
   }
 }
     }
   }
 }


@@ -280,7 +281,7 @@ header .search-box {
     }
   }
   .svg-icon {
     }
   }
   .svg-icon {

-    margin-block-end: 0;
+    margin-inline-end: 0;

   }
 }
 
   }
 }
 

diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index 9324bbf7b85fe4b88b6f2d22aaa89a69390fb336..8165d532d39d55eab6af76355a650091980a7cd5 100644 (file)
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -358,7 +358,8 @@ ul.pagination {
     }
   }
   li.active span {
     }
   }
   li.active span {

-    color: #FFF;
+    @include lightDark(color, #444, #eee);
+    @include lightDark(background-color, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.5));

   }
 }
 
   }
 }
 

diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 1833a0c6e3b3bf16fee7068bac31f1774f58bb28..1ed02d2e7bec40c957a816134b0812aa1aa50666 100755 (executable)
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -151,15 +151,16 @@ body.mce-fullscreen, body.markdown-fullscreen {
 }
 .pointer {
   border: 1px solid #CCC;
 }
 .pointer {
   border: 1px solid #CCC;

+  @include lightDark(border-color, #ccc, #000);

   display: flex;
   align-items: center;
   justify-items: center;
   padding: $-s $-s;
   border-radius: 4px;
   display: flex;
   align-items: center;
   justify-items: center;
   padding: $-s $-s;
   border-radius: 4px;

-  box-shadow: 0 0 12px 1px rgba(212, 209, 209, 0.3);
+  box-shadow: 0 0 12px 1px rgba(0, 0, 0, 0.1);

   position: absolute;
   top: -60px;
   position: absolute;
   top: -60px;

-  background-color:#FFF;
+  @include lightDark(background-color, #fff, #333);

   width: 275px;
   z-index: 55;
 
   width: 275px;
   z-index: 55;
 


@@ -176,12 +177,13 @@ body.mce-fullscreen, body.markdown-fullscreen {
     margin-inline-start: -8px;
     content: '';
     display: block;
     margin-inline-start: -8px;
     content: '';
     display: block;

-    background-color:#FFF;

     transform: rotate(45deg);
     transform-origin: 50% 50%;
     transform: rotate(45deg);
     transform-origin: 50% 50%;

-    border-inline-startom: 1px solid #CCC;
+    border-block-end: 1px solid #CCC;

     border-inline-end: 1px solid #CCC;
     z-index: 56;
     border-inline-end: 1px solid #CCC;
     z-index: 56;

+    @include lightDark(background-color, #fff, #333);
+    @include lightDark(border-color, #ccc, #000);

   }
   input, button, a {
     position: relative;
   }
   input, button, a {
     position: relative;


@@ -194,6 +196,7 @@ body.mce-fullscreen, body.markdown-fullscreen {
   input {
     background-color: #FFF;
     border: 1px solid #DDD;
   input {
     background-color: #FFF;
     border: 1px solid #DDD;

+    @include lightDark(border-color, #ddd, #000);

     color: #666;
     width: 172px;
     z-index: 40;
     color: #666;
     width: 172px;
     z-index: 40;


@@ -218,6 +221,9 @@ body.mce-fullscreen, body.markdown-fullscreen {
     width: 1.2em;
     height: 1.2em;
   }
     width: 1.2em;
     height: 1.2em;
   }

+  .button {
+    @include lightDark(border-color, #ddd, #000);
+  }

 }
 
 // Attribute form
 }
 
 // Attribute form

diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss
index 1a9d793b6d77dfe2516af7bab3c10f822df7c7bc..8af3634693e67d9f2f9d32bc68ae617e460518df 100644 (file)
--- a/resources/sass/styles.scss
+++ b/resources/sass/styles.scss
@@ -54,6 +54,11 @@ body.dragging, body.dragging * {
   &.square {
     border-radius: 3px;
   }
   &.square {
     border-radius: 3px;
   }

+  &[src$="user_avatar.png"] {
+    @include whenDark {
+      filter: invert(1);
+    }
+  }

 }
 
 // Loading icon
 }
 
 // Loading icon