Skip to content

Moved link to bootstrap.css to the init function #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SteveX wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Moved link to bootstrap.css to the init function #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c8058e
Moved link to bootstrap.css to the init function
SteveX Feb 10, 2014
0ecedc6
adds the change in init function
SteveX Feb 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions skins/xxBootstrap/css/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link
Owner

@ussher ussher Feb 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wont this make it necessary to update any bootstrap.css files that come out. not just copy+paste?

Copy link
Contributor Author

@SteveX SteveX Feb 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, if you use the icons and are unable to override rules.

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 {
Expand Down
2 changes: 2 additions & 0 deletions skins/xxBootstrap/include.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Copy link
Owner

@ussher ussher Feb 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cant check it out now but im pretty sure there was a reason these were put in the header instead of here. Putting them in the location they are at in the header ensures that they are the last called so have higher priority. Will need to check it out to confirm.

Copy link
Contributor Author

@SteveX SteveX Feb 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reset (which is normalize in BS3) needs to be called first, with everything else after it. Resetting after all module css will not work properly.
Jamroom css_href and css_embed should be able to override all previous styles - this is possible with the current hard coded links to the stylesheets - you need to add your css rules to the javascript footer function by closing the script tag and then reopening it after adding the style tag containing your rules.

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');
Expand Down
8 changes: 0 additions & 8 deletions skins/xxBootstrap/meta.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]>
Expand Down