From a8edb3cfab0eca79e3599718d7fc93f66c367583 Mon Sep 17 00:00:00 2001 From: Quantum Date: Sat, 15 Jul 2023 17:29:49 -0400 Subject: [PATCH] Factor out common CSS constants --- {frcal/src => common/src/ui}/consts.scss | 0 frcal/src/Calendar.scss | 2 +- frcal/src/TimeOfDay.scss | 3 --- frcal/src/index.scss | 2 +- jcal/src/Calendar.scss | 2 +- jcal/src/consts.scss | 2 -- jcal/src/index.scss | 2 +- 7 files changed, 4 insertions(+), 9 deletions(-) rename {frcal/src => common/src/ui}/consts.scss (100%) delete mode 100644 jcal/src/consts.scss diff --git a/frcal/src/consts.scss b/common/src/ui/consts.scss similarity index 100% rename from frcal/src/consts.scss rename to common/src/ui/consts.scss diff --git a/frcal/src/Calendar.scss b/frcal/src/Calendar.scss index aec8426..53a8c8f 100644 --- a/frcal/src/Calendar.scss +++ b/frcal/src/Calendar.scss @@ -4,7 +4,7 @@ @import 'bootstrap/scss/forms'; @import 'bootstrap/scss/grid'; @import 'bootstrap/scss/buttons'; -@import './consts'; +@import '@common/ui/consts.scss'; @import '@common/ui/MonthBasedCalendar.scss'; .Calendar { diff --git a/frcal/src/TimeOfDay.scss b/frcal/src/TimeOfDay.scss index 87e4ef4..177690d 100644 --- a/frcal/src/TimeOfDay.scss +++ b/frcal/src/TimeOfDay.scss @@ -1,10 +1,7 @@ @import 'bootstrap/scss/functions'; @import 'bootstrap/scss/variables'; @import 'bootstrap/scss/mixins'; -@import 'bootstrap/scss/forms'; @import 'bootstrap/scss/grid'; -@import 'bootstrap/scss/buttons'; -@import './consts'; .TimeOfDay { @include make-container(); diff --git a/frcal/src/index.scss b/frcal/src/index.scss index de7a422..ecdcbcb 100644 --- a/frcal/src/index.scss +++ b/frcal/src/index.scss @@ -8,7 +8,7 @@ @import 'bootstrap/scss/card'; @import 'bootstrap/scss/forms'; @import 'bootstrap/scss/root'; -@import './consts'; +@import '@common/ui/consts.scss'; @import '@common/ui/MobileTooltip.scss'; body { diff --git a/jcal/src/Calendar.scss b/jcal/src/Calendar.scss index a775a66..e75be91 100644 --- a/jcal/src/Calendar.scss +++ b/jcal/src/Calendar.scss @@ -4,7 +4,7 @@ @import 'bootstrap/scss/forms'; @import 'bootstrap/scss/grid'; @import 'bootstrap/scss/buttons'; -@import './consts'; +@import '@common/ui/consts.scss'; @import '@common/ui/MonthBasedCalendar.scss'; .Calendar { diff --git a/jcal/src/consts.scss b/jcal/src/consts.scss deleted file mode 100644 index fe8c232..0000000 --- a/jcal/src/consts.scss +++ /dev/null @@ -1,2 +0,0 @@ -$calendar-width: 1600px; -$calendar-gutter: 0.5rem; diff --git a/jcal/src/index.scss b/jcal/src/index.scss index de7a422..ecdcbcb 100644 --- a/jcal/src/index.scss +++ b/jcal/src/index.scss @@ -8,7 +8,7 @@ @import 'bootstrap/scss/card'; @import 'bootstrap/scss/forms'; @import 'bootstrap/scss/root'; -@import './consts'; +@import '@common/ui/consts.scss'; @import '@common/ui/MobileTooltip.scss'; body {