Skip to content

Commit

Permalink
Fix wrong import paths
Browse files Browse the repository at this point in the history
  • Loading branch information
dgrammatiko committed Nov 22, 2021
1 parent ef80ff9 commit 0f90503
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Override the font path
$fa-css-prefix: fa;
$fa-font-path: "../../../../../../../../media/vendor/fontawesome-free/webfonts" !default;
$fa-font-path: "../../../../../../vendor/fontawesome-free/webfonts" !default;

// Font Awesome 5 Free
@import "../../../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
Expand All @@ -11,7 +11,7 @@ $fa-font-path: "../../../../../../../../media/vendor/fontawe
@import "../../../../../../../../media/vendor/fontawesome-free/scss/brands";

// B/C for Icomoon
@import "../../../../../../../../media/system/scss/icomoon";
@import "../../../../../../system/scss/icomoon";

// RTL override
html[dir=rtl] .float-right {
Expand Down
20 changes: 10 additions & 10 deletions installation/template/scss/template.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Variables
@import "../../../media/templates/administrator/atum/scss/variables";
@import "../../../build/media_source/templates/administrator/atum/scss/variables";
$jicon-css-prefix: icon;
$fa-css-prefix: fa;
$fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
$fa-font-path: "../../../build/media_source/vendor/fontawesome-free/webfonts";

// Font Awesome
@import "../../../media/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome";
@import "../../../build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome";

// "Font Awesome 5 Free"
@import "../../../media/vendor/fontawesome-free/scss/fontawesome";
Expand All @@ -20,19 +20,19 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
@import "../../../media/vendor/bootstrap/scss/functions";

// Variables from the Atum template
@import "../../../media/templates/administrator/atum/scss/variables";
@import "../../../build/media_source/templates/administrator/atum/scss/variables";

// Bootstrap with the root.scss overriden
@import "../../../media/templates/administrator/atum/scss/vendor/bootstrap";
@import "../../../build/media_source/templates/administrator/atum/scss/vendor/bootstrap";

// Backend Template stuff
@import "../../../media/templates/administrator/atum/scss/blocks/global";
@import "../../../media/templates/administrator/atum/scss/blocks/header";
@import "../../../media/templates/administrator/atum/scss/vendor/bootstrap/custom-forms";
@import "../../../media/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert";
@import "../../../build/media_source/templates/administrator/atum/scss/blocks/global";
@import "../../../build/media_source/templates/administrator/atum/scss/blocks/header";
@import "../../../build/media_source/templates/administrator/atum/scss/vendor/bootstrap/custom-forms";
@import "../../../build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert";

// Safari fix
@import "../../../media/templates/administrator/atum/scss/vendor/bootstrap/reboot";
@import "../../../build/media_source/templates/administrator/atum/scss/vendor/bootstrap/reboot";

body {
background: var(--template-bg-light);
Expand Down

0 comments on commit 0f90503

Please sign in to comment.