better max width, google fonts, other small changes

This commit is contained in:
Dave Snider 2013-10-22 17:20:23 -07:00
parent 2a1ffff017
commit ae60ceba62
7 changed files with 96 additions and 882 deletions

View File

@ -25,7 +25,7 @@
"tests" "tests"
], ],
"dependencies": { "dependencies": {
"wyrm": "~0.0.4" "wyrm": "~0.0.7"
} }
} }

View File

@ -1,5 +1,5 @@
<ul class="wy-breadcrumbs"> <ul class="wy-breadcrumbs">
<li><a href="/">Docs</a> &raquo;</li> <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
<li><a href="">{{ title }}</a></li> <li><a href="">{{ title }}</a></li>
{% if display_github %} {% if display_github %}
<li class="wy-breadcrumbs-aside"> <li class="wy-breadcrumbs-aside">

View File

@ -23,6 +23,7 @@
{% endif %} {% endif %}
{# CSS #} {# CSS #}
<link href='http://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
{% for cssfile in css_files %} {% for cssfile in css_files %}
<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
@ -78,11 +79,6 @@
{%- endblock %} {%- endblock %}
{%- block extrahead %} {% endblock %} {%- block extrahead %} {% endblock %}
{# OPTIONAL USE OF TYPEKIT FONTS. SET IN THEME.CONF #}
{% if theme_typekit_id %}
<script type="text/javascript" src="//use.typekit.net/{{ theme_typekit_id }}.js"></script>
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
{% endif %}
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
</head> </head>

View File

@ -242,5 +242,8 @@
height: 100% height: 100%
overflow: hidden overflow: hidden
+media($desktop-wide)
.wy-nav-content
margin: 0

View File

@ -37,13 +37,13 @@
// @import wyrm_addons/cms/plugin_store // @import wyrm_addons/cms/plugin_store
// Elements // Elements
@import wyrm_addons/elements/modal // @import wyrm_addons/elements/modal
@import wyrm_addons/elements/stars // @import wyrm_addons/elements/stars
@import wyrm_addons/elements/tooltip @import wyrm_addons/elements/tooltip
// Redactor // Redactor
@import wyrm_addons/redactor/figures // @import wyrm_addons/redactor/figures
@import wyrm_addons/redactor/redactor // @import wyrm_addons/redactor/redactor
// Restructured text and Sphinx // Restructured text and Sphinx
@import wyrm_addons/rst/rst @import wyrm_addons/rst/rst

File diff suppressed because one or more lines are too long

View File

@ -24,4 +24,3 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}