From 897c4f5e2685be116fc0570ce0c5a7547b81781f Mon Sep 17 00:00:00 2001 From: codecalm Date: Fri, 7 Feb 2020 22:31:44 +0100 Subject: [PATCH] footer page fixes --- .../_includes/cards/charts/active-users.html | 2 +- pages/_includes/cards/charts/new-clients.html | 2 +- pages/_includes/cards/charts/revenue.html | 2 +- pages/_includes/cards/charts/sales.html | 2 +- pages/_includes/cards/invoices.html | 4 -- pages/_includes/cards/table-users.html | 9 ---- pages/_includes/layout/footer-sub.html | 37 -------------- pages/_includes/layout/footer.html | 48 ++++++++++--------- pages/_layouts/default.html | 5 +- scss/_tabler-core.scss | 1 + scss/layout/_footer.scss | 8 ++-- scss/layout/_page.scss | 9 ++-- scss/ui/_lists.scss | 11 +++++ 13 files changed, 54 insertions(+), 86 deletions(-) delete mode 100644 pages/_includes/layout/footer-sub.html diff --git a/pages/_includes/cards/charts/active-users.html b/pages/_includes/cards/charts/active-users.html index 2fdd02551..a5595332d 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 a9d580670..9228873c3 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 7e170d50f..2e6f7d635 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 92e63783d..1e4961797 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 41c609c73..5746dd9ea 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 0b37c5f52..5cd583681 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" %} - -
- - {% include ui/icon.html icon="more-vertical" %} - - {% include ui/dropdown-menu.html right=true %} -
- {% endfor %} diff --git a/pages/_includes/layout/footer-sub.html b/pages/_includes/layout/footer-sub.html deleted file mode 100644 index 7a87a96ed..000000000 --- a/pages/_includes/layout/footer-sub.html +++ /dev/null @@ -1,37 +0,0 @@ -
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
- Premium and Open Source dashboard template with responsive and high quality UI. For Free! -
-
-
-
\ No newline at end of file diff --git a/pages/_includes/layout/footer.html b/pages/_includes/layout/footer.html index 1b75a2f6b..93696bf27 100644 --- a/pages/_includes/layout/footer.html +++ b/pages/_includes/layout/footer.html @@ -1,22 +1,26 @@ - \ No newline at end of file +
+
+
+
+
+
+
+ +
+
+ {% 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 273638381..4146257c1 100644 --- a/pages/_layouts/default.html +++ b/pages/_layouts/default.html @@ -9,15 +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-sub.html %} {% include layout/footer.html %}
diff --git a/scss/_tabler-core.scss b/scss/_tabler-core.scss index 6b21246e7..e99632d57 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/layout/_footer.scss b/scss/layout/_footer.scss index a9f5b3164..8b7d383ad 100644 --- a/scss/layout/_footer.scss +++ b/scss/layout/_footer.scss @@ -1,6 +1,6 @@ .footer { - border-top: 1px solid; - background-color: $footer-bg; - border-color: $footer-border-color; - padding: 0.75rem; + 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 cbef0efa9..2ef6c1a7c 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 21adb4885..743f0fcf8 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