Merge pull request #5096 from DanielGordonIT/normalize-file-extensions

Wraps file extension comparison components in strtolower()

diff --git a/phpunit.xml b/phpunit.xml
index 21f17685b5b63aacd448fcbfa898ca9d16b6ffaa..b72c6e5f13e7fa25c751449e71b3b363e0c04270 100644 (file)
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,6 +13,7 @@
     <server name="APP_AUTO_LANG_PUBLIC" value="true"/>
     <server name="APP_URL" value="http://bookstack.dev"/>
     <server name="ALLOWED_IFRAME_HOSTS" value=""/>
+    <server name="ALLOWED_IFRAME_SOURCES" value="https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com"/>
     <server name="ALLOWED_SSR_HOSTS" value="*"/>
     <server name="CACHE_DRIVER" value="array"/>
     <server name="SESSION_DRIVER" value="array"/>

diff --git a/readme.md b/readme.md
index 5b78129913cfbce9792128ed85629a1baeec8f52..7c68d7ec607469b56db8e903607eebed0fb9bc0c 100644 (file)
--- a/readme.md
+++ b/readme.md
@@ -79,20 +79,14 @@ Big thanks to these companies for supporting the project.
 </a></td>
 </tr>
 <tr>
-<td align="center" colspan="2"><a href="https://practinet.be/" target="_blank">
+<td align="center"><a href="https://practinet.be/" target="_blank">
     <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/practinet.png" alt="Practinet">
 </a></td>
+<td align="center"><a href="https://transporttalent.com" target="_blank">
+    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/transport-talent.png" alt="Transport Talent">
+</a></td>
 </tr></tbody></table>
 
-## 🛣️ Road Map
-
-Below is a high-level road map view for BookStack to provide a sense of direction of where the project is going. This can change at any point and does not reflect many features and improvements that will also be included as part of the journey along this road map. For more granular detail of what will be included in upcoming releases you can review the project milestones as defined in our [Release Process](dev/docs/release-process.md) documentation.
-
-- **Platform REST API** - *(Most actions implemented, maturing)*
-    - *A REST API covering, at minimum, control of core content models (Books, Chapters, Pages) for automation and platform extension.*
-- **Permission System Review** - *(In Progress)*
-    - *Improvement in how permissions are applied and a review of the efficiency of the permission & roles system.*
-
 ## 🛠️ Development & Testing
 
 Please see our [development docs](dev/docs/development.md) for full details regarding work on the BookStack source code.

diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index 3aa4ac653d92da1db9eb5be4be90dd7e7a7ceeb1..be5a6517e0bb1467aa3ca23866083198e1e2d916 100644 (file)
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -127,11 +127,18 @@ body .page-content img,
 
 /**
  * Callouts
+ * Some styles duplicated for supporting logical units (eg. inline-end) while
+ * providing fallbacks to non-logical rules, so RTL is natively supported where possible.
  */
 .callout {
   border-left: 3px solid #BBB;
+  border-inline-start: 3px solid #BBB;
+  border-inline-end: none;
   background-color: #EEE;
-  padding: $-s $-s $-s $-xl;
+  padding: $-s;
+  padding-left: $-xl;
+  padding-inline-start: $-xl;
+  padding-inline-end: $-s;
   display: block;
   position: relative;
   overflow: auto;
@@ -142,6 +149,8 @@ body .page-content img,
     width: 1.2em;
     height: 1.2em;
     left: $-xs + 2px;
+    inset-inline-start: $-xs + 2px;
+    inset-inline-end: unset;
     top: 50%;
     margin-top: -9px;
     display: inline-block;
@@ -150,7 +159,7 @@ body .page-content img,
     opacity: 0.8;
   }
   &.success {
-    @include lightDark(border-left-color, $positive, $positive-dark);
+    @include lightDark(border-color, $positive, $positive-dark);
     @include lightDark(background-color, lighten($positive, 68%), darken($positive-dark, 36%));
     @include lightDark(color, darken($positive, 16%), $positive-dark);
   }
@@ -158,7 +167,7 @@ body .page-content img,
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiMzNzZjMzkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz4gICAgPHBhdGggZD0iTTEyIDJDNi40OCAyIDIgNi40OCAyIDEyczQuNDggMTAgMTAgMTAgMTAtNC40OCAxMC0xMFMxNy41MiAyIDEyIDJ6bS0yIDE1bC01LTUgMS40MS0xLjQxTDEwIDE0LjE3bDcuNTktNy41OUwxOSA4bC05IDl6Ii8+PC9zdmc+");
   }
   &.danger {
-    @include lightDark(border-left-color, $negative, $negative-dark);
+    @include lightDark(border-color, $negative, $negative-dark);
     @include lightDark(background-color, lighten($negative, 56%), darken($negative-dark, 55%));
     @include lightDark(color, darken($negative, 20%), $negative-dark);
   }
@@ -166,12 +175,12 @@ body .page-content img,
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiNiOTE4MTgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0xNS43MyAzSDguMjdMMyA4LjI3djcuNDZMOC4yNyAyMWg3LjQ2TDIxIDE1LjczVjguMjdMMTUuNzMgM3pNMTIgMTcuM2MtLjcyIDAtMS4zLS41OC0xLjMtMS4zIDAtLjcyLjU4LTEuMyAxLjMtMS4zLjcyIDAgMS4zLjU4IDEuMyAxLjMgMCAuNzItLjU4IDEuMy0xLjMgMS4zem0xLTQuM2gtMlY3aDJ2NnoiLz4gICAgPHBhdGggZD0iTTAgMGgyNHYyNEgweiIgZmlsbD0ibm9uZSIvPjwvc3ZnPg==");
   }
   &.info {
-    @include lightDark(border-left-color, $info, $info-dark);
+    @include lightDark(border-color, $info, $info-dark);
     @include lightDark(color, darken($info, 20%), $info-dark);
     @include lightDark(background-color, lighten($info, 50%), darken($info-dark, 34%));
   }
   &.warning {
-    @include lightDark(border-left-color, $warning, $warning-dark);
+    @include lightDark(border-color, $warning, $warning-dark);
     @include lightDark(background-color, lighten($warning, 50%), darken($warning-dark, 50%));
     @include lightDark(color, darken($warning, 20%), $warning-dark);
   }