Skip to content

Commit 6723bbd

Browse files
redtideredtide
committed
v0.0.2: Fixed some css issues, correct navigation file.
1 parent 777cb5f commit 6723bbd

File tree

4 files changed

+79
-37
lines changed

4 files changed

+79
-37
lines changed

Diff for: ‎bootstrap.css

+25-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Theme: Bootstrap theme */
2-
/* Version: 0.0.1 */
2+
/* Version: 0.0.2 */
33
/* Designer: Andrea Zanellato */
44

55
body {
@@ -13,3 +13,27 @@ body {
1313
width:42px; height:42px; margin:4px 0 0 0;
1414
vertical-align:baseline;
1515
}
16+
.with-sidebar .main { margin-right:17em; }
17+
.with-sidebar .sidebar { float:right; width:16em; margin-top:5em; padding:2px; overflow:hidden; font-size:0.9em; }
18+
.with-sidebar .sidebar .search-form input { width:100%; box-sizing:border-box; }
19+
20+
.content .threepages { margin:0; padding:0; list-style:none; width:100%; }
21+
.content .threepages li { padding-bottom:1em; text-align:center; vertical-align:top; display:inline-block; width:32%; }
22+
.footer { margin-top:2em; clear:both; }
23+
.footer-left { float:left; }
24+
.footer-right { float:right; }
25+
.footer-right a {
26+
display:inline-block;
27+
box-sizing:border-box;
28+
border-radius:20px;
29+
width:25px;
30+
height:25px;
31+
margin-top:-20px;
32+
text-align:center;
33+
}
34+
.footer-banner { clear:both; }
35+
.left { float:left; margin:0 1em 0 0; }
36+
.center { display:block; margin:0 auto; }
37+
.right { float:right; margin:0 0 0 1em; }
38+
39+
.page { margin:0 auto; max-width:1000px; }

Diff for: ‎bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class YellowBootstrap
66
{
7-
const Version = "0.0.1";
7+
const Version = "0.0.2";
88
var $yellow;
99

1010
// Handle initialisation

Diff for: ‎navigation-bootstrap-tree.php

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php list($name, $pages, $level) = $yellow->getSnippetArgs() ?>
2+
<?php if(!$pages) $pages = $yellow->pages->top() ?>
3+
<?php $yellow->page->setLastModified($pages->getModified()) ?>
4+
<?php echo $level ?>
5+
<?php if(!$level): ?>
6+
<nav class="navbar navbar-default navbar-fixed-top">
7+
<div class="container-fluid">
8+
<div class="navbar-header">
9+
<div class="sitename-logo"></div>
10+
<a class="navbar-brand" href="<?php echo $yellow->page->base."/" ?>"><?php echo $yellow->page->getHtml("sitename") ?></a>
11+
</div>
12+
<ul class="nav navbar-nav navbar-right">
13+
<?php endif ?>
14+
15+
<?php foreach($pages as $page): ?>
16+
<?php $children = $page->getChildren() ?>
17+
<?php if($children->count()) { ?>
18+
<li class="dropdown dropdown-submenu">
19+
<a href="<?php echo $page->getLocation(true) ?>" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><?php echo $page->getHtml("titleNavigation") ?> <span class="caret"></span></a>
20+
<ul class="dropdown-menu" role="menu">
21+
<?php // The dropdown-submenu has been removed in Bootstrap 3 RC. ?>
22+
<?php $children = $page->getChildren() ?>
23+
<?php foreach($children as $page): ?>
24+
<li <?php echo $page->isActive() ? "class=\"active\"" : "" ?>><a href="<?php echo $page->getLocation(true) ?>"><?php echo $page->getHtml("titleNavigation") ?></a></li>
25+
<?php endforeach ?>
26+
</ul>
27+
</li>
28+
<?php } else { ?>
29+
<li <?php echo $page->isActive() ? "class=\"active\"" : "" ?>><a href="<?php echo $page->getLocation(true) ?>"><?php echo $page->getHtml("titleNavigation") ?></a></li>
30+
<?php } ?>
31+
<?php endforeach ?>
32+
33+
<?php if(!$level): ?>
34+
</ul>
35+
</div>
36+
</nav>
37+
<div class="navigation-banner"></div>
38+
<?php endif ?>

Diff for: ‎navigation-bootstrap.php

+15-35
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,18 @@
1-
<?php list($name, $pages, $level) = $yellow->getSnippetArgs() ?>
2-
<?php if(!$pages) $pages = $yellow->pages->top() ?>
1+
<?php $pages = $yellow->pages->top() ?>
32
<?php $yellow->page->setLastModified($pages->getModified()) ?>
4-
<?php echo $level ?>
5-
<?php if(!$level): ?>
6-
<nav class="navbar navbar-default navbar-fixed-top">
7-
<div class="container-fluid">
8-
<div class="navbar-header">
9-
<div class="sitename-logo"></div>
10-
<a class="navbar-brand" href="<?php echo $yellow->page->base."/" ?>"><?php echo $yellow->page->getHtml("sitename") ?></a>
3+
<div class="navigation">
4+
<nav class="navbar navbar-default navbar-fixed-top">
5+
<div class="container-fluid">
6+
<div class="navbar-header">
7+
<div class="sitename-logo"></div>
8+
<a class="navbar-brand" href="<?php echo $yellow->page->base."/" ?>"><?php echo $yellow->page->getHtml("sitename") ?></a>
9+
</div>
10+
<ul class="nav navbar-nav navbar-right">
11+
<?php foreach($pages as $page): ?>
12+
<li <?php echo $page->isActive() ? "class=\"active\"" : "" ?>><a href="<?php echo $page->getLocation(true) ?>"><?php echo $page->getHtml("titleNavigation") ?></a></li>
13+
<?php endforeach ?>
14+
</ul>
15+
</div>
16+
</nav>
1117
</div>
12-
<ul class="nav navbar-nav navbar-right">
13-
<?php endif ?>
14-
15-
<?php foreach($pages as $page): ?>
16-
<?php $children = $page->getChildren() ?>
17-
<?php if($children->count()) { ?>
18-
<li class="dropdown dropdown-submenu">
19-
<a href="<?php echo $page->getLocation(true) ?>" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><?php echo $page->getHtml("titleNavigation") ?> <span class="caret"></span></a>
20-
<ul class="dropdown-menu" role="menu">
21-
<?php // The dropdown-submenu has been removed in Bootstrap 3 RC. ?>
22-
<?php $children = $page->getChildren() ?>
23-
<?php foreach($children as $page): ?>
24-
<li <?php echo $page->isActive() ? "class=\"active\"" : "" ?>><a href="<?php echo $page->getLocation(true) ?>"><?php echo $page->getHtml("titleNavigation") ?></a></li>
25-
<?php endforeach ?>
26-
</ul>
27-
</li>
28-
<?php } else { ?>
29-
<li <?php echo $page->isActive() ? "class=\"active\"" : "" ?>><a href="<?php echo $page->getLocation(true) ?>"><?php echo $page->getHtml("titleNavigation") ?></a></li>
30-
<?php } ?>
31-
<?php endforeach ?>
32-
33-
<?php if(!$level): ?>
34-
</ul>
35-
</div>
36-
</nav>
3718
<div class="navigation-banner"></div>
38-
<?php endif ?>

0 commit comments

Comments
 (0)