Skip to content

Commit cec3be9

Browse files
simensensimensen
committed
Broke sections into pages; added global nav.
1 parent b32a36b commit cec3be9

File tree

7 files changed

+310
-216
lines changed

7 files changed

+310
-216
lines changed

‎source/_views/default.html‎

Lines changed: 65 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,79 @@
1515
<![endif]-->
1616
</head>
1717
<body>
18-
19-
<div class="jumbotron masthead {% if page.is_homepage %}huge{% endif %}">
20-
<h1><a href="{{ site.url }}/">Stack</a></h1>
21-
<p class="tagline">Composing <a href="https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/HttpKernelInterface.php">HttpKernelInterface</a> middlewares since 2013!</p>
22-
<p>
23-
<ul class="nav nav-pills" style="display: inline-block;">
24-
<li>
25-
<a href="https://github.com/stackphp"><i class="icon-github"></i> stackphp</a>
26-
</li>
27-
<li>
28-
<a href="https://twitter.com/stackphp"><i class="icon-twitter"></i> @stackphp</a>
29-
</li>
30-
<li>
31-
<a href="irc://irc.freenode.net/%23stackphp"><i class="icon-comment"></i> #stackphp</a>
32-
</li>
33-
</ul>
34-
</p>
18+
<div class="navbar navbar-fixed-top">
19+
<div class="navbar-inner">
20+
<div class="container-fluid">
21+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
22+
<span class="icon-bar"></span>
23+
<span class="icon-bar"></span>
24+
<span class="icon-bar"></span>
25+
</a>
26+
<a class="brand" href="{{ site.url }}/">Stack</a>
27+
<div class="nav-collapse collapse navbar-responsive-collapse">
28+
<ul class="nav navbar-nav" style="margin: 0 auto;">
29+
<li {% if page.nav_name == "toolbox" %} class="active" {% endif %}>
30+
<a href="{{ site.url }}/toolbox/">Toolbox</a>
31+
</li>
32+
<li {% if page.nav_name == "specs" %} class="active" {% endif %}>
33+
<a href="{{ site.url }}/specs/">Conventions and Protocols</a>
34+
</li>
35+
<li {% if page.nav_name == "middlewares" %} class="active" {% endif %}>
36+
<a href="{{ site.url }}/middlewares/">Community Middlewares</a>
37+
</li>
38+
</ul>
39+
</div>
40+
</div>
41+
</div>
3542
</div>
3643

44+
{% if page.is_homepage %}
45+
<div class="jumbotron masthead {% if page.is_homepage %}huge{% endif %}">
46+
<h1><a href="{{ site.url }}/">Stack</a></h1>
47+
<p class="tagline">Composing <a href="https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/HttpKernelInterface.php">HttpKernelInterface</a> middlewares since 2013!</p>
48+
<p>
49+
<ul class="nav nav-pills" style="display: inline-block;">
50+
<li>
51+
<a href="https://github.com/stackphp"><i class="icon-github"></i> stackphp</a>
52+
</li>
53+
<li>
54+
<a href="https://twitter.com/stackphp"><i class="icon-twitter"></i> @stackphp</a>
55+
</li>
56+
<li>
57+
<a href="irc://irc.freenode.net/%23stackphp"><i class="icon-comment"></i> #stackphp</a>
58+
</li>
59+
</ul>
60+
</p>
61+
</div>
62+
{% endif %}
63+
3764
<div class="mainContent container">
3865
<div class="row-fluid">
39-
40-
<hr>
41-
4266
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
4367
</div>
4468
</div>
4569

70+
<footer class="authors container">
71+
{% block footer %}
72+
<h1><a href="{{ site.url }}/">Stack</a></h1>
73+
<p class="tagline">Composing <a href="https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/HttpKernelInterface.php">HttpKernelInterface</a> middlewares since 2013!</p>
74+
<p>
75+
<ul class="nav nav-pills" style="display: inline-block;">
76+
<li>
77+
<a href="https://github.com/stackphp"><i class="icon-github"></i> stackphp</a>
78+
</li>
79+
<li>
80+
<a href="https://twitter.com/stackphp"><i class="icon-twitter"></i> @stackphp</a>
81+
</li>
82+
<li>
83+
<a href="irc://irc.freenode.net/%23stackphp"><i class="icon-comment"></i> #stackphp</a>
84+
</li>
85+
</ul>
86+
</p>
87+
{% endblock %}
88+
</footer>
89+
90+
4691
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
4792
<script>window.jQuery || document.write('<script src="{{ site.url }}/components/jquery/jquery.min.js"><\/script>')</script>
4893
<script src="{{ site.url }}/components/bootstrap/js/bootstrap.min.js"></script>

‎source/_views/spec.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
{% extends "default.html" %}
22
{% block content_wrapper %}
3+
<!--
4+
<ul class="breadcrumb">
5+
<li><a href="{{ site.url }}/specs/">Conventions and Protocols</a> <span class="divider">/</span></li>
6+
<li class="active">{{ page.title }}</li>
7+
</ul>
8+
-->
9+
310
<div class="spec-meta">
411
<h2>{{ page.title }} <span class="label">{{ page.status }}</span></h2>
512
</div>

‎source/css/style.css‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ h3 .label { vertical-align: middle; }
3636
line-height: 1em;
3737
}
3838

39+
footer h1 a,
3940
.jumbotron h1 a {
4041
display: inline-block;
4142
background-image: url(stack-logo.png);
@@ -47,6 +48,18 @@ h3 .label { vertical-align: middle; }
4748
text-decoration: none;
4849
}
4950

51+
/*
52+
.navbar a.brand {
53+
display: inline-block;
54+
background-image: url(stack-logo.png);
55+
background-position: left;
56+
background-repeat: no-repeat;
57+
background-size: 1em;
58+
background-position-x: .5em;
59+
text-indent: 1em;
60+
}
61+
*/
62+
5063
.jumbotron p.tagline {
5164
font-size: 1em;
5265
line-height: 1em;
@@ -59,9 +72,12 @@ h4 small {
5972
color: #888;
6073
}
6174

62-
.mainContent, footer.container {
75+
.navbar .container-fluid, .mainContent, footer.container {
6376
max-width: 900px;
6477
}
78+
.navbar .container-fluid {
79+
margin: 0 auto;
80+
}
6581

6682
footer.container {
6783
margin-top: 60px;
@@ -102,6 +118,11 @@ ul.avatars li a {
102118
text-decoration: none;
103119
}
104120

121+
.about.text,
122+
.middleware.text,
123+
.frameworks {
124+
margin: 3em 0 5em;
125+
}
105126
.frameworks-logo-list {
106127
list-style: none;
107128
text-align: center;
@@ -180,3 +201,16 @@ ol.conventions .no {
180201
margin-top: 2em;
181202
}
182203
}
204+
205+
@media (min-width: 980px) {
206+
body {
207+
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
208+
padding-bottom: 40px;
209+
}
210+
211+
/*
212+
.navbar a.brand {
213+
background-position-x: 1em;
214+
}
215+
*/
216+
}

0 commit comments

Comments
 (0)