Skip to content

Commit

Permalink
fixes #21, #22 removes template.css and updates bootstrap to latest.
Browse files Browse the repository at this point in the history
adds bootstrap theme
  • Loading branch information
Troy T. Hall committed Dec 2, 2014
1 parent 702eef8 commit 12b4e42
Show file tree
Hide file tree
Showing 11 changed files with 5,962 additions and 6,365 deletions.
578 changes: 303 additions & 275 deletions joostrapUniverse-v3-4a/css/bootstrap-theme.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion joostrapUniverse-v3-4a/css/bootstrap-theme.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions joostrapUniverse-v3-4a/css/bootstrap-theme.min.css

Large diffs are not rendered by default.

6,719 changes: 3,424 additions & 3,295 deletions joostrapUniverse-v3-4a/css/bootstrap.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion joostrapUniverse-v3-4a/css/bootstrap.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions joostrapUniverse-v3-4a/css/bootstrap.min.css

Large diffs are not rendered by default.

453 changes: 226 additions & 227 deletions joostrapUniverse-v3-4a/fonts/glyphicons-halflings-regular.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions joostrapUniverse-v3-4a/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
<?php if ($loadBootstrap == 1) : ?>
<?php if (!$dark) : ?>
<link rel="stylesheet" href="<?php echo getDebugAssetUrl($tplUrl . '/css/bootstrap.min.css'); ?>">
<link rel="stylesheet" href="<?php echo getDebugAssetUrl($tplUrl . '/css/bootstrap-theme.min.css'); ?>">
<?php elseif ($dark == "alter") : ?>
<link rel="stylesheet" href="<?php echo getDebugAssetUrl($tplUrl . '/css/darkly.bootstrap.min.css'); ?>">
<?php elseif ($dark) : ?>
<link rel="stylesheet" href="<?php echo getDebugAssetUrl($tplUrl . '/css/' . $dark . '.bootstrap.min.css'); ?> ">
<?php endif; ?>
<?php elseif ($loadBootstrap == 2 && !$dark ) : ?>
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css">
<?php endif; ?>
<?php if ($loadBootstrap == 2 && $dark == "alter") : ?>
<link href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.0/darkly/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -71,7 +73,7 @@
<?php if ($loadBootstrap == 1) : ?>
<script src="<?php echo getDebugAssetUrl($tplUrl . '/js/bootstrap.min.js'); ?>" type="text/javascript"></script>
<?php elseif ($loadBootstrap == 2) : ?>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
<?php endif; ?>
<!--[if lt IE 9]>
<script src="<?php echo $tplUrl; ?>/js/html5shiv.js" type="text/javascript"></script>
Expand Down

0 comments on commit 12b4e42

Please sign in to comment.