From cf8ee11146ae8430790b028abf465ef87635b348 Mon Sep 17 00:00:00 2001 From: Holger Koenemann Date: Fri, 12 Dec 2014 10:24:45 +0100 Subject: [PATCH] resorting 3 --- sass/theme.scss | 6 +++--- .../{_underscores.scss => understrap_underscores.scss} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename sass/underscores/{_underscores.scss => understrap_underscores.scss} (100%) diff --git a/sass/theme.scss b/sass/theme.scss index d915a19..6e52325 100644 --- a/sass/theme.scss +++ b/sass/theme.scss @@ -1,8 +1,8 @@ -@import "underscores/underscores"; // the _s starter theme basic styles <- Dont edit this files! +@import "underscores/understrap_underscores"; // the _s starter theme basic styles <- Dont edit this files! @import "theme/theme_variables"; // Overwriting Bootstrap variables and for own variables -@import "bootstrap/bootstrap"; // adding bootstrap <- Dont edit this files! +@import "bootstrap/understrap_bootstrap"; // adding bootstrap <- Dont edit this files! @import "understrap/understrap"; // Some basic understrap styles. Helps to combine Bootsrap and _s theme and provides some basic styleing for additonal functions <- Dont edit this files! -@import "font-awesome/font-awesome"; // <- Dont edit this files! If you don´t need/want Font Awesome support comment out this line +@import "font-awesome/understrap_font-awesome"; // <- Dont edit this files! If you don´t need/want Font Awesome support comment out this line // Any additional imported files // @import "theme/theme"; // <-- ADD YOUR STYLES HERE \ No newline at end of file diff --git a/sass/underscores/_underscores.scss b/sass/underscores/understrap_underscores.scss similarity index 100% rename from sass/underscores/_underscores.scss rename to sass/underscores/understrap_underscores.scss