diff --git a/.editorconfig b/.editorconfig index 24c3d45f8..76891716d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,7 @@ indent_style=tab tab_width=3 [*.html] +indent_style=tab indent_size=3 insert_final_newline=false diff --git a/README.md b/README.md index 03302542b..1c689518d 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Premium and Open Source dashboard template with responsive and high-quality UI. ## Status - Total Downloads License Latest Release + Total Downloads License Latest Release ## Features diff --git a/js/tabler-charts.js b/js/tabler-charts.js index 1cada1a26..5d47d081c 100644 --- a/js/tabler-charts.js +++ b/js/tabler-charts.js @@ -7,7 +7,7 @@ color = $this.attr('data-spark-color') || 'blue', type = $this.attr('data-spark-type') || 'line'; - const $div = $('
').html(data); + const $div = $('
').html(data); $this.append($div); let strokeColor = tabler.colors[color], @@ -169,9 +169,6 @@ if (window.Apex) { yaxis: { show: false, - labels: { - show: false, - }, }, }; } diff --git a/package.json b/package.json index 9c2adb4d0..9c0ec5ecc 100644 --- a/package.json +++ b/package.json @@ -68,24 +68,24 @@ "main": "dist/js/tabler.js", "homepage": "https://tabler.io", "devDependencies": { - "@babel/preset-env": "7.7.4", + "@babel/preset-env": "7.7.6", "browser-sync": "2.26.7", "bundlesize": "0.18.0", "clean-css-cli": "4.3.0", "cross-env": "6.0.3", "eslint": "6.7.2", "eslint-config-xo": "0.27.2", - "eslint-plugin-import": "2.18.2", + "eslint-plugin-import": "2.19.1", "eslint-plugin-unicorn": "14.0.1", - "glob": "^7.1.6", + "glob": "7.1.6", "http-server": "0.12.0", "icon-font-generator": "2.1.10", "node-sass": "4.13.0", "node-sass-package-importer": "5.3.2", - "nodemon": "^2.0.1", + "nodemon": "2.0.1", "npm-run-all": "4.1.5", "postcss-cli": "6.1.3", - "rollup": "1.27.7", + "rollup": "1.27.9", "rollup-plugin-babel": "4.3.3", "rollup-plugin-babel-minify": "9.1.1", "rollup-plugin-commonjs": "10.1.0", @@ -95,7 +95,7 @@ "stylelint": "12.0.0", "stylelint-config-twbs-bootstrap": "1.0.0", "svgo": "1.3.2", - "terser": "4.4.1", + "terser": "4.4.2", "yaml": "1.7.2" }, "dependencies": { @@ -106,7 +106,7 @@ "@fullcalendar/timegrid": "4.3.0", "apexcharts": "3.10.1", "autosize": "4.0.2", - "bootstrap": "twbs/bootstrap#76fd85b", + "bootstrap": "twbs/bootstrap#dde55d1", "daterangepicker": "3.0.5", "fullcalendar": "3.10.1", "imask": "5.2.1", diff --git a/pages/_data/charts.yml b/pages/_data/charts.yml index b52d9efd8..b4f6ba251 100644 --- a/pages/_data/charts.yml +++ b/pages/_data/charts.yml @@ -1,3 +1,10 @@ +tasks-overview: + type: bar + categories: ['Sprint 1','Sprint 2','Sprint 3','Sprint 4','Sprint 5','Sprint 6','Sprint 7','Sprint 8','Sprint 9','Sprint 10','Sprint 11','Sprint 12','Sprint 13','Sprint 14','Sprint 15','Sprint 16','Sprint 17','Sprint 18','Sprint 19','Sprint 20','Sprint 21','Sprint 22','Sprint 23','Sprint 24'] + series: + - name: A + data: [44, 32, 48, 72, 60, 16, 44, 32, 78, 50, 68, 34, 26, 48, 72, 60, 84, 64, 74, 52, 62, 50, 32, 22] + total-sales: type: donut demo: true diff --git a/pages/_data/docs.yml b/pages/_data/docs.yml index c2e34619e..8c59bc250 100644 --- a/pages/_data/docs.yml +++ b/pages/_data/docs.yml @@ -7,6 +7,7 @@ - page: buttons - page: cards - page: carousel +- page: colors - page: cursors - page: charts - page: divider diff --git a/pages/_docs/alerts.md b/pages/_docs/alerts.md index 34a29c7b5..ffd5c22fc 100644 --- a/pages/_docs/alerts.md +++ b/pages/_docs/alerts.md @@ -1,11 +1,11 @@ --- title: Alerts menu: docs.alerts +description: Bootstrap provides an easy way to create predefined alert messages. +bootstrap-link: https://getbootstrap.com/docs/4.4/components/alerts/ done: true --- -Bootstrap provides an easy way to create predefined alert messages. - ### Default markup {% example %} diff --git a/pages/_docs/autosize.md b/pages/_docs/autosize.md index 33771fef8..0113901c0 100644 --- a/pages/_docs/autosize.md +++ b/pages/_docs/autosize.md @@ -1,11 +1,10 @@ --- title: Autosize menu: docs.autosize +description: A small, stand-alone script to automatically adjust textarea height. done: true --- -A small, stand-alone script to automatically adjust textarea height. - ### Default markup {% example html %} diff --git a/pages/_docs/avatars.md b/pages/_docs/avatars.md index 966329320..e3ae3ef04 100644 --- a/pages/_docs/avatars.md +++ b/pages/_docs/avatars.md @@ -1,11 +1,10 @@ --- title: Avatars menu: docs.avatars +description: Create and group avatars of various shapes and sizes with one component. done: true --- -Create and group avatars of various shapes and sizes with one component. - ### Default markup {% example html wrapper=avatar-list %} diff --git a/pages/_docs/badges.md b/pages/_docs/badges.md index f37b5eebf..a2de1cde4 100644 --- a/pages/_docs/badges.md +++ b/pages/_docs/badges.md @@ -1,30 +1,34 @@ --- title: Badges menu: docs.badges +description: A small count and labeling component. +bootstrap-link: https://getbootstrap.com/docs/4.4/components/badge/ done: true --- -A small count and labeling component. Please read the [official Bootstrap documentation](https://getbootstrap.com/docs/4.3/components/badge/) for a full list of options. - ### Default markup {% example %} {% for color in site.colors %} -{{ color[0] }} +{{ color[0] }} {% endfor %} {% endexample %} ### Pill badges +To make a pill bagde (with rounded corners) add `.bagde-pill` class. + {% example %} {% for color in site.colors %} -{{ forloop.index }} +{{ forloop.index }} {% endfor %} {% endexample %} ### Soft badges +Creates a soft variant of a corresponding contextual badge variation. You can click [here]({% docs_url colors %}) to see the list of available colors. + {% example %} {% for color in site.colors %} {{ color[0] }} @@ -34,6 +38,8 @@ A small count and labeling component. Please read the [official Bootstrap docume ### Links +Make a badge work as a link by putting it into an `` element. + {% example %} {% for color in site.colors %} {{ color[0] }} @@ -43,6 +49,8 @@ A small count and labeling component. Please read the [official Bootstrap docume ### Empty badges +If you don't want your badge to contain any text you can do it by leaving the html element empty. + {% example %} {% for color in site.colors %} diff --git a/pages/_docs/breadcrumb.md b/pages/_docs/breadcrumb.md index cf72b9b6b..3e9403344 100644 --- a/pages/_docs/breadcrumb.md +++ b/pages/_docs/breadcrumb.md @@ -2,6 +2,7 @@ title: Breadcrumb menu: docs.breadcrumb description: Indicate the current page’s location within a navigational hierarchy that automatically adds separators via CSS. +bootstrap-link: https://getbootstrap.com/docs/4.4/components/breadcrumb/ done: true --- diff --git a/pages/_docs/buttons.md b/pages/_docs/buttons.md index ec1b5902b..aac1663a2 100644 --- a/pages/_docs/buttons.md +++ b/pages/_docs/buttons.md @@ -2,6 +2,8 @@ title: Buttons icon: fe fe-plus-square description: Use Bootstrap’s custom button styles for actions in forms, dialogs, and more. Includes support for a handful of contextual variations, sizes, states, and more. +bootstrap-link: https://getbootstrap.com/docs/4.4/components/buttons/ +done: true --- @@ -12,9 +14,9 @@ The `.btn` classes are designed to be used with the ` - - - + + + {% endexample %} ### Button variations @@ -23,18 +25,22 @@ Use any of the available button classes to quickly create a styled button . We p {% example html wrapper=btn-list %} {% for button in site.button-variants %} -{{ button[1].title }} +{% assign btn-color = button[1].class %} +{% assign btn-title = button[1].title %} +{% include_cached ui/button.html color=btn-color text=btn-title %} {% endfor %} {% endexample %} ### Disabled buttons Make buttons look inactive by adding the disabled boolean attribute to any `.btn` element. ``s don’t support the disabled attribute, so you must add the `.disabled` class to make it visually appear disabled. + {% example html wrapper=btn-list %} {% for button in site.button-variants %} -{% include_cached ui/button.html color=button.1.class text=button.title disabled=true %} +{% assign btn-color = button[1].class %} +{% assign btn-title = button[1].title %} +{% include_cached ui/button.html color=btn-color text=btn-title disabled=true %} {% endfor %} - {% endexample %} @@ -54,7 +60,9 @@ Add `.btn-square` to button to remove border-radius. {% example html wrapper=btn-list %} {% for button in site.button-variants %} -{% include_cached ui/button.html text=button.title color=button.class square=true %} +{% assign btn-color = button[1].class %} +{% assign btn-title = button[1].title %} +{% include_cached ui/button.html color=btn-color text=btn-title square=true %} {% endfor %} {% endexample %} @@ -64,7 +72,9 @@ Add `.btn-pill` class to any button to make them more rounded. {% example html wrapper=btn-list %} {% for button in site.button-variants %} -{% include_cached ui/button.html text=button.title color=button.class pill=true %} +{% assign btn-color = button[1].class %} +{% assign btn-title = button[1].title %} +{% include_cached ui/button.html color=btn-color text=btn-title pill=true %} {% endfor %} {% endexample %} @@ -74,7 +84,9 @@ In need of a button, but not the hefty background colors they bring? Replace the {% example html wrapper=btn-list %} {% for button in site.button-variants %} -{% include_cached ui/button.html text=button.title color=button.class outline=true %} +{% assign btn-color = button[1].class %} +{% assign btn-title = button[1].title %} +{% include_cached ui/button.html text=btn-title color=btn-color outline=true %} {% endfor %} {% endexample %} @@ -103,13 +115,33 @@ Create block level buttons—those that span the full width of a parent—by add Basic buttons are traditional buttons with borders and background with an extra commponent like an icon. You can place it either on the left or the right which ever you want with different color opitons. +Icons can be found [**here** {% include_cached ui/icon.html icon="search" class="icon-sm" %}](/docs/icons.html#icons) + {% example html wrapper=btn-list %} - - - - - - + + + + + + {% endexample %} ### Social buttons @@ -118,7 +150,10 @@ A button can be formatted to link to a social website {% example html wrapper=btn-list %} {% for button in site.socials %} -{% include_cached ui/button.html color=button.name icon=button.icon text=button.title %} +{% assign btn-icon = button[1].icon %} +{% assign btn-title = button[1].title %} +{% assign btn-color = button[0] %} +{% include_cached ui/button.html color=btn-color icon=btn-icon text=btn-title %} {% endfor %} {% endexample %} @@ -126,7 +161,9 @@ You can use only icons. {% example html wrapper=btn-list %} {% for button in site.socials %} -{% include_cached ui/button.html color=button.name icon=button.icon %} +{% assign btn-icon = button[1].icon %} +{% assign btn-color = button[0] %} +{% include_cached ui/button.html color=btn-color icon=btn-icon icon-only=true %} {% endfor %} {% endexample %} @@ -135,13 +172,27 @@ You can use only icons. Icon only button. Add `.btn-icon` class to remove unnecessary padding from button. {% example html wrapper=btn-list %} - - - - - - - + + + + + + + {% endexample %} ### Button dropdown @@ -151,7 +202,7 @@ Wrap the dropdown’s toggle (your button or link) and the dropdown menu within {% example html wrapper=btn-list %}