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/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'); 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} {/if} - - - - - - - -