diff --git a/pages/_includes/layout/page-title.html b/pages/_includes/layout/page-title.html
index c839622ba..d94d56244 100644
--- a/pages/_includes/layout/page-title.html
+++ b/pages/_includes/layout/page-title.html
@@ -25,10 +25,14 @@
{% if page.page-title-actions == 'users' %}
-
-
- {% include ui/button.html text="New user" color="primary" icon="plus" %}
-
+
+
+ {% include ui/button.html text="New user" color="primary" icon="plus" %}
+
+ {% elsif page.page-title-actions == 'calendar' %}
+
+ {% include ui/button.html text="Add event" color="primary" icon="plus" %}
+
{% else %}
{% include ui/button.html text="New view" color="secondary" icon="plus" %}
diff --git a/pages/_includes/ui/fullcalendar.html b/pages/_includes/ui/fullcalendar.html
index 8bc9a2926..8cf7f9fbd 100644
--- a/pages/_includes/ui/fullcalendar.html
+++ b/pages/_includes/ui/fullcalendar.html
@@ -1,29 +1,85 @@
{% assign calendar-id = include.calendar-id | default: 'main' %}
-
+
{% capture_global scripts %}
diff --git a/pages/calendar.html b/pages/calendar.html
index 301fb1399..5ed4390ec 100644
--- a/pages/calendar.html
+++ b/pages/calendar.html
@@ -1,6 +1,7 @@
---
title: Calendar
page-title: Calendar
+page-title-actions: calendar
menu: calendar
---
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 7deef8cba..b14956d4f 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -128,12 +128,12 @@ $headings-font-weight: 600 !default;
$small-font-size: 87.5% !default;
-$h1-font-size: (26em / 16) !default;
-$h2-font-size: (21em / 16) !default;
-$h3-font-size: (18em / 16) !default;
-$h4-font-size: (16em / 16) !default;
-$h5-font-size: (14em / 16) !default;
-$h6-font-size: (12em / 16) !default;
+$h1-font-size: (26rem / 16) !default;
+$h2-font-size: (21rem / 16) !default;
+$h3-font-size: (18rem / 16) !default;
+$h4-font-size: (16rem / 16) !default;
+$h5-font-size: (14rem / 16) !default;
+$h6-font-size: (12rem / 16) !default;
$blockquote-font-size: $h4-font-size !default;
diff --git a/scss/tabler.scss b/scss/tabler.scss
index b3f799ca7..9ddc96224 100644
--- a/scss/tabler.scss
+++ b/scss/tabler.scss
@@ -54,6 +54,7 @@
@import "vendor/jqvmap";
@import "vendor/apexcharts";
@import "vendor/sparkline";
+@import "vendor/fullcalendar";
@import "utils/border";
@import "utils/background";
diff --git a/scss/ui/_nav.scss b/scss/ui/_nav.scss
index fcc4949dd..1c6eb393a 100644
--- a/scss/ui/_nav.scss
+++ b/scss/ui/_nav.scss
@@ -46,6 +46,7 @@
.icon {
display: block;
+ stroke-width: 1.5;
}
}
diff --git a/scss/vendor/_fullcalendar.scss b/scss/vendor/_fullcalendar.scss
new file mode 100644
index 000000000..a105b4d94
--- /dev/null
+++ b/scss/vendor/_fullcalendar.scss
@@ -0,0 +1,63 @@
+
+.fc-unthemed {
+ .fc-content,
+ .fc-divider,
+ .fc-list-heading td,
+ .fc-list-view,
+ .fc-popover,
+ .fc-row,
+ tbody,
+ td,
+ th,
+ thead {
+ border-color: $border-color;
+ }
+
+ .fc-toolbar {
+ h2 {
+ font-size: $h2-font-size;
+ margin: 0;
+ }
+ }
+
+ .fc-button {
+ @include button-variant(#ffffff, $border-color, $text-muted);
+ @include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-border-radius);
+ @include transition($btn-transition);
+ }
+
+ .fc-widget-header {
+ border: 0;
+ }
+
+ .fc-day-header {
+ padding-bottom: .25rem;
+ font-weight: 600;
+ }
+
+ &.card-calendar {
+ .fc-day-grid-container {
+ border-bottom: 0;
+ border-left: 0;
+
+ td:last-child {
+ //border-right: 0;
+ }
+
+ td:first-child {
+ //border-left: 0;
+ }
+ }
+ }
+
+ .fc-time {
+ font-weight: 600;
+ }
+
+ .fc-event {
+ border-color: rgba(0, 0, 0, .05);
+ color: $primary;
+ background-color: theme-color-lighter($primary);
+ padding: 0 .25rem;
+ }
+}