commit 0a262e61e734ed7e3bde9621c8bf391dcc649f9c
parent 40098b7b2f426e231b94fcb74054a37a682ec5ce
Author: Casey W. Stark <casey@thestarkeffect.com>
Date: Sat, 22 Jan 2011 16:53:23 -0800
Fixed all the inconsistencies (hopefully) between mathjax.org and mathjax-site docs CSS. Also deleted the logo and page.html template from docs, as we don't need them here anymore
Diffstat:
4 files changed, 191 insertions(+), 94 deletions(-)
diff --git a/docs/source/_static/logo.gif b/docs/source/_static/logo.gif
Binary files differ.
diff --git a/docs/source/mjtheme/layout.html b/docs/source/mjtheme/layout.html
@@ -157,42 +157,70 @@
</span>
</h1>
<div id="site-description">Beautiful math in all browsers</div>
- <div class="clear"></div>
- <div id="access" role="navigation">
- <div class="menu-header">
- <ul id="menu-navigation" class="menu">
- <li id="menu-item-868" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/news/">News</a></li>
- <li id="menu-item-846" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/">Demos</a>
- <ul class="sub-menu">
- <li id="menu-item-859" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/tex-samples/">TeX Samples</a></li>
- <li id="menu-item-858" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/mathml-samples/">MathML Samples</a></li>
- <li id="menu-item-1078" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/scaling-math/">Scaling Math</a></li>
- <li id="menu-item-1097" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/copy-and-paste/">Copy and Paste Math</a></li>
- </ul>
- </li>
- <li id="menu-item-848" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/resources/">Resources</a>
- <ul class="sub-menu">
- <li id="menu-item-1262" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/download/">Download</a></li>
- <li id="menu-item-1151" class="menu-item menu-item-type-custom"><a href="/resources/docs/">Documentation</a></li>
- <li id="menu-item-1257" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/resources/articles-and-presentations/">Articles, Presentations, and Tutorials</a></li>
- <li id="menu-item-860" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/resources/browser-compatibility/">Browser Compatibility</a></li>
- <li id="menu-item-856" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/resources/faqs/">FAQs</a></li>
- </ul>
- </li>
- <li id="menu-item-847" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/community/">Community</a>
- <ul class="sub-menu">
- <li id="menu-item-1347" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/community/mathjax-badge/">MathJax Badge</a></li>
- <li id="menu-item-1145" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/community/mathjax-in-use/">MathJax in Use</a></li>
- <li id="menu-item-1577" class="menu-item menu-item-type-custom"><a href="http://groups.google.com/group/mathjax-users/">MathJax User Group</a></li>
- </ul>
- </li>
- <li id="menu-item-853" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/sponsors/">Sponsors</a></li>
- <li id="menu-item-854" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/contact/">Contact</a></li>
- <li id="menu-item-1167" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/download/">Download</a></li>
- </ul>
+ <div id="header-box-right">
+ <ul class="icon-list">
+ <li>
+ <a href="http://www.twitter.com/mathjax">
+ <img src="http://www.mathjax.org/wp-content/themes/mathjax/images/social-icons/16px/twitter.png" alt="Twitter" title="Twitter">
+ </a>
+ </li>
+ <li>
+ <a href="http://www.facebook.com/pages/MathJax/351834882701">
+ <img src="http://www.mathjax.org/wp-content/themes/mathjax/images/social-icons/16px/facebook.png" alt="Facebook Page" title="Facebook Page">
+ </a>
+ </li>
+ <li>
+ <a href="http://www.mathjax.org/feed/">
+ <img src="http://www.mathjax.org/wp-content/themes/mathjax/images/social-icons/16px/rss.png" alt="RSS Feed" title="RSS Feed">
+ </a>
+ </li>
+ </ul>
+ <div id="search" class="widget-container widget_search">
+ <form action="/" method="get" accept-charset="utf-8">
+ <fieldset>
+ <label class="screen-reader-text" for="s">Search for:</label>
+ <input type="text" name="s" id="s" value="">
+ <input class="search-button" type="image" alt="Search" src="http://www.mathjax.org/wp-content/themes/mathjax/images/search.png">
+ </fieldset>
+ </form>
</div>
</div>
- <div class="clear"></div>
+ </div>
+ <div class="clear"></div>
+
+ <div id="access" role="navigation">
+ <div class="menu-header">
+ <ul id="menu-navigation" class="menu">
+ <li id="menu-item-868" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/news/">News</a></li>
+ <li id="menu-item-846" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/">Demos</a>
+ <ul class="sub-menu">
+ <li id="menu-item-859" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/tex-samples/">TeX Samples</a></li>
+ <li id="menu-item-858" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/mathml-samples/">MathML Samples</a></li>
+ <li id="menu-item-1078" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/scaling-math/">Scaling Math</a></li>
+ <li id="menu-item-1097" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/demos/copy-and-paste/">Copy and Paste Math</a></li>
+ </ul>
+ </li>
+ <li id="menu-item-848" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/resources/">Resources</a>
+ <ul class="sub-menu">
+ <li id="menu-item-1262" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/download/">Download</a></li>
+ <li id="menu-item-1151" class="menu-item menu-item-type-custom"><a href="/resources/docs/">Documentation</a></li>
+ <li id="menu-item-1257" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/resources/articles-and-presentations/">Articles, Presentations, and Tutorials</a></li>
+ <li id="menu-item-860" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/resources/browser-compatibility/">Browser Compatibility</a></li>
+ <li id="menu-item-856" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/resources/faqs/">FAQs</a></li>
+ </ul>
+ </li>
+ <li id="menu-item-847" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/community/">Community</a>
+ <ul class="sub-menu">
+ <li id="menu-item-1347" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/community/mathjax-badge/">MathJax Badge</a></li>
+ <li id="menu-item-1145" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/community/mathjax-in-use/">MathJax in Use</a></li>
+ <li id="menu-item-1577" class="menu-item menu-item-type-custom"><a href="http://groups.google.com/group/mathjax-users/">MathJax User Group</a></li>
+ </ul>
+ </li>
+ <li id="menu-item-853" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/sponsors/">Sponsors</a></li>
+ <li id="menu-item-854" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/contact/">Contact</a></li>
+ <li id="menu-item-1167" class="menu-item menu-item-type-post_type"><a href="http://www.mathjax.org/download/">Download</a></li>
+ </ul>
+ </div>
</div>
</div>
{% endif %}
diff --git a/docs/source/mjtheme/page.html b/docs/source/mjtheme/page.html
@@ -1,14 +0,0 @@
-{#
- basic/page.html
- ~~~~~~~~~~~~~~~
-
- Master template for simple pages.
-
- :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
- :license: BSD, see LICENSE for details.
-#}
-{% extends "layout.html" %}
-
-{% block body %}
- {{ body }}
-{% endblock %}
diff --git a/docs/source/mjtheme/static/mj.css_t b/docs/source/mjtheme/static/mj.css_t
@@ -19,61 +19,43 @@ body {
width: 980px;
}
-#header {
- background: #ffffff;
- padding: 20px;
- height: 95px;
-}
-#branding {
-}
-#site-title {
- float: left;
- margin: 0;
- width: 300px;
-}
-#branding img {
+/* deal with sphinx css not reseting anything */
+
+.widget_search fieldset {
border: 0;
+ margin: 0;
+ padding: 0;
}
-#site-description {
- margin: 36px 0 0;
- font-size: 18px; line-height: 18px;
- float: left;
- width: auto;
- font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
- font-style: normal;
- font-weight: bold;
- letter-spacing: -1px;
- color: #a5a5a5;
+.icon-list {
+ margin: 0; padding: 0;
}
-#access {
- margin: 10px 0;
+/* from wp twentyten */
+
+#branding img {
+ display: block;
}
-#access ul { padding: 0; }
-#access li { min-width: 20px; }
-#access a { color: #dddddd; font-weight: bold; }
-#access a:hover, #access ul li.current_page_item > a, #access ul li.current-menu-ancestor > a,
-#access ul li.current-menu-item > a, #access ul li.current-menu-parent > a {
- color: #ffffff;
- font-weight: bold;
+
+.widget_search label {
+ display: none;
}
-#access li:hover > a, #access ul ul :hover > a {
- color:#fff;
- background:#444;
+.screen-reader-text {
+ left: -9000px;
+ position: absolute;
}
-#access ul ul a {
- background:#444;
+.widget_search input {
+ color: #666;
+ font-size: 12px;
+ line-height: 18px;
}
-#menu-item-1167 {
- float: right !important;
- background: #E18B16 !important;
-}
-#menu-item-1167:hover > a {
- background: #ef9d32 !important;
-}
-#menu-item-1167 a, #menu-item-1167 a:visited {
- color: #ffffff !important;
+.widget_search input[type="text"] {
+ -webkit-box-shadow: rgba(0, 0, 0, 0.1) 1px 1px 1px inset;
+ -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1) inset;
+ box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1) inset;
+ background: #F9F9F9;
+ border: 1px solid #CCC;
+ padding: 2px;
}
#access {
@@ -156,6 +138,107 @@ div.menu li {
color:#fff;
}
+/* HEADER */
+
+#header {
+ background: #ffffff;
+ padding: 20px;
+ height: 95px;
+}
+#branding {
+}
+#site-title {
+ float: left;
+ margin: 0;
+ width: 300px;
+}
+#branding img {
+ border: 0;
+}
+#site-description {
+ margin: 36px 0 0;
+ font-size: 18px; line-height: 18px;
+ float: left;
+ width: auto;
+ font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
+ font-style: normal;
+ font-weight: bold;
+ letter-spacing: -1px;
+ color: #a5a5a5;
+}
+
+#header-box-right {
+ margin: 10px 0 0;
+ float: right;
+}
+.icon-list {
+ display: block;
+ margin: 0 0 0 93px;
+ list-style: none;
+}
+.icon-list li {
+ float: left;
+ display: inline;
+ margin: 0 8px 5px 0;
+}
+.icon-list img { border: 0; }
+.widget_search {
+ clear: both;
+ margin: 0;
+}
+.widget_search #s {
+ width: 150px;
+ height: 16px;
+ float: left;
+}
+.widget_search input[type="text"] {
+ border: 2px solid #b5bfb8;
+ background-color: #eaeaea;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+.widget_search input[type="text"]:focus {
+ outline-width: 0;
+ border-color: #169538;
+}
+.search-button {
+ float: left;
+ display: inline;
+ margin: 2px 0 0 5px;
+}
+
+/* NAVIGATION */
+
+#access {
+ margin: 20px 0px 0px;
+}
+#access ul { padding: 0; }
+#access li { min-width: 20px; }
+#access a { color: #dddddd; font-weight: bold; }
+#access a:hover, #access ul li.current_page_item > a, #access ul li.current-menu-ancestor > a,
+#access ul li.current-menu-item > a, #access ul li.current-menu-parent > a {
+ color: #ffffff;
+ font-weight: bold;
+}
+#access li:hover > a, #access ul ul :hover > a {
+ color:#fff;
+ background:#444;
+}
+#access ul ul a {
+ background:#444;
+}
+
+#menu-item-1167 {
+ float: right !important;
+ background: #E18B16 !important;
+}
+#menu-item-1167:hover > a {
+ background: #ef9d32 !important;
+}
+#menu-item-1167 a, #menu-item-1167 a:visited {
+ color: #ffffff !important;
+}
+
/* modify layout to match mathjax site */
.related, .document {
