From 3c8058e1f645e034e0647bd3c098039e20b7e23d Mon Sep 17 00:00:00 2001
From: SteveX <stevex@ultrajam.net>
Date: Mon, 10 Feb 2014 15:13:01 +0000
Subject: [PATCH 1/2] Moved link to bootstrap.css to the init function

Linking to the bootstrap css in the meta.tpl prevents css_embed from
being able to override styles. So this commit just adds the styles to
the skin init function, and provides the correct url for the fonts in
the bootstrap.css itself
---
 skins/xxBootstrap/css/bootstrap.css | 4 ++--
 skins/xxBootstrap/meta.tpl          | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/skins/xxBootstrap/css/bootstrap.css b/skins/xxBootstrap/css/bootstrap.css
index 7574ee1..83f431f 100644
--- a/skins/xxBootstrap/css/bootstrap.css
+++ b/skins/xxBootstrap/css/bootstrap.css
@@ -2681,8 +2681,8 @@ input[type="button"].btn-block {
 
 @font-face {
   font-family: 'Glyphicons Halflings';
-  src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url("{$jamroom_url}/skins/xxBootstrap/fonts/glyphicons-halflings-regular.eot");
+  src: url('{$jamroom_url}/skins/xxBootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('{$jamroom_url}/skins/xxBootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('{$jamroom_url}/skins/xxBootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('{$jamroom_url}/skins/xxBootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
 }
 
 .glyphicon {
diff --git a/skins/xxBootstrap/meta.tpl b/skins/xxBootstrap/meta.tpl
index d00b73f..d4184a3 100644
--- a/skins/xxBootstrap/meta.tpl
+++ b/skins/xxBootstrap/meta.tpl
@@ -37,14 +37,6 @@ $(document).ready(function(){ldelim}
 </script>
 {/if}
 
-    <!-- Bootstrap core CSS -->
-    <link href="{$jamroom_url}/skins/xxBootstrap/css/bootstrap.css" rel="stylesheet">
-    <!-- Bootstrap theme -->
-    <link href="{$jamroom_url}/skins/xxBootstrap/css/bootstrap-theme.css" rel="stylesheet">
-    <!-- Custom styles for this template -->
-    <link href="{$jamroom_url}/skins/xxBootstrap/css/carousel.css" rel="stylesheet">
-
-
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>

From 0ecedc60012923b7b4c0bcd4d71add022dc84110 Mon Sep 17 00:00:00 2001
From: SteveX <stevex@ultrajam.net>
Date: Mon, 10 Feb 2014 15:24:23 +0000
Subject: [PATCH 2/2] adds the change in init function

---
 skins/xxBootstrap/include.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/skins/xxBootstrap/include.php b/skins/xxBootstrap/include.php
index 7484b6e..c96d788 100644
--- a/skins/xxBootstrap/include.php
+++ b/skins/xxBootstrap/include.php
@@ -29,6 +29,8 @@ function xxBootstrap_skin_init()
     jrCore_register_module_feature('jrCore','css','xxBootstrap','admin.css');
     jrCore_register_module_feature('jrCore','css','xxBootstrap','form.css');
     jrCore_register_module_feature('jrCore','css','xxBootstrap','profile.css');
+    jrCore_register_module_feature('jrCore','css','xxBootstrap','bootstrap.css');
+    jrCore_register_module_feature('jrCore','css','xxBootstrap','bootstrap-theme.css');
 
     // Register our Javascript files with the core
     jrCore_register_module_feature('jrCore','javascript','xxBootstrap','bootstrap.min.js');