diff --git a/README.md b/README.md index 3451299683a0ebf70c51ce9ffb5d43efc351b992..b6316873c752d86fe0d85c98f68044d37b4906bc 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/ta ## Contributors -This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. +This project exists thanks to all the people who contribute. [[Contribute](https://github.com/tabler/tabler/graphs/contributors)]. ## Backers diff --git a/js/tabler.js b/js/tabler.js index f356d55b0de06b4ad033e71d745fcb94f13c0f97..e4dc211734b17bbbc6a659c839d756a108c3231c 100644 --- a/js/tabler.js +++ b/js/tabler.js @@ -35,6 +35,10 @@ const tabler = { $(document).ready(function () { const $body = $('body'); + // $('[data-toggle="tooltip"]').tooltip(); + + $('[data-toggle="toast"]').toast(); + $body.on('click', '[data-toggle="menubar"]', function (e) { $body.toggleClass('aside-visible'); diff --git a/package.json b/package.json index 6577b974ec40b7eb9401c843502141b4965a4367..207ab03514f1e036a5b0fa01532b1750ef938356 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,7 @@ "autosize": "4.0.2", "bootstrap": "twbs/bootstrap#46f086c", "countup.js": "2.0.4", + "daterangepicker": "3.0.5", "fullcalendar": "3.10.1", "imask": "6.0.1", "jquery": "3.4.1", diff --git a/pages/_data/libs.json b/pages/_data/libs.json index b3e6824a5475ad4dabd1269bcfe33a7a756eb010..a9537bc95a20004ddfd47132afd51af7f3698833 100644 --- a/pages/_data/libs.json +++ b/pages/_data/libs.json @@ -23,6 +23,10 @@ "@fullcalendar/timegrid/main.min.js", "@fullcalendar/list/main.min.js" ], + "daterangepicker": [ + "daterangepicker/moment.min.js", + "daterangepicker/daterangepicker.js" + ], "countup": "countup.js/dist/countUp.min.js" }, "css": { @@ -33,6 +37,7 @@ "@fullcalendar/daygrid/main.min.css", "@fullcalendar/timegrid/main.min.css", "@fullcalendar/list/main.min.css" - ] + ], + "daterangepicker": "daterangepicker/daterangepicker.css" } } diff --git a/pages/_docs/toasts.md b/pages/_docs/toasts.md index 1e5598f6b8791bfff46bc3ba241c0f7cc069e2ce..faf9efda27457fdb977f32a2921288d0aabb2150 100644 --- a/pages/_docs/toasts.md +++ b/pages/_docs/toasts.md @@ -5,10 +5,25 @@ description: The toast component is like an alert box that is only shown for a c bootstrap-link: components/toasts/ --- - - ### Default markup {% example %} {% include ui/toast.html %} {% endexample %} + +### Translucent + +Toasts are slightly translucent, too, so they blend over whatever they might appear over. For browsers that support the `backdrop-filter` CSS property, we’ll also attempt to blur the elements under a toast. + +{% example html class=bg-gray %} +{% include ui/toast.html %} +{% endexample %} + +### Stacking toasts + +If you want to stack toasts just put them in the same container. + +{% example %} +{% include ui/toast.html person-id=3 %} +{% include ui/toast.html date="7 mins ago" text="This is another toast message." %} +{% endexample %} \ No newline at end of file diff --git a/pages/_includes/layout/js.html b/pages/_includes/layout/js.html index dd034fe769cb7570f7a6267aa26813c5cd3fef4c..00da6780fc3046dac0e23bd4058048f33c4acd1d 100644 --- a/pages/_includes/layout/js.html +++ b/pages/_includes/layout/js.html @@ -8,4 +8,5 @@ {% endfor %} + diff --git a/pages/_includes/ui/toast.html b/pages/_includes/ui/toast.html index fd0227a9c714569b42ead438557acbea57ce2093..ded90207e4b7aecf26179d0b5236906cde238dae 100644 --- a/pages/_includes/ui/toast.html +++ b/pages/_includes/ui/toast.html @@ -1,6 +1,6 @@ {% assign person-id = include.person-id | default: 2 %} {% assign person = site.data.people[person-id] %} - - +
+
+
+
+

Pick date:

+ +
+
+
+
\ No newline at end of file diff --git a/scss/ui/_forms.scss b/scss/ui/_forms.scss index 38d47342f5e16c5add152bd82551de47bfb8648f..11b78db14634b2f50233f7ab57bc71e76ab5eca0 100644 --- a/scss/ui/_forms.scss +++ b/scss/ui/_forms.scss @@ -35,6 +35,9 @@ Form control color: $text-muted; user-select: none; } + &[size]{ + width: auto; + } } .form-control-light { diff --git a/scss/ui/_toasts.scss b/scss/ui/_toasts.scss index 80e5271a71786aa7da50b70f55a9dcb8fc4ccd60..cf264fd4e6d4f5a96396bbdaf490a7bc5aed560a 100644 --- a/scss/ui/_toasts.scss +++ b/scss/ui/_toasts.scss @@ -1,3 +1,6 @@ .toast-header { user-select: none; } +.toast button[data-dismiss="toast"]{ + outline: none; +}