Skip to content

Commit

Permalink
more mobile fixes. Wait with releasing for a bit more.
Browse files Browse the repository at this point in the history
  • Loading branch information
polyester committed Jul 8, 2017
1 parent b5ef07e commit b1bb02a
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 7 deletions.
19 changes: 13 additions & 6 deletions src/sphinxtheme/plone/plone_basic/layout.html
Expand Up @@ -22,12 +22,12 @@
<div class="breadcrumbs-container" id="breadcrumbs-{{name}}">
<div class="container">
<div class="row">
<div class="col-xs-9">
<div class="col-sm-9 hidden-xs">
<div role="navigation" aria-label="breadcrumbs navigation">
<ul class="breadcrumb">
{#<li><a href="https://plone.org">Plone</a></li>#}
<li class="master">
{% if theme_always_show_version_switcher or (theme_version_switcher and version|length > 1) %}
<!-- {% if theme_always_show_version_switcher or (theme_version_switcher and version|length > 1) %}
<span class="version_switcher">
<label for="versionpicker-{{name}}">Version</label>
<select id="versionpicker-{{name}}">
Expand All @@ -36,7 +36,7 @@
{% endfor %}
</select>
</span>
{% endif %}
{% endif %} -->
{% if theme_always_show_language_switcher or (theme_language_switcher and theme_doc_languages|length > 1) %}
<span class="lang_switcher">
<label for="languagepicker-{{name}}">Language</label>
Expand Down Expand Up @@ -68,19 +68,22 @@
</div>
</div>
{% if next or prev %}
<div class="rst-buttons col-xs-3" role="navigation" >
<div class="rst-buttons col-sm-3 col-xs-12" role="navigation" >
<div role="navigation" aria-label="breadcrumbs navigation">

<ul class="breadcrumb">
{% if prev %}
<li><a href="{{ prev.link|e }}" title="{{ prev.title|striptags|e }}"><span class="fa fa-arrow-circle-left"></span> Previous</a></li>
<li class="breadcrumb-prev"><a href="{{ prev.link|e }}" title="{{ prev.title|striptags|e }}">
<i class="fa fa-arrow-circle-left" aria-hidden="true" title="Previous"></i> <span class="sr-only">Previous</span></a></li>
{% endif %}
{% if next %}
<li><a href="{{ next.link|e }}" title="{{ next.title|striptags|e }}">Next <span class="fa fa-arrow-circle-right"></span></a></li>
<li class="breadcrumb-next"><a href="{{ next.link|e }}" title="{{ next.title|striptags|e }}"><span class="sr-only">Next </span><i class="fa fa-arrow-circle-right" aria-hidden="true" title="Next"></i></a></li>
{% endif %}
</ul>
</div>
</div>


{% endif %}
</div>
</div>
Expand Down Expand Up @@ -206,11 +209,15 @@
<a href="{{ theme_contributing_link|e }}" ><i class="fa fa-pencil-square-o"></i>Contribute</a>
</aside>
{% endif %}

{% include "version_buttondropdown.html" %}

</div>
<div class="col-xs-12 col-sm-8 col-lg-9 content-column">
<div class="row visible-xs">
<div class="col-xs-12" >
{# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
{% include "version_buttondropdown.html" %}
<nav class="nav-top" role="navigation" aria-label="top navigation">
<i data-toggle="nav-top" class="fa fa-bars"></i>
<a href="{{ pathto(url_root+'sitemap') }}">Table Of Content</a>
Expand Down
14 changes: 13 additions & 1 deletion src/sphinxtheme/plone/plone_basic/static/css/plone_basic.css
Expand Up @@ -203,7 +203,7 @@ div.breadcrumbs-container div.container {
div.breadcrumbs-container li,
div.breadcrumbs-container a,
div.breadcrumbs-container .btn {
font-size: 12px;
font-size: 16px;
}

div.breadcrumbs-container ul,
Expand All @@ -217,6 +217,17 @@ div.breadcrumbs-container ul.breadcrumb {
div.breadcrumbs-container div.rst-buttons ul {
float: right;
}
div.breadcrumbs-container div.rst-buttons.col-sm-3.col-xs-12 ul {
float: none;
}

div.breadcrumbs-container div.rst-buttons.col-sm-3.col-xs-12 ul i.fa {
font-size: 2em;
}

div.breadcrumbs-container div.rst-buttons.col-sm-3.col-xs-12 ul li.breadcrumb-next {
float: right;
}

div.breadcrumbs-container div.rst-buttons a {
white-space: nowrap;
Expand Down Expand Up @@ -550,6 +561,7 @@ a.internal code {

.call_to_action {
margin-top: 2em;
margin-bottom: 2em;
font-size: 16pt;
padding: 0;
border-radius: 6px;
Expand Down
16 changes: 16 additions & 0 deletions src/sphinxtheme/plone/plone_basic/version_buttondropdown.html
@@ -0,0 +1,16 @@
{% if theme_always_show_version_switcher or (theme_version_switcher and version|length > 1) %}


<div class="dropdown">
<button class="btn btn-info btn-lg dropdown-toggle" type="button" id="dropdownversion" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
Version: {{ theme_selected_version }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownversion">

{% for vers in version %}
<li><a href="https://docs.plone.org/{{vers}}"> Version: {{vers}}</a></li>
{% endfor %}
</ul>
</div>
{% endif %}

0 comments on commit b1bb02a

Please sign in to comment.