From e9cd3e8f7e14f12c83077dad92c0c9e91553db61 Mon Sep 17 00:00:00 2001 From: Holger Koenemann Date: Fri, 13 Feb 2015 15:39:31 +0100 Subject: [PATCH] TEEEEEEESSSSST --- css/theme.css | 17 +++++++++++++++++ sass/theme.scss | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/css/theme.css b/css/theme.css index 065f9f9..2c8564d 100644 --- a/css/theme.css +++ b/css/theme.css @@ -2,10 +2,27 @@ /***************************************************************** Import all needed 3rd party sass files plus your own style and variables 1. understrap_underscores.scss +-------------------------------------- 2. theme/theme_variables.scss // Overwriting Bootstrap variables and for own variables <-- ADD YOUR VARIABLES HERE +-------------------------------------- 3. bootstrap/understrap_bootstrap.scss // adding bootstrap <- Dont edit this files! +-------------------------------------- 4. understrap/understrap.scss // Some basic understrap styles. Helps to combine Bootsrap and _s theme and provides some basic styleing for additonal functions <- Dont edit this files! +-------------------------------------- 5. font-awesome/understrap_font-awesome.scss <- Dont edit this files! If you don´t need/want Font Awesome support comment out this line +-------------------------------------- + + + + * + * + * + ******* + ***** + *** + * + + // Any additional imported files // 6. theme/theme.scss"; // <-- ADD YOUR STYLES HERE diff --git a/sass/theme.scss b/sass/theme.scss index 0e1d968..656b17a 100644 --- a/sass/theme.scss +++ b/sass/theme.scss @@ -12,6 +12,7 @@ Import all needed 3rd party sass files plus your own style and variables -------------------------------------- + * * * @@ -19,7 +20,8 @@ Import all needed 3rd party sass files plus your own style and variables ***** *** * - + + // Any additional imported files // 6. theme/theme.scss"; // <-- ADD YOUR STYLES HERE