Release 2.11 (#4580)

assets/app-rtl.js

@@ -0,0 +1 @@
+require('./sass/_app-rtl.scss');

assets/js/forms/KimaiFormSelect.js

@@ -83,6 +83,7 @@ export default class KimaiFormSelect extends KimaiFormPlugin {
             // if there are more than X entries, the other ones are hidden and can only be found
             // by typing some characters to trigger the internal option search
             maxOptions: 500,
+            sortField:[{field: '$order'}, {field: '$score'}],
         };
 
         let render = {

assets/js/plugins/KimaiAlert.js

@@ -52,7 +52,7 @@ export default class KimaiAlert extends KimaiPlugin {
         }
 
         const html = `
-            <div class="modal modal-blur fade" id="` + id + `" tabindex="-1" role="dialog">
+            <div class="modal" id="` + id + `" tabindex="-1" role="dialog">
                 <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
                     <div class="modal-content">
                         <div class="modal-status bg-` + this._mapClass('danger') + `"></div>
@@ -128,7 +128,7 @@ export default class KimaiAlert extends KimaiPlugin {
         }
 
         const html = `
-            <div class="modal modal-blur fade" tabindex="-1" role="dialog">
+            <div class="modal fade" tabindex="-1" role="dialog">
                 <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
                     <div class="modal-content">
                         <div class="modal-status bg-` + this._mapClass(type) + `"></div>
@@ -227,7 +227,7 @@ export default class KimaiAlert extends KimaiPlugin {
 
         const css = this._mapClass('info');
         const html = `
-            <div class="modal modal-blur fade" tabindex="-1" role="dialog" data-bs-backdrop="static">
+            <div class="modal fade" tabindex="-1" role="dialog" data-bs-backdrop="static">
                 <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
                     <div class="modal-content">
                         <div class="modal-status bg-` + css + `"></div>

assets/sass/_app-rtl.scss

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+$modal-backdrop-opacity: 0.6 !default;
+
+/*
+    THIS DOES NOT WORK AS EXPECTED, AS TABLER IS NOT REGENERATED HERE.
+    SO WE CANNOT CHANGE VARIABLES, LIKE THE ABOVE...
+*/
+@import '~@tabler/core/dist/css/tabler.rtl.css';
+@import '~@tabler/core/dist/css/tabler-vendors.rtl.css';
+
+/**
+ * Everyone needs icons
+ */
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts/";
+@import '~@fortawesome/fontawesome-free/scss/fontawesome';
+@import '~@fortawesome/fontawesome-free/scss/regular';
+@import '~@fortawesome/fontawesome-free/scss/solid';
+@import '~@fortawesome/fontawesome-free/scss/brands';
+
+/**
+ * We need that, to compile the rest of the file
+ */
+@import "bootstrap/scss/functions";
+
+@import "@tabler/core/src/scss/variables";
+@import "@tabler/core/src/scss/variables-dark";
+@import "@tabler/core/src/scss/mixins";
+
+@import "bootstrap/scss/variables";
+@import "bootstrap/scss/variables-dark";
+@import "bootstrap/scss/maps";
+@import "bootstrap/scss/mixins";
+@import "bootstrap/scss/utilities";
+
+/**
+ * Kimai related stuff
+ */
+@import "kimai";
+@import "rtl";

assets/sass/_app.scss

@@ -5,33 +5,25 @@
  * file that was distributed with this source code.
  */
 
-@import "bootstrap/scss/functions";
+$modal-backdrop-opacity: 0.6 !default;
 
-@import "@tabler/core/src/scss/variables";
-@import "@tabler/core/src/scss/variables-dark";
-@import "@tabler/core/src/scss/mixins";
+@import '~@tabler/core/src/scss/tabler';
+@import '~@tabler/core/src/scss/vendor/litepicker';
+@import '~@tabler/core/src/scss/vendor/tom-select';
 
-@import "bootstrap/scss/variables";
-@import "bootstrap/scss/variables-dark";
-@import "bootstrap/scss/maps";
-@import "bootstrap/scss/mixins";
-@import "bootstrap/scss/utilities";
+/**
+ * Everyone needs icons
+ */
 
-@import "layout";
-@import "error-page";
-@import "print";
-@import "content";
-@import "loading-spinner";
-@import "tables";
-@import "calendar";
-@import "ticktac";
-@import "selectpicker";
-@import "forms";
-@import "modal";
-@import "progressbar";
-@import "avatar";
-@import "theme-dark";
-@import "pages";
-@import "tabler-fixes";
-@import "help";
-@import "rtl";
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts/";
+
+@import '~@fortawesome/fontawesome-free/scss/fontawesome';
+@import '~@fortawesome/fontawesome-free/scss/regular';
+@import '~@fortawesome/fontawesome-free/scss/solid';
+@import '~@fortawesome/fontawesome-free/scss/brands';
+
+/**
+ * Kimai specific additions
+ */
+
+@import "kimai";

assets/sass/_kimai.scss

@@ -0,0 +1,18 @@
+@import "layout";
+@import "error-page";
+@import "print";
+@import "content";
+@import "loading-spinner";
+@import "tables";
+@import "calendar";
+@import "ticktac";
+@import "selectpicker";
+@import "forms";
+@import "modal";
+@import "progressbar";
+@import "avatar";
+@import "theme-dark";
+@import "pages";
+@import "tabler-fixes";
+@import "help";
+@import "rtl";