Browse Source

docs : move footer, html-foot and html-head into default layout; CSS revisions

pull/96/head
David DeSandro 14 years ago
parent
commit
98ae9da2fb
  1. 4
      _includes/footer.html
  2. 3
      _includes/html-foot.html
  3. 14
      _includes/html-head.html
  4. 33
      _layouts/default.html
  5. 52
      css/style.css

4
_includes/footer.html

@ -1,4 +0,0 @@
<footer>
{{ site.name }} by <a href="http://desandro.com">David DeSandro</a> / <a href="http://metafizzy.co">Metafizzy</a>
</footer>

3
_includes/html-foot.html

@ -1,3 +0,0 @@
</body>
</html>

14
_includes/html-head.html

@ -1,14 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>{{ page.title }} &middot; {{ site.name }} {% if page.category == 'docs' %}Docs{% elsif page.category == 'demos' %}Demo{% endif %}</title>
<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="stylesheet" href="../css/style.css" type="text/css" media="screen" />
<!-- scripts at bottom of page -->
</head>
<body class="{% if page.category == 'docs' %}doc{% elsif page.category == 'demos' %}demo{% endif %} {{ page.body_class }}">

33
_layouts/default.html

@ -1,7 +1,21 @@
{% include html-head.html %} <!doctype html>
<html lang="en">
<head>
{% if page.category != 'homepage' %}{% assign root_path = '../' %}{% assign link_path = '..' %}{% else %}{% assign link_path = '.' %}{% endif %}
<meta charset="utf-8" />
<title>{{ page.title }}{% if page.category != 'homepage' %} &middot; {{ site.name }} {% if page.category == 'docs' %}Docs{% elsif page.category == 'demos' %}Demo{% endif %}{% endif %}</title>
<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="stylesheet" href="{{ root_path }}css/style.css" />
<!-- scripts at bottom of page -->
</head>
<body class="{{ page.category }} {{ page.body_class }}">
<nav id="site-nav"> <nav id="site-nav">
<h1><a href="../index.html">{{ site.name }}</a></h1> <h1><a href="{{ root_path }}index.html">{{ site.name }}</a></h1>
<h2>Docs</h2> <h2>Docs</h2>
@ -16,7 +30,7 @@
</ul> </ul>
</li> </li>
{% else %} {% else %}
<li><a href="..{{ doc.url }}">{{ doc.title }}</a> <li><a href="{{ link_path }}{{ doc.url }}">{{ doc.title }}</a>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
@ -28,7 +42,7 @@
{% if page.title == demo.title and page.category == 'demos' %} {% if page.title == demo.title and page.category == 'demos' %}
<li class="current"><a href="#content">{{ demo.title }}</a></li> <li class="current"><a href="#content">{{ demo.title }}</a></li>
{% else %} {% else %}
<li><a href="..{{ demo.url }}">{{ demo.title }}</a> <li><a href="{{ link_path }}{{ demo.url }}">{{ demo.title }}</a>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
@ -36,13 +50,18 @@
</nav> <!-- #site-nav --> </nav> <!-- #site-nav -->
<section id="content"> <section id="content">
{% if page.category != 'homepage' %}
<h1>{{ page.title }}</h1> <h1>{{ page.title }}</h1>
{% endif %}
{{ content }} {{ content }}
{% include footer.html %} <footer>
{{ site.name }} by <a href="http://desandro.com">David DeSandro</a> / <a href="http://metafizzy.co">Metafizzy</a>
</footer>
</section> <!-- #content --> </section> <!-- #content -->
{% include html-foot.html %}
</body>
</html>

52
css/style.css

@ -395,30 +395,23 @@ body {
width: 100%; width: 100%;
} }
#content {
margin-left: 210px;
}
/**** Docs ****/ /**** Docs ****/
.doc #content { .docs #content {
max-width: 640px; max-width: 640px;
} }
.doc a:hover { .docs #content a:hover {
border-bottom: 1px dotted; border-bottom: 1px dotted;
} }
#content {
margin-left: 220px;
}
/**** Doc page nav ****/ /**** Doc page nav ****/
#site-nav h1,
#demo-nav {
font-size: 24px;
margin-bottom: 0.5em;
font-weight: bold;
font-family: 'Helvetica Neue', Arial, sans-serif;
}
#site-nav { #site-nav {
width: 200px; width: 200px;
@ -430,7 +423,11 @@ body {
} }
#site-nav h1 { #site-nav h1 {
font-size: 24px;
margin-bottom: 0.5em;
margin-top: 0; margin-top: 0;
font-weight: bold;
font-family: 'Helvetica Neue', Arial, sans-serif;
} }
#site-nav h2 { #site-nav h2 {
@ -440,15 +437,8 @@ body {
border-top: none; border-top: none;
} }
#site-nav h1 a, #site-nav h1 a { color: #4FB; }
#demo-nav a { color: #4FB; } #site-nav h1 a:hover { color: #4BF; }
#site-nav h1 a:hover,
#demo-nav a:hover { color: #4BF; }
#demo-nav {
padding-bottom: 0.5em;
border-bottom: 1px solid #333;
}
#site-nav ul { #site-nav ul {
list-style: none; list-style: none;
@ -479,18 +469,18 @@ body {
/**** Doc content ****/ /**** Doc content ****/
.doc h2 { .docs h2 {
border-top: 1px solid #333; border-top: 1px solid #333;
padding-top: 0.8em; padding-top: 0.8em;
} }
.doc h2:target { .docs h2:target {
padding: 10px; padding: 10px;
background: white; background: white;
color: #222; color: #222;
} }
.doc h3 { .docs h3 {
color: #FEC; color: #FEC;
background: hsla( 0, 0%, 75%, 0.05 ); background: hsla( 0, 0%, 75%, 0.05 );
padding: 2px 0.5em; padding: 2px 0.5em;
@ -498,7 +488,7 @@ body {
font-size: 1.15em; font-size: 1.15em;
} }
.doc h4 { .docs h4 {
margin-bottom: 0.5em; margin-bottom: 0.5em;
font-size: 14px; font-size: 14px;
} }
@ -559,27 +549,27 @@ h3#options {
/* Tagline */ /* Tagline */
.doc .tagline { .docs .tagline {
font-size: 22px; font-size: 22px;
font-weight: 300; font-weight: 300;
} }
/* as-is from MIT */ /* as-is from MIT */
.doc .as-is { .docs .as-is {
font-size: 95%; font-size: 95%;
} }
/* Commercial license blurb */ /* Commercial license blurb */
.doc #commercial { .docs #commercial {
background: white; background: white;
padding: 10px; padding: 10px;
font-size: 14px; font-size: 14px;
color: #1F1F1D; color: #1F1F1D;
} }
.doc #commercial a { font-weight: bold;} .docs #commercial a { font-weight: bold;}
/**** Pygments ****/ /**** Pygments ****/

Loading…
Cancel
Save