From 5589a71f6f8d7bf5459a86c256d87f4763b0acc8 Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 6 Dec 2020 14:18:42 +0100 Subject: [PATCH] new bootstrap 5 margin and padding utils --- src/pages/_docs/badges.md | 4 +-- src/pages/_docs/buttons.md | 2 +- src/pages/_docs/flags.md | 12 +++---- src/pages/_docs/form-elements.md | 4 +-- src/pages/_docs/payments.md | 14 ++++---- src/pages/_docs/typography.md | 34 +++++++++---------- src/pages/_includes/cards/blog-single.html | 6 ++-- src/pages/_includes/cards/card.html | 4 +-- .../_includes/cards/charts/active-users.html | 6 ++-- .../_includes/cards/charts/new-clients.html | 6 ++-- src/pages/_includes/cards/charts/revenue.html | 6 ++-- src/pages/_includes/cards/charts/sales.html | 4 +-- src/pages/_includes/cards/comments.html | 14 ++++---- .../_includes/cards/company-employees.html | 2 +- src/pages/_includes/cards/configuration.html | 2 +- src/pages/_includes/cards/gallery-photo.html | 6 ++-- src/pages/_includes/cards/invoices.html | 8 ++--- .../_includes/cards/most-visited-pages.html | 2 +- .../_includes/cards/order-statistics.html | 4 +-- src/pages/_includes/cards/pricing-card.html | 4 +-- src/pages/_includes/cards/profile-2.html | 2 +- .../_includes/cards/profile-timeline.html | 12 +++---- src/pages/_includes/cards/project-kanban.html | 4 +-- .../_includes/cards/skeleton/card-6.html | 2 +- src/pages/_includes/cards/small-stats.html | 2 +- .../_includes/cards/store-product-grid.html | 2 +- src/pages/_includes/cards/store-product.html | 2 +- src/pages/_includes/cards/tabs.html | 4 +-- src/pages/_includes/cards/tasks.html | 2 +- src/pages/_includes/cards/user-info.html | 12 +++---- src/pages/_includes/docs/menu.html | 2 +- .../_includes/forms/form-elements-2.html | 4 +-- .../_includes/forms/form-elements-4.html | 2 +- src/pages/_includes/layout/footer.html | 2 +- .../layout/header-actions/photos.html | 2 +- .../layout/header-actions/users.html | 2 +- src/pages/_includes/layout/homepage.html | 20 +++++------ src/pages/_includes/layout/layouts-list.html | 4 +-- src/pages/_includes/layout/navbar-logo.html | 4 +-- src/pages/_includes/layout/navbar-menu.html | 2 +- src/pages/_includes/layout/navbar-side.html | 6 ++-- src/pages/_includes/layout/navbar.html | 4 +-- src/pages/_includes/layout/page-header.html | 2 +- src/pages/_includes/parts/dropdown/days.html | 2 +- .../parts/form/selectgroup-payments.html | 4 +-- .../form/selectgroup-project-manager.html | 4 +-- src/pages/_includes/parts/modals/report.html | 6 ++-- src/pages/_includes/parts/modals/small.html | 2 +- src/pages/_includes/parts/modals/team.html | 2 +- src/pages/_includes/parts/nav/nav-aside.html | 2 +- src/pages/_includes/ui/alert.html | 4 +-- src/pages/_includes/ui/button.html | 2 +- src/pages/_includes/ui/card-dropdown.html | 2 +- src/pages/_includes/ui/dropdown-menu-all.html | 10 +++--- src/pages/_includes/ui/dropdown-menu.html | 10 +++--- src/pages/_includes/ui/form/input-group.html | 2 +- .../_includes/ui/form/input-selectgroup.html | 2 +- src/pages/_includes/ui/form/selectize.html | 6 ++-- src/pages/_includes/ui/modal/footer.html | 2 +- src/pages/_includes/ui/nav.html | 4 +-- .../_includes/ui/progress-description.html | 4 +-- src/pages/_includes/ui/table.html | 2 +- src/pages/_includes/ui/toast.html | 6 ++-- src/pages/_includes/ui/trending.html | 2 +- src/pages/_layouts/docs.html | 4 +-- src/pages/all.html | 2 +- src/pages/charts.html | 2 +- src/pages/form-elements.html | 2 +- src/pages/gallery.html | 2 +- src/pages/license.html | 2 +- src/pages/users.html | 2 +- src/pages/wizard.html | 2 +- src/scss/_utilities.scss | 12 +++---- src/scss/ui/_dropdowns.scss | 2 +- 74 files changed, 178 insertions(+), 178 deletions(-) diff --git a/src/pages/_docs/badges.md b/src/pages/_docs/badges.md index ac180c29a..81871f4b2 100644 --- a/src/pages/_docs/badges.md +++ b/src/pages/_docs/badges.md @@ -85,10 +85,10 @@ Badges can be used as part of links or buttons to provide a counter. {% capture code %} {% endcapture %} {% include example.html code=code wrapper="btn-list" %} \ No newline at end of file diff --git a/src/pages/_docs/buttons.md b/src/pages/_docs/buttons.md index 4d6bb15dc..342b02e40 100644 --- a/src/pages/_docs/buttons.md +++ b/src/pages/_docs/buttons.md @@ -327,7 +327,7 @@ Use the `.text-center` or the `.text-right` modifiers to change the buttons' ali {% capture code %}
- Delete + Delete Save and continue Save changes
diff --git a/src/pages/_docs/flags.md b/src/pages/_docs/flags.md index 414348c6a..719c58ef2 100644 --- a/src/pages/_docs/flags.md +++ b/src/pages/_docs/flags.md @@ -12,8 +12,8 @@ libs: tabler-flags To create a flag, add the `flag` class to a component and choose the country whose flag you want to use. The full list of countries can be found below. {% capture code %} -{% include ui/flag.html flag="tg" class="mr-1" %} -{% include ui/flag.html flag="br" class="mr-1" %} +{% include ui/flag.html flag="tg" class="me-1" %} +{% include ui/flag.html flag="br" class="me-1" %} {% include ui/flag.html flag="pt" %} {% endcapture %} {% include example.html code=code %} @@ -24,11 +24,11 @@ To create a flag, add the `flag` class to a component and choose the country who Using Bootstrap’s typical naming structure, you can create a standard flag, or scale it up or down to different sizes based on what’s needed. {% capture code %} -{% include ui/flag.html flag="pl" size="xl" class="mr-1" %} -{% include ui/flag.html flag="pl" size="lg" class="mr-1" %} +{% include ui/flag.html flag="pl" size="xl" class="me-1" %} +{% include ui/flag.html flag="pl" size="lg" class="me-1" %} {% include ui/flag.html flag="pl" size="md" %} -{% include ui/flag.html flag="pl" size="sm" class="mr-1" %} -{% include ui/flag.html flag="pl" size="xs" class="mr-1" %} +{% include ui/flag.html flag="pl" size="sm" class="me-1" %} +{% include ui/flag.html flag="pl" size="xs" class="me-1" %} {% endcapture %} {% include example.html code=code %} diff --git a/src/pages/_docs/form-elements.md b/src/pages/_docs/form-elements.md index f7267fd5e..6b0b0915e 100644 --- a/src/pages/_docs/form-elements.md +++ b/src/pages/_docs/form-elements.md @@ -258,8 +258,8 @@ Add text to your input control, either before or after the text which is to be e {% capture code %}
- {% include ui/form/input-group.html prepend="https://tabler.io/users/" flat=true input-class="pl-0" value="yourfancyusername" class="mb-2" %} - {% include ui/form/input-group.html append=".tabler.io" input-class="text-right pr-0" flat=true value="yourfancydomain" %} + {% include ui/form/input-group.html prepend="https://tabler.io/users/" flat=true input-class="ps-0" value="yourfancyusername" class="mb-2" %} + {% include ui/form/input-group.html append=".tabler.io" input-class="text-right pe-0" flat=true value="yourfancydomain" %}
{% endcapture %} {% include example.html code=code %} diff --git a/src/pages/_docs/payments.md b/src/pages/_docs/payments.md index 95136a8f6..c554981a3 100644 --- a/src/pages/_docs/payments.md +++ b/src/pages/_docs/payments.md @@ -11,9 +11,9 @@ plugin: payments To create a payment provider icon, add the `payment` class to a component and specify the payment provider. The full list of payment providers can be found below. {% capture code %} -{% include ui/payment.html class="mr-3" payment="shopify"%} -{% include ui/payment.html class="mr-3" payment="visa" %} -{% include ui/payment.html class="mr-3" payment="paypal"%} +{% include ui/payment.html class="me-3" payment="shopify"%} +{% include ui/payment.html class="me-3" payment="visa" %} +{% include ui/payment.html class="me-3" payment="paypal"%} {% endcapture %} {% include example.html code=code %} @@ -23,10 +23,10 @@ To create a payment provider icon, add the `payment` class to a component and sp Using Bootstrap’s typical naming structure, you can create a standard payment, or scale it up or down to different sizes based on what’s needed. {% capture code %} -{% include ui/payment.html class="mr-3" payment="shopify" size="xl" %} -{% include ui/payment.html class="mr-3" payment="visa" size="lg" %} -{% include ui/payment.html class="mr-3" payment="paypal" size="md" %} -{% include ui/payment.html class="mr-3" payment="amazon" size="sm" %} +{% include ui/payment.html class="me-3" payment="shopify" size="xl" %} +{% include ui/payment.html class="me-3" payment="visa" size="lg" %} +{% include ui/payment.html class="me-3" payment="paypal" size="md" %} +{% include ui/payment.html class="me-3" payment="amazon" size="sm" %} {% endcapture %} {% include example.html code=code %} diff --git a/src/pages/_docs/typography.md b/src/pages/_docs/typography.md index 05f68ea64..be26052c2 100644 --- a/src/pages/_docs/typography.md +++ b/src/pages/_docs/typography.md @@ -33,23 +33,23 @@ Organize longer pieces of text into paragraphs using the `p` tag. Use a variety of semantic text elements, depending of how you want to display particular fragments of content. {% capture code %} -I18N{% hide %} abbr
{% endhide %} -Bold{% hide %} strong b
{% endhide %} -Citation{% hide %} cite
{% endhide %} -Hello World!{% hide %} code
{% endhide %} -Deleted{% hide %} del
{% endhide %} -Emphasis{% hide %} em
{% endhide %} -Italic{% hide %} i
{% endhide %} -Inserted{% hide %} ins
{% endhide %} -Ctrl + S{% hide %} kbd
{% endhide %} -Highlighted{% hide %} mark
{% endhide %} -Strikethrough s
{% endhide %} -Sample{% hide %} samp
{% endhide %} -Text Subscripted{% hide %} sub
{% endhide %} -Text Superscripted{% hide %} sup
{% endhide %} -{% hide %} time
{% endhide %} -Underline{% hide %} u
{% endhide %} -x = y + 2{% hide %} var
{% endhide %} +I18N{% hide %} abbr
{% endhide %} +Bold{% hide %} strong b
{% endhide %} +Citation{% hide %} cite
{% endhide %} +Hello World!{% hide %} code
{% endhide %} +Deleted{% hide %} del
{% endhide %} +Emphasis{% hide %} em
{% endhide %} +Italic{% hide %} i
{% endhide %} +Inserted{% hide %} ins
{% endhide %} +Ctrl + S{% hide %} kbd
{% endhide %} +Highlighted{% hide %} mark
{% endhide %} +Strikethrough s
{% endhide %} +Sample{% hide %} samp
{% endhide %} +Text Subscripted{% hide %} sub
{% endhide %} +Text Superscripted{% hide %} sup
{% endhide %} +{% hide %} time
{% endhide %} +Underline{% hide %} u
{% endhide %} +x = y + 2{% hide %} var
{% endhide %} {% endcapture %} {% include example.html code=code %} diff --git a/src/pages/_includes/cards/blog-single.html b/src/pages/_includes/cards/blog-single.html index bcfeb7b4c..50eead718 100644 --- a/src/pages/_includes/cards/blog-single.html +++ b/src/pages/_includes/cards/blog-single.html @@ -13,12 +13,12 @@
{% include ui/avatar.html person-id=avatar %} -
+
{{ author.first_name }} {{ author.last_name }}
3 days ago
-
- +
+ {% include ui/icon.html icon="heart" use-svg=true %}
diff --git a/src/pages/_includes/cards/card.html b/src/pages/_includes/cards/card.html index d0002187a..ece4c1818 100644 --- a/src/pages/_includes/cards/card.html +++ b/src/pages/_includes/cards/card.html @@ -72,7 +72,7 @@ {% assign el = element | slice: 1, element.size %} {% endif %} -
+
{% case el %} {% when "switch" %} {% include ui/form/check.html switch=true empty=true checked=true class="m-0" %} @@ -93,7 +93,7 @@ {% elsif include.footer-buttons %}
Cancel - Go somewhere + Go somewhere
{% else %} diff --git a/src/pages/_includes/cards/charts/active-users.html b/src/pages/_includes/cards/charts/active-users.html index 666f8bc81..67349309c 100644 --- a/src/pages/_includes/cards/charts/active-users.html +++ b/src/pages/_includes/cards/charts/active-users.html @@ -2,13 +2,13 @@
Active users
-
+
{% include parts/dropdown/days.html %}
-
2,986
-
+
2,986
+
{% include ui/trending.html value=4 %}
diff --git a/src/pages/_includes/cards/charts/new-clients.html b/src/pages/_includes/cards/charts/new-clients.html index 1388ca1cc..9d56f9f91 100644 --- a/src/pages/_includes/cards/charts/new-clients.html +++ b/src/pages/_includes/cards/charts/new-clients.html @@ -2,13 +2,13 @@
New clients
-
+
{% include parts/dropdown/days.html %}
-
6,782
-
+
6,782
+
{% include ui/trending.html value=0 %}
diff --git a/src/pages/_includes/cards/charts/revenue.html b/src/pages/_includes/cards/charts/revenue.html index 369dcf0b5..14802f23a 100644 --- a/src/pages/_includes/cards/charts/revenue.html +++ b/src/pages/_includes/cards/charts/revenue.html @@ -2,13 +2,13 @@
Revenue
-
+
{% include parts/dropdown/days.html %}
-
$4,300
-
+
$4,300
+
{% include ui/trending.html value=8 %}
diff --git a/src/pages/_includes/cards/charts/sales.html b/src/pages/_includes/cards/charts/sales.html index 002ba7ac4..c5b50cdcd 100644 --- a/src/pages/_includes/cards/charts/sales.html +++ b/src/pages/_includes/cards/charts/sales.html @@ -2,14 +2,14 @@
Sales
-
+
{% include parts/dropdown/days.html %}
75%
Conversion rate
-
{% include ui/trending.html value=7 %}
+
{% include ui/trending.html value=7 %}
{% include ui/progress.html value=75 color="blue" size="sm" %}
diff --git a/src/pages/_includes/cards/comments.html b/src/pages/_includes/cards/comments.html index a04689a94..70c5a8437 100644 --- a/src/pages/_includes/cards/comments.html +++ b/src/pages/_includes/cards/comments.html @@ -6,7 +6,7 @@ {% for person in site.data.people limit: 3 %}
-
+
{% include ui/avatar.html person=person status="green" %}
@@ -14,20 +14,20 @@
{{ person.full_name }}
-
{{ forloop.index | random_date_ago: 23 | timeago }}
+
{{ forloop.index | random_date_ago: 23 | timeago }}

{{ site.data.comments[forloop.index] }}

- +{{ forloop.index | random_number: 20, 50 }} + +{{ forloop.index | random_number: 20, 50 }} {% include ui/icon.html icon="chevron-up" %} - + {% include ui/icon.html icon="chevron-down" %} - · - Reply - · + · + Reply + · Edit
diff --git a/src/pages/_includes/cards/company-employees.html b/src/pages/_includes/cards/company-employees.html index 8edfe3ab3..5695989e2 100644 --- a/src/pages/_includes/cards/company-employees.html +++ b/src/pages/_includes/cards/company-employees.html @@ -17,7 +17,7 @@ {% include ui/avatar.html src=person.photo %} {{ person.full_name }} {{ person.department }} - {{ forloop.index | random_number: 30, 90 }}% + {{ forloop.index | random_number: 30, 90 }}%
diff --git a/src/pages/_includes/cards/configuration.html b/src/pages/_includes/cards/configuration.html index 82a2a7462..89d7aa9b9 100644 --- a/src/pages/_includes/cards/configuration.html +++ b/src/pages/_includes/cards/configuration.html @@ -5,7 +5,7 @@
- Edit configuration{% include ui/icon.html icon="edit" class="ml-1" %} + Edit configuration{% include ui/icon.html icon="edit" class="ms-1" %}
diff --git a/src/pages/_includes/cards/gallery-photo.html b/src/pages/_includes/cards/gallery-photo.html index 9f08e737f..ce29a6a83 100644 --- a/src/pages/_includes/cards/gallery-photo.html +++ b/src/pages/_includes/cards/gallery-photo.html @@ -2,18 +2,18 @@
- {% include ui/avatar.html person=include.person class="mr-3 rounded" %} + {% include ui/avatar.html person=include.person class="me-3 rounded" %}
{{ include.person.full_name }}
{{ forloop.index | random_date_ago: 10 | timeago }}
{% unless include.hide-likes %} -
+
{% include ui/icon.html icon="eye" %} {{ forloop.index | random_number: 300, 600 }} - + {% assign class = false %} {% if forloop.index > 2 and forloop.index < 9 or forloop.index == 10 %} {% assign class = "icon-filled text-red" %} diff --git a/src/pages/_includes/cards/invoices.html b/src/pages/_includes/cards/invoices.html index 536e56467..70e804306 100644 --- a/src/pages/_includes/cards/invoices.html +++ b/src/pages/_includes/cards/invoices.html @@ -13,9 +13,9 @@ entries
-
+
Search: -
+
@@ -55,7 +55,7 @@ {{ invoice.date }} - {{ invoice.status-name }} + {{ invoice.status-name }} {{ invoice.price }} @@ -72,6 +72,6 @@

Showing 1 to 8 of 16 entries

- {% include ui/pagination.html class="m-0 ml-auto" %} + {% include ui/pagination.html class="m-0 ms-auto" %}
diff --git a/src/pages/_includes/cards/most-visited-pages.html b/src/pages/_includes/cards/most-visited-pages.html index 0cabc2947..78ac65fc2 100644 --- a/src/pages/_includes/cards/most-visited-pages.html +++ b/src/pages/_includes/cards/most-visited-pages.html @@ -20,7 +20,7 @@ {{ page.uri }} - {% include ui/icon.html icon="link" %} + {% include ui/icon.html icon="link" %} {{ page.visitors | format_number }} {{ page.unique | format_number }} diff --git a/src/pages/_includes/cards/order-statistics.html b/src/pages/_includes/cards/order-statistics.html index 431ffea6f..122743fb4 100644 --- a/src/pages/_includes/cards/order-statistics.html +++ b/src/pages/_includes/cards/order-statistics.html @@ -4,8 +4,8 @@
Total orders
-
2,137
-
{% include ui/trending.html value=7 %}
+
2,137
+
{% include ui/trending.html value=7 %}
{% include ui/progress.html values="40,15,25,15,5" class="mb-4" %} diff --git a/src/pages/_includes/cards/pricing-card.html b/src/pages/_includes/cards/pricing-card.html index b99e76ee5..ae69717b9 100644 --- a/src/pages/_includes/cards/pricing-card.html +++ b/src/pages/_includes/cards/pricing-card.html @@ -15,9 +15,9 @@ {% for feature in features %}
  • {% if available-features[forloop.index0] == '1' %} - {% include ui/icon.html icon="check" class="mr-1 text-success" %} + {% include ui/icon.html icon="check" class="me-1 text-success" %} {% else %} - {% include ui/icon.html icon="x" class="mr-1 text-danger" %} + {% include ui/icon.html icon="x" class="me-1 text-danger" %} {% endif %} {{ feature }}
    • diff --git a/src/pages/_includes/cards/profile-2.html b/src/pages/_includes/cards/profile-2.html index 527787251..62e089150 100644 --- a/src/pages/_includes/cards/profile-2.html +++ b/src/pages/_includes/cards/profile-2.html @@ -2,7 +2,7 @@
    {% include ui/avatar.html person-id=8 size="xl" %} -
    +

    {{ site.data.people[20].first_name }} {{ site.data.people[20].last_name }}

    {{ site.data.people[20].job_title }}

    diff --git a/src/pages/_includes/cards/profile-timeline.html b/src/pages/_includes/cards/profile-timeline.html index 1e24118bc..16489a572 100644 --- a/src/pages/_includes/cards/profile-timeline.html +++ b/src/pages/_includes/cards/profile-timeline.html @@ -9,7 +9,7 @@
  • - {% include ui/avatar.html person-id=5 class="mr-3" %} + {% include ui/avatar.html person-id=5 class="me-3" %}
    @@ -26,7 +26,7 @@
    • - {% include ui/avatar.html person-id=8 class="mr-3" %} + {% include ui/avatar.html person-id=8 class="me-3" %}
      {{ site.data.people[7].first_name }} {{ site.data.people[7].last_name }}: @@ -36,7 +36,7 @@
    • - {% include ui/avatar.html person-id=10 class="mr-3" %} + {% include ui/avatar.html person-id=10 class="me-3" %}
      {{ site.data.people[9].first_name }} {{ site.data.people[9].last_name }}: @@ -51,7 +51,7 @@
    • - {% include ui/avatar.html person-id=11 class="mr-3" %} + {% include ui/avatar.html person-id=11 class="me-3" %}
      @@ -68,7 +68,7 @@
    • - {% include ui/avatar.html person-id=15 class="mr-3" %} + {% include ui/avatar.html person-id=15 class="me-3" %}
      @@ -84,7 +84,7 @@
      • - {% include ui/avatar.html person-id=6 class="mr-3" %} + {% include ui/avatar.html person-id=6 class="me-3" %}
        {{ site.data.people[5].first_name }} {{ site.data.people[5].last_name }}: diff --git a/src/pages/_includes/cards/project-kanban.html b/src/pages/_includes/cards/project-kanban.html index 2596f347e..4fc2324a6 100644 --- a/src/pages/_includes/cards/project-kanban.html +++ b/src/pages/_includes/cards/project-kanban.html @@ -9,14 +9,14 @@

        {{ include.title | default: 'Task Title' }} - {% if include.badge %} {{ include.badge }}{% endif %} + {% if include.badge %} {{ include.badge }}{% endif %}

        {% include ui/avatar-list.html offset=offset limit=limit stacked=true class="mb-3" %}
        - {% include ui/icon.html icon="check" class="mr-2" %} + {% include ui/icon.html icon="check" class="me-2" %} 5/10
        Due {{ due }} diff --git a/src/pages/_includes/cards/skeleton/card-6.html b/src/pages/_includes/cards/skeleton/card-6.html index 4c1e3c88c..22b1f7358 100644 --- a/src/pages/_includes/cards/skeleton/card-6.html +++ b/src/pages/_includes/cards/skeleton/card-6.html @@ -10,7 +10,7 @@
        -
        +
        diff --git a/src/pages/_includes/cards/small-stats.html b/src/pages/_includes/cards/small-stats.html index 106be83ec..9653552e5 100644 --- a/src/pages/_includes/cards/small-stats.html +++ b/src/pages/_includes/cards/small-stats.html @@ -22,7 +22,7 @@
        {{ include.title | default: 1700 }} {% if include.small-icon %} - {% include ui/icon.html icon=include.small-icon color=include.color class="icon-sm ml-1" %} + {% include ui/icon.html icon=include.small-icon color=include.color class="icon-sm ms-1" %} {% endif %} {% if include.description-value %} {{ include.description-value }} diff --git a/src/pages/_includes/cards/store-product-grid.html b/src/pages/_includes/cards/store-product-grid.html index 89a273c97..6d4357290 100644 --- a/src/pages/_includes/cards/store-product-grid.html +++ b/src/pages/_includes/cards/store-product-grid.html @@ -16,5 +16,5 @@ {% endfor %}
        - {% include parts/pagination.html class="ml-auto" %} + {% include parts/pagination.html class="ms-auto" %}
        \ No newline at end of file diff --git a/src/pages/_includes/cards/store-product.html b/src/pages/_includes/cards/store-product.html index 647820021..ff14f4526 100644 --- a/src/pages/_includes/cards/store-product.html +++ b/src/pages/_includes/cards/store-product.html @@ -10,7 +10,7 @@
        {{ product.price }}
        -
        +
        {% include ui/icon.html icon='plus' %} Add to cart
        diff --git a/src/pages/_includes/cards/tabs.html b/src/pages/_includes/cards/tabs.html index 74a31d431..660a71bb1 100644 --- a/src/pages/_includes/cards/tabs.html +++ b/src/pages/_includes/cards/tabs.html @@ -2,7 +2,7 @@ {% if include.id %} {% assign id = include.id %} {% endif %} -{% assign icon-class = "mr-2" %} +{% assign icon-class = "me-2" %} {% if include.hide-text %} {% assign icon-class = "" %} {% endif %} @@ -36,7 +36,7 @@
        • {% endif %} {% if include.settings %} -
      • +
      • {% include ui/icon.html icon="settings" %}
        • {% endif %} diff --git a/src/pages/_includes/cards/tasks.html b/src/pages/_includes/cards/tasks.html index f83343fdf..09a35fb36 100644 --- a/src/pages/_includes/cards/tasks.html +++ b/src/pages/_includes/cards/tasks.html @@ -6,7 +6,7 @@ {% for task in site.data.tasks %} -
        + diff --git a/src/pages/_includes/cards/user-info.html b/src/pages/_includes/cards/user-info.html index 90d61a640..d96910d68 100644 --- a/src/pages/_includes/cards/user-info.html +++ b/src/pages/_includes/cards/user-info.html @@ -5,27 +5,27 @@
        {{ include.title | default: 'Basic info' }}
        - {% include ui/icon.html icon="book" class="mr-2 text-muted" %} + {% include ui/icon.html icon="book" class="me-2 text-muted" %} Went to: {{ person.university }}
        - {% include ui/icon.html icon="briefcase" class="mr-2 text-muted" %} + {% include ui/icon.html icon="briefcase" class="me-2 text-muted" %} Worked at: {{ person.company }}
        - {% include ui/icon.html icon="home" class="mr-2 text-muted" %} + {% include ui/icon.html icon="home" class="me-2 text-muted" %} Lives in: {{ person.city }}, {{ person.country }}
        - {% include ui/icon.html icon="map-pin" class="mr-2 text-muted" %} + {% include ui/icon.html icon="map-pin" class="me-2 text-muted" %} From: {% include ui/flag.html flag=person.country_code %} {{ person.country }}
        - {% include ui/icon.html icon="calendar" class="mr-2 text-muted" %} + {% include ui/icon.html icon="calendar" class="me-2 text-muted" %} Birth date: {{ person.birth_date }}
        - {% include ui/icon.html icon="clock" class="mr-2 text-muted" %} + {% include ui/icon.html icon="clock" class="me-2 text-muted" %} Time zone: {{ person.time_zone }}
        diff --git a/src/pages/_includes/docs/menu.html b/src/pages/_includes/docs/menu.html index d61e6711e..360ce52cd 100644 --- a/src/pages/_includes/docs/menu.html +++ b/src/pages/_includes/docs/menu.html @@ -19,7 +19,7 @@ {{ item.title }} {% if item.show-version %} - {{ site.data.package.version }} + {{ site.data.package.version }} {% endif %} {% if item.children %} diff --git a/src/pages/_includes/forms/form-elements-2.html b/src/pages/_includes/forms/form-elements-2.html index 97e1e0e07..0ed077bbd 100644 --- a/src/pages/_includes/forms/form-elements-2.html +++ b/src/pages/_includes/forms/form-elements-2.html @@ -24,12 +24,12 @@
        - {% include ui/form/input-group.html prepend="https://tabler.io/users/" flat=true input-class="pl-0" value="yourfancyusername" %} + {% include ui/form/input-group.html prepend="https://tabler.io/users/" flat=true input-class="ps-0" value="yourfancyusername" %}
        - {% include ui/form/input-group.html append=".tabler.io" input-class="text-right pr-0" flat=true value="yourfancydomain" %} + {% include ui/form/input-group.html append=".tabler.io" input-class="text-right pe-0" flat=true value="yourfancydomain" %}
        diff --git a/src/pages/_includes/forms/form-elements-4.html b/src/pages/_includes/forms/form-elements-4.html index 67ba5ea73..42bad1532 100644 --- a/src/pages/_includes/forms/form-elements-4.html +++ b/src/pages/_includes/forms/form-elements-4.html @@ -24,7 +24,7 @@ -
        +
        Option 4 diff --git a/src/pages/_includes/layout/footer.html b/src/pages/_includes/layout/footer.html index bb91dab3f..9fb1572c7 100644 --- a/src/pages/_includes/layout/footer.html +++ b/src/pages/_includes/layout/footer.html @@ -1,7 +1,7 @@
        -
        +
        • Documentation
        • License
          • diff --git a/src/pages/_includes/layout/header-actions/photos.html b/src/pages/_includes/layout/header-actions/photos.html index 0192f62cf..462501f30 100644 --- a/src/pages/_includes/layout/header-actions/photos.html +++ b/src/pages/_includes/layout/header-actions/photos.html @@ -1,5 +1,5 @@
          -
          +
          {% include ui/form/input-icon.html %}
          {% include ui/button.html text="Add event" color="primary" icon="plus" %} diff --git a/src/pages/_includes/layout/header-actions/users.html b/src/pages/_includes/layout/header-actions/users.html index acf5eb059..661fd6bdb 100644 --- a/src/pages/_includes/layout/header-actions/users.html +++ b/src/pages/_includes/layout/header-actions/users.html @@ -1,4 +1,4 @@
          - + {% include ui/button.html text="New user" color="primary" icon="plus" %}
          \ No newline at end of file diff --git a/src/pages/_includes/layout/homepage.html b/src/pages/_includes/layout/homepage.html index d240b1e4c..1373a23f8 100644 --- a/src/pages/_includes/layout/homepage.html +++ b/src/pages/_includes/layout/homepage.html @@ -33,25 +33,25 @@
          -
          - +
          + Regular - 915MB + 915MB
          - + System - 415MB + 415MB
          - + Shared - 201MB + 201MB
          -
          - +
          + Free - 612MB + 612MB
          diff --git a/src/pages/_includes/layout/layouts-list.html b/src/pages/_includes/layout/layouts-list.html index 7d263869a..bc7c2b682 100644 --- a/src/pages/_includes/layout/layouts-list.html +++ b/src/pages/_includes/layout/layouts-list.html @@ -11,9 +11,9 @@

          {{ layout.title }} {% if layout.new %} - {% include ui/badge.html text="New" color="green" class="ml-2" %} + {% include ui/badge.html text="New" color="green" class="ms-2" %} {% elsif layout.soon %} - {% include ui/badge.html text="Soon!" color="yellow" class="ml-2" %} + {% include ui/badge.html text="Soon!" color="yellow" class="ms-2" %} {% endif %}

          Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam assumenda atque consequatur.

          diff --git a/src/pages/_includes/layout/navbar-logo.html b/src/pages/_includes/layout/navbar-logo.html index e7830d889..5d355e28f 100644 --- a/src/pages/_includes/layout/navbar-logo.html +++ b/src/pages/_includes/layout/navbar-logo.html @@ -11,9 +11,9 @@ {% endif %} {% unless include.hide-logo %} {% if include.small-logo %} - {{ site.title }} + {{ site.title }} {% else %} - {{ site.title }} + {{ site.title }} {% endif %} {% endunless %} diff --git a/src/pages/_includes/layout/navbar-menu.html b/src/pages/_includes/layout/navbar-menu.html index a7d27408e..fa66dda20 100644 --- a/src/pages/_includes/layout/navbar-menu.html +++ b/src/pages/_includes/layout/navbar-menu.html @@ -30,7 +30,7 @@ {% if level-1[1].children %} -
          +
          {% if level-1[1].columns %}
          diff --git a/src/pages/_includes/layout/navbar-side.html b/src/pages/_includes/layout/navbar-side.html index 458c00e0e..e2179e6af 100644 --- a/src/pages/_includes/layout/navbar-side.html +++ b/src/pages/_includes/layout/navbar-side.html @@ -1,12 +1,12 @@ {% assign person-id = include.person-id | default: 1 %} {% assign person = site.data.people[person-id] %}
          -
          +
          {% include ui/icon.html icon="bell" %} -
          +
          {% include cards/navbar-notifications.html %}
          @@ -16,7 +16,7 @@ {% include ui/avatar.html person-id=person-id size="sm" %} {% unless include.hide-username %} -
          +
          {{ person.full_name }}
          {{ person.job_title }}
          diff --git a/src/pages/_includes/layout/navbar.html b/src/pages/_includes/layout/navbar.html index 406401f8d..4ad549a6a 100644 --- a/src/pages/_includes/layout/navbar.html +++ b/src/pages/_includes/layout/navbar.html @@ -10,7 +10,7 @@ {% include layout/navbar-toggler.html target="navbar-menu" %} {% unless include.hide-brand %} - {% include layout/navbar-logo.html dark=include.dark small-logo=include.small-logo hide-logo=include.hide-logo class="d-none-navbar-horizontal pr-0 pr-md-3" breakpoint=breakpoint show-title=include.show-title header=true %} + {% include layout/navbar-logo.html dark=include.dark small-logo=include.small-logo hide-logo=include.hide-logo class="d-none-navbar-horizontal pe-0 pe-md-3" breakpoint=breakpoint show-title=include.show-title header=true %} {% endunless %} {% include layout/navbar-side.html class="order-md-last" hide-username=include.hide-username person-id=include.person-id %} @@ -25,7 +25,7 @@
          {% include layout/navbar-menu.html sample=include.sample hide-icons=include.hide-icons %} - {% assign search-class = "ml-md-auto pl-md-4 py-2 py-md-0 mr-md-4 order-first order-md-last flex-grow-1" %} + {% assign search-class = "ms-md-auto ps-md-4 py-2 py-md-0 me-md-4 order-first order-md-last flex-grow-1" %} {% unless include.fluid-search %} {% assign search-class = search-class | append: " flex-md-grow-0" %} {% endunless %} diff --git a/src/pages/_includes/layout/page-header.html b/src/pages/_includes/layout/page-header.html index c9b57a900..8581dbf3b 100644 --- a/src/pages/_includes/layout/page-header.html +++ b/src/pages/_includes/layout/page-header.html @@ -32,7 +32,7 @@ {% if actions %} -
          +
          {% include layout/header-actions/{{ actions }}.html %}
          {% endif %} diff --git a/src/pages/_includes/parts/dropdown/days.html b/src/pages/_includes/parts/dropdown/days.html index d41efbef8..c5666823b 100644 --- a/src/pages/_includes/parts/dropdown/days.html +++ b/src/pages/_includes/parts/dropdown/days.html @@ -1,6 +1,6 @@
          -
          +
          Last 7 days Last 30 days Last 3 months diff --git a/src/pages/_includes/parts/form/selectgroup-payments.html b/src/pages/_includes/parts/form/selectgroup-payments.html index 20dfe6b0a..86dbcbfac 100644 --- a/src/pages/_includes/parts/form/selectgroup-payments.html +++ b/src/pages/_includes/parts/form/selectgroup-payments.html @@ -7,11 +7,11 @@
        - {% include ui/avatar.html person-id=person.id class="mr-2" %} + {% include ui/avatar.html person-id=person.id class="me-2" %}
        {{ person.full_name }}
        {{ person.email }}
        diff --git a/src/pages/_includes/ui/toast.html b/src/pages/_includes/ui/toast.html index 77d681b83..ba1904696 100644 --- a/src/pages/_includes/ui/toast.html +++ b/src/pages/_includes/ui/toast.html @@ -3,10 +3,10 @@