From 276f4fea1f5dbf2611f1ccde43e5beb21beb37bb Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 6 Oct 2023 14:49:38 +0800 Subject: [PATCH] Fix CSS import --- app/javascript/front/home.scss | 2 +- app/javascript/front/index.scss | 2 +- app/javascript/front/search.scss | 3 +- app/javascript/front/teams.scss | 2 +- app/javascript/front/toc.scss | 2 +- app/javascript/front/users.scss | 3 +- app/javascript/homeland/bootstrap_custom.scss | 54 +++++++++---------- 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/app/javascript/front/home.scss b/app/javascript/front/home.scss index 892b9de789..b11a084cc8 100644 --- a/app/javascript/front/home.scss +++ b/app/javascript/front/home.scss @@ -1,4 +1,4 @@ -@import "~homeland/_vars"; +@import "~/homeland/_vars"; #home_index { line-height: 160%; diff --git a/app/javascript/front/index.scss b/app/javascript/front/index.scss index 912b7ff967..da8bf519dd 100644 --- a/app/javascript/front/index.scss +++ b/app/javascript/front/index.scss @@ -13,7 +13,7 @@ @import "search"; @import "toc"; @import "highlight"; -@import "~homeland/dark-mode"; +@import "~/homeland/dark-mode"; .page-topics { .navbar-fixed-active { diff --git a/app/javascript/front/search.scss b/app/javascript/front/search.scss index 97922aa3fc..7d241bf5a2 100644 --- a/app/javascript/front/search.scss +++ b/app/javascript/front/search.scss @@ -1,4 +1,5 @@ -@import "~homeland/_vars"; +@import "~/homeland/_vars"; + .search-results { .pagination { margin-top: 25px; diff --git a/app/javascript/front/teams.scss b/app/javascript/front/teams.scss index 7dfa9ad6de..c51056d6f7 100644 --- a/app/javascript/front/teams.scss +++ b/app/javascript/front/teams.scss @@ -1,4 +1,4 @@ -@import "~homeland/_vars"; +@import "~/homeland/_vars"; .team-header { background: var(--sub-navbar-background-color); diff --git a/app/javascript/front/toc.scss b/app/javascript/front/toc.scss index 6ba2972a88..541d45dd0e 100644 --- a/app/javascript/front/toc.scss +++ b/app/javascript/front/toc.scss @@ -1,4 +1,4 @@ -@import "~homeland/_vars"; +@import "~/homeland/_vars"; .toc-container { display: none; diff --git a/app/javascript/front/users.scss b/app/javascript/front/users.scss index c0d3eae37f..a2fb3c29ed 100644 --- a/app/javascript/front/users.scss +++ b/app/javascript/front/users.scss @@ -1,4 +1,5 @@ -@import "~homeland/_vars"; +@import "~/homeland/_vars"; + .subnav { margin-bottom: -18px; .nav-tabs { diff --git a/app/javascript/homeland/bootstrap_custom.scss b/app/javascript/homeland/bootstrap_custom.scss index 39b31e68c1..90decc3d22 100644 --- a/app/javascript/homeland/bootstrap_custom.scss +++ b/app/javascript/homeland/bootstrap_custom.scss @@ -4,30 +4,30 @@ * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ -@import "~bootstrap/scss/functions"; -@import "~bootstrap/scss/variables"; -@import "~bootstrap/scss/mixins"; -@import "~bootstrap/scss/utilities"; -@import "~bootstrap/scss/root"; -@import "~bootstrap/scss/reboot"; -@import "~bootstrap/scss/images"; -@import "~bootstrap/scss/grid"; -@import "~bootstrap/scss/forms"; -@import "~bootstrap/scss/buttons"; -@import "~bootstrap/scss/transitions"; -@import "~bootstrap/scss/dropdown"; -@import "~bootstrap/scss/button-group"; -@import "~bootstrap/scss/nav"; -@import "~bootstrap/scss/card"; -@import "~bootstrap/scss/breadcrumb"; -@import "~bootstrap/scss/pagination"; -@import "~bootstrap/scss/badge"; -@import "~bootstrap/scss/alert"; -@import "~bootstrap/scss/list-group"; -@import "~bootstrap/scss/close"; -@import "~bootstrap/scss/modal"; -@import "~bootstrap/scss/tooltip"; -@import "~bootstrap/scss/popover"; -@import "~bootstrap/scss/spinners"; -@import "~bootstrap/scss/helpers"; -@import "~bootstrap/scss/utilities/api"; +@import "bootstrap/scss/functions"; +@import "bootstrap/scss/variables"; +@import "bootstrap/scss/mixins"; +@import "bootstrap/scss/utilities"; +@import "bootstrap/scss/root"; +@import "bootstrap/scss/reboot"; +@import "bootstrap/scss/images"; +@import "bootstrap/scss/grid"; +@import "bootstrap/scss/forms"; +@import "bootstrap/scss/buttons"; +@import "bootstrap/scss/transitions"; +@import "bootstrap/scss/dropdown"; +@import "bootstrap/scss/button-group"; +@import "bootstrap/scss/nav"; +@import "bootstrap/scss/card"; +@import "bootstrap/scss/breadcrumb"; +@import "bootstrap/scss/pagination"; +@import "bootstrap/scss/badge"; +@import "bootstrap/scss/alert"; +@import "bootstrap/scss/list-group"; +@import "bootstrap/scss/close"; +@import "bootstrap/scss/modal"; +@import "bootstrap/scss/tooltip"; +@import "bootstrap/scss/popover"; +@import "bootstrap/scss/spinners"; +@import "bootstrap/scss/helpers"; +@import "bootstrap/scss/utilities/api";