diff --git a/pages/_includes/cards/charts/active-users.html b/pages/_includes/cards/charts/active-users.html index 2fdd025514810744e2119374c39a8db8a42374f2..a5595332d8ed14215f3104d4649b11832f2a9e99 100644 --- a/pages/_includes/cards/charts/active-users.html +++ b/pages/_includes/cards/charts/active-users.html @@ -2,7 +2,7 @@
Active users
-
+
{% include parts/dropdown/days.html %}
diff --git a/pages/_includes/cards/charts/new-clients.html b/pages/_includes/cards/charts/new-clients.html index a9d58067057c83e895b7801c027e5ae260543abe..9228873c37f0f12ed9dfb2ebf5fc482cb5364de0 100644 --- a/pages/_includes/cards/charts/new-clients.html +++ b/pages/_includes/cards/charts/new-clients.html @@ -2,7 +2,7 @@
New clients
-
+
{% include parts/dropdown/days.html %}
diff --git a/pages/_includes/cards/charts/revenue.html b/pages/_includes/cards/charts/revenue.html index 7e170d50f97b9678f16c8f66dd633f9f33ec38eb..2e6f7d635867ef14890404c4c27687c99bf29ea8 100644 --- a/pages/_includes/cards/charts/revenue.html +++ b/pages/_includes/cards/charts/revenue.html @@ -2,7 +2,7 @@
Revenue
-
+
{% include parts/dropdown/days.html %}
diff --git a/pages/_includes/cards/charts/sales.html b/pages/_includes/cards/charts/sales.html index 92e63783d734f236b1c152976210cd4f612c36b6..1e4961797753939286e406a90a8ecee6d1455ada 100644 --- a/pages/_includes/cards/charts/sales.html +++ b/pages/_includes/cards/charts/sales.html @@ -2,7 +2,7 @@
Sales
-
+
{% include parts/dropdown/days.html %}
diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index 41c609c7309fff4183973567a96f45f55b4c1379..5746dd9ea4842aa44411e4463b5708ebf1611b4d 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -35,7 +35,6 @@ Status {% include ui/icon.html icon="code" class="icon-sm" %} Price {% include ui/icon.html icon="code" class="icon-sm" %} - @@ -67,9 +66,6 @@ {% include ui/dropdown-menu.html right=true %} - - {% include ui/icon.html icon="edit" class="icon-sm float-right" %} - {% endfor %} diff --git a/pages/_includes/cards/table-users.html b/pages/_includes/cards/table-users.html index 0b37c5f52733cabfa48c94266148f40c7a4c0d79..5cd58368189e46572161d65c781d95f667eb8e49 100644 --- a/pages/_includes/cards/table-users.html +++ b/pages/_includes/cards/table-users.html @@ -8,7 +8,6 @@ Payment Activity Satisfaction - @@ -59,14 +58,6 @@ {% include ui/sparkline.html percentage=percentage type="pie" %} - - - {% endfor %} diff --git a/pages/_includes/layout/footer.html b/pages/_includes/layout/footer.html new file mode 100644 index 0000000000000000000000000000000000000000..93696bf27452f652c25e63b4b32ffbe21721699f --- /dev/null +++ b/pages/_includes/layout/footer.html @@ -0,0 +1,26 @@ +
+
+
+
+
+
+
+ +
+
+ {% include ui/button.html color="secondary" size="sm" text="Source code" href=site.github_url external=true %} +
+
+
+
+ Copyright © {{ site.time | date: '%Y' }} + {{ site.title }}. + All rights reserved. +
+
+
+
+
\ No newline at end of file diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html index 8b8d1c3e910f6d434702389038e2467a3f9e1b27..4146257c12256ae959ef605ee8e737631d8ed980 100644 --- a/pages/_layouts/default.html +++ b/pages/_layouts/default.html @@ -9,12 +9,14 @@ layout: base {% include layout/navbar-secondary.html %}
-
+
{% if page-header %} {% include layout/page-header.html title=page-header description=page.page-header-description actions=page.page-header-actions pretitle=page.page-header-pretitle %} {% endif %} {{ content }} -
+
+ + {% include layout/footer.html %}
diff --git a/scss/_tabler-core.scss b/scss/_tabler-core.scss index 6b21246e77987d7cd2321007e07aaafc94f271b6..e99632d57757d30da0f5a9898e99db05cbb8ce1b 100644 --- a/scss/_tabler-core.scss +++ b/scss/_tabler-core.scss @@ -6,6 +6,7 @@ @import "layout/core"; @import "layout/navbar"; @import "layout/page"; +@import "layout/footer"; @import "ui/alerts"; @import "ui/avatars"; diff --git a/scss/_variables.scss b/scss/_variables.scss index 053611bf7daab3ceac8b333bca0e2539f8e0fcbd..c877a4b0b9154dbda5e00fc630bec3bb1c9c9832 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -300,7 +300,7 @@ $dropdown-border-color: $border-color !default; $dropdown-menu-max-width: 25rem !default; //grid -$grid-gutter-width: 1.25rem !default; +$grid-gutter-width: 1.5rem !default; //loader $loader-size: 2.5rem !default; @@ -346,6 +346,11 @@ $navbar-toggler-transform-time: .2s !default; //popover $popover-border-color: $border-color !default; +//footer +$footer-bg: $white !default; +$footer-border-color: $border-color !default; +$footer-border-color: $border-color !default; + //nav //$nav-link-padding-y: 1rem !default; @@ -465,4 +470,4 @@ $enable-ghost-buttons: true !default; $enable-extra-colors: true !default; $enable-gradients: false !default; $enable-navbar-vertical: true !default; -$enable-dark-mode: true !default; \ No newline at end of file +$enable-dark-mode: true !default; diff --git a/scss/layout/_footer.scss b/scss/layout/_footer.scss new file mode 100644 index 0000000000000000000000000000000000000000..8b7d383ad906250ed47c3ba2e9c67d4aaffa15ab --- /dev/null +++ b/scss/layout/_footer.scss @@ -0,0 +1,6 @@ +.footer { + border-top: 1px solid $footer-border-color; + background-color: $footer-bg; + padding: 1rem 0; + color: $text-muted; +} \ No newline at end of file diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss index cbef0efa98e0e1d1c655858bdab4f80d39f625e0..2ef6c1a7cbe04c787b5dc043803437c02942e23f 100644 --- a/scss/layout/_page.scss +++ b/scss/layout/_page.scss @@ -2,15 +2,18 @@ display: flex; flex-direction: column; position: relative; + min-height: 100vh; } .content { padding-top: 1.25rem; padding-bottom: 1.25rem; + flex: 1; + display: flex; + flex-direction: column; - @include media-breakpoint-up(xl) { - padding-left: .5rem; - padding-right: .5rem; + >[class*="container"] { + flex: 1; } @media print { diff --git a/scss/ui/_lists.scss b/scss/ui/_lists.scss index 21adb4885ec3adeea65319e43b2bc61d376a0d7d..743f0fcf8eda952314e97fe7f3b0d53449bcec68 100644 --- a/scss/ui/_lists.scss +++ b/scss/ui/_lists.scss @@ -182,3 +182,14 @@ border-top: 1px solid $border-color; } } + +/** +Inline list + */ + +.list-inline-dots { + .list-inline-item + .list-inline-item:before { + content: '· '; + margin-right: $list-inline-padding; + } +} \ No newline at end of file