Skip to content
GitLab
Commit 6ad61bb9 authored by Kristina Hoeppner's avatar Kristina Hoeppner
Browse files

rename "manual-theme" to "mahara" 

and make relevant changes in conf.py
and Makefile
parent 3ddec315
Hide whitespace changes
Inline Side-by-side
Makefile
View file @ 6ad61bb9
......@@ -58,11 +58,11 @@ preview:
html:
$(foreach TRANSLATION,$(TRANSLATIONS), \
sed -i 's/LANG/$(TRANSLATION)/g' source/manual-theme/links.html; \
sed -i 's/LANG/$(TRANSLATION)/g' source/mahara/links.html; \
git checkout source/images ; \
cp -ra localeimages/$(TRANSLATION)/* source/images/ ; \
$(SPHINXBUILD) -a -D language=$(TRANSLATION) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(TRANSLATION)/$(MAHARA); \
git checkout source/manual-theme/links.html \
git checkout source/mahara/links.html \
;)
git checkout source/images
@echo
......
source/conf.py
View file @ 6ad61bb9
......@@ -94,7 +94,7 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'manual-theme'
html_theme = 'mahara'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
......
source/mahara/layout.html
View file @ 6ad61bb9
{% extends "basic/layout.html" %}
{% extends "basicstrap/layout.html" %}
{%- block extrahead %}
<!--[if lte IE 6]>
......@@ -28,39 +28,36 @@
{% endblock %}
{% block header %}
<div class="header-small">
{%- if theme_logo %}
{% set img, ext = theme_logo.split('.', -1) %}
<div class="logo-small">
<a href="{{ pathto(master_doc) }}">
<img class="logo" src="{{ pathto('_static/%s-small.%s' % (img, ext), 1)}}" alt="Logo"/>
</a>
</div>
{%- endif %}
</div>
{% endblock %}
{%- macro relbar() %}
<div class="related">
<h3>{{ _('Navigation') }}</h3>
<ul>
{%- for rellink in rellinks %}
<li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
<a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
{{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
{%- if not loop.first %}{{ reldelim2 }}{% endif %}
</li>
<div id="navbar-related" class=" related navbar {% if (theme_relbar_inverse|tobool) %}navbar-inverse{% else %}navbar-default{% endif %}" role="navigation" aria-label="related navigation">
<div class="navbar-inner">
<ul class="nav navbar-nav {% if theme_noresponsiverelbar|tobool %}text-center{% endif %}">
<li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a></li>
</ul>
<ul class="nav navbar-nav {% if not theme_noresponsiverelbar|tobool %}pull-right hidden-{{ class_device_xs }} hidden-{{ class_device_sm }}{% else %}text-center{% endif %}">
{% if not (theme_nosidebar|tobool) %}
{%- for rellink in rellinks|reverse %}
<li><a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}" {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a></li>
{%- endfor %}
{%- block rootrellink %}
<li><a href="{{ pathto(master_doc) }}">{{ docstitle|e }}</a>{{ reldelim1 }}</li>
{%- endblock %}
{%- for parent in parents %}
<li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
<li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a></li>
{%- endfor %}
<li><a href="#">top</a></li>
{%- block relbaritems %} {% endblock %}
{% else %}
{%- if prev %}
<li><a href="{{ prev.link|e }}"><i class="icon icon-double-angle-left"></i>&nbsp;{{ prev.title }}</a></li>
{%- endif %}
<li><a class="uplink" href="{{ pathto(master_doc) }}">{{ _('Contents') }}</a></li>
{%- if next %}
<li><a href="{{ next.link|e }}">{{ next.title }}&nbsp;<i class="icon icon-double-angle-right"></i></a></li>
{%- endif %}
<li><a href="#">top</a></li>
{%- endif %}
</ul>
</div>
</div>
{%- endmacro %}
......
source/mahara/searchbox.html
View file @ 6ad61bb9
......@@ -15,7 +15,9 @@
<form class="search" action="{{ pathto('search') }}" method="get">
<label for="search">Enter search terms</label>
<input id="search" type="text" name="q" size="18" />
<input type="submit" value="{{ _('Go') }}" />
<button type="submit" value="{{ _('Go') }}">
<span class="fa fa-search"></span>
</button>
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
......
source/mahara/static/epub.css deleted 100644 → 0
View file @ 3ddec315
/*
* default.css_t
* ~~~~~~~~~~~~~
*
* Sphinx stylesheet -- default theme.
*
* :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@import url("basic.css");
/* -- page layout ----------------------------------------------------------- */
body {
font-family: {{ theme_bodyfont }};
font-size: 100%;
background-color: {{ theme_footerbgcolor }};
color: #000;
margin: 0;
padding: 0;
}
div.document {
background-color: {{ theme_sidebarbgcolor }};
}
div.documentwrapper {
float: left;
width: 100%;
}
div.bodywrapper {
margin: 0 0 0 260px;
}
div.body {
background-color: {{ theme_bgcolor }};
color: {{ theme_textcolor }};
padding: 0 20px 30px 20px;
}
{%- if theme_rightsidebar|tobool %}
div.bodywrapper {
margin: 0 260px 0 0;
}
{%- endif %}
div.footer {
color: {{ theme_footertextcolor }};
width: 100%;
padding: 9px 0 9px 0;
text-align: center;
font-size: 75%;
}
div.footer a {
color: {{ theme_footertextcolor }};
text-decoration: underline;
}
div.related {
background-color: {{ theme_relbarbgcolor }};
line-height: 30px;
color: {{ theme_relbartextcolor }};
}
div.related a {
color: {{ theme_relbarlinkcolor }};
}
div.sphinxsidebar {
{%- if theme_stickysidebar|tobool %}
top: 30px;
bottom: 0;
margin: 0;
position: fixed;
overflow: auto;
height: auto;
{%- endif %}
{%- if theme_rightsidebar|tobool %}
float: right;
{%- if theme_stickysidebar|tobool %}
right: 0;
{%- endif %}
{%- endif %}
}
{%- if theme_stickysidebar|tobool %}
/* this is nice, but it it leads to hidden headings when jumping
to an anchor */
/*
div.related {
position: fixed;
}
div.documentwrapper {
margin-top: 30px;
}
*/
{%- endif %}
div.sphinxsidebar h3 {
font-family: {{ theme_headfont }};
color: {{ theme_sidebartextcolor }};
font-size: 1.4em;
font-weight: normal;
margin: 0;
padding: 0;
}
div.sphinxsidebar h3 a {
color: {{ theme_sidebartextcolor }};
}
div.sphinxsidebar h4 {
font-family: {{ theme_headfont }};
color: {{ theme_sidebartextcolor }};
font-size: 1.3em;
font-weight: normal;
margin: 5px 0 0 0;
padding: 0;
}
div.sphinxsidebar p {
color: {{ theme_sidebartextcolor }};
}
div.sphinxsidebar p.topless {
margin: 5px 10px 10px 10px;
}
div.sphinxsidebar ul {
margin: 10px;
padding: 0;
color: {{ theme_sidebartextcolor }};
}
div.sphinxsidebar a {
color: {{ theme_sidebarlinkcolor }};
}
div.sphinxsidebar input {
border: 1px solid {{ theme_sidebarlinkcolor }};
font-family: sans-serif;
font-size: 1em;
}
{% if theme_collapsiblesidebar|tobool %}
/* for collapsible sidebar */
div#sidebarbutton {
background-color: {{ theme_sidebarbtncolor }};
}
{% endif %}
/* -- hyperlink styles ------------------------------------------------------ */
a {
color: {{ theme_linkcolor }};
text-decoration: none;
}
a:visited {
color: {{ theme_visitedlinkcolor }};
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
{% if theme_externalrefs|tobool %}
a.external {
text-decoration: none;
border-bottom: 1px dashed {{ theme_linkcolor }};
}
a.external:hover {
text-decoration: none;
border-bottom: none;
}
a.external:visited {
text-decoration: none;
border-bottom: 1px dashed {{ theme_visitedlinkcolor }};
}
{% endif %}
/* -- body styles ----------------------------------------------------------- */
div.body h1,
div.body h2,
div.body h3,
div.body h4,
div.body h5,
div.body h6 {
font-family: {{ theme_headfont }};
background-color: {{ theme_headbgcolor }};
font-weight: normal;
color: {{ theme_headtextcolor }};
border-bottom: 1px solid #ccc;
margin: 20px -20px 10px -20px;
padding: 3px 0 3px 10px;
}
div.body h1 { margin-top: 0; font-size: 200%; }
div.body h2 { font-size: 160%; }
div.body h3 { font-size: 140%; }
div.body h4 { font-size: 120%; }
div.body h5 { font-size: 110%; }
div.body h6 { font-size: 100%; }
a.headerlink {
color: {{ theme_headlinkcolor }};
font-size: 0.8em;
padding: 0 4px 0 4px;
text-decoration: none;
}
a.headerlink:hover {
background-color: {{ theme_headlinkcolor }};
color: white;
}
div.body p, div.body dd, div.body li {
text-align: justify;
line-height: 130%;
}
div.admonition p.admonition-title + p {
display: inline;
}
div.admonition p {
margin-bottom: 5px;
}
div.admonition pre {
margin-bottom: 5px;
}
div.admonition ul, div.admonition ol {
margin-bottom: 5px;
}
div.note {
background-color: #ddf1fa;
border: 0;
}
div.seealso {
background-color: #f8f1d0;
border: 0;
}
div.admonition-todo {
background: #e5f2d5;
border: 0;
}
div.topic {
background-color: #e9defd;
border: 0;
}
div.warning {
background-color: #ffebe8;
border: 0;
}
p.admonition-title {
display: inline;
}
p.admonition-title:after {
content: ":";
}
pre {
padding: 5px;
background-color: {{ theme_codebgcolor }};
color: {{ theme_codetextcolor }};
line-height: 120%;
border: 1px solid #ac9;
border-left: none;
border-right: none;
}
tt {
background-color: #ecf0f3;
padding: 0 1px 0 1px;
font-size: 0.95em;
}
th {
background-color: #ede;
}
.warning tt {
background: #efc2c2;
}
.note tt {
background: #d6d6d6;
}
.viewcode-back {
font-family: {{ theme_bodyfont }};
}
div.viewcode-block:target {
background-color: #f4debf;
border-top: 1px solid #ac9;
border-bottom: 1px solid #ac9;
}
source/mahara/static/ie6.css deleted 100644 → 0
View file @ 3ddec315
* html img,
* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none",
this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')",
this.src = "_static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''),
this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')",
this.runtimeStyle.backgroundImage = "none")),this.pngSet=true)
);}
source/mahara/static/mahara.css_t
View file @ 6ad61bb9
......@@ -9,15 +9,15 @@
* :license: BSD, see LICENSE for details.
*
*/
@import url("basic.css");
/* -- page layout ----------------------------------------------------------- */
body {
font-family: Verdana, Arial, "Nimbus Sans L", Helvetica, sans-serif;
font-size: 100%;
font-size: 0.75em;
background-color: #ededed;
font-size: 1.2em;
background: #FFFFFF url(binder.png) repeat-y 260px bottom;
color: #333333;
margin: 0;
padding: 0;
......@@ -26,18 +26,12 @@ div.documentwrapper {
float: left;
width: 100%;
}
div.bodywrapper {
margin: 0 0 0 260px;
}
hr {
border: 1px solid #B1B4B6;
}
img {
vertical-align: text-bottom;
}
div.document {
background: #FFFFFF url(binder.png) repeat-y 260px top;
}
div.header {
width:100%;
background: #ededc7 url(header-bkgd.png) repeat-x left top;
......@@ -65,31 +59,38 @@ div.logo-small a {
}
div.body {
color: #333333;
padding: 0 30px 20px 60px;
padding: 0 30px 20px 30px;
font-size: 1em;
overflow: auto;
max-width: 700px;
}
div.footer-relbar {
margin-top: 30px;
}
div.footer {
width: 100%;
padding: 20px 0 10px 0;
background: #ededc7 url(header-bkgd.png) repeat-x left top;
margin-left: -15px;
margin-right: -15px;
padding: 10px;
text-align: center;
font-size: 0.8333em;
background: url(footer.png) repeat-x left top;
clear: both;
color: #888888;
}
div.footer a, div.footer a:visited, div.footer a:link {
color: #666666;
text-decoration: none;
.navbar-default .navbar-nav>li>a {
color: #5c8727;
font-weight: bold;
font-size: 12px;
}
div.footer a:hover {
color: #666666;
.navbar-default .navbar-nav>li>a:hover,
.navbar-default .navbar-nav>li>a:focus,
.navbar-default .navbar-nav>li>a:active {
color: #5c8727;
text-decoration: underline;
}
ul.navbar-right {
margin-top: 5px;
}
div.related {
color: #888888;
padding: 0;
background: #FFFFFF url(binder.png) repeat-y 260px bottom;
height: 60px;
font-size: 0.9167em;
}
......@@ -97,7 +98,7 @@ div.related h3 {
display: none;
}
div.related ul {
padding: 20px 5px 0 310px;
padding: 20px 5px -1px 310px;
}
div.related li.right {
font-weight: normal;
......@@ -105,99 +106,45 @@ div.related li.right {
div.related li.right a {
font-weight: bold;
}
div.sphinxsidebar {
font-size: 1em;
width: 260px;
}
div.sphinxsidebarwrapper {
padding: 0 15px 0 15px;
}
div.sphinxsidebar h3, div.sphinxsidebar h4 {
color: #352f26;
font-size: 1.333em;
font-weight: normal;
margin: 0;
padding: 5px 0 3px 0;
border-bottom: 1px solid #cfcfcf;
}
div.sphinxsidebar h3 a {
color: #333333;
}
div.sphinxsidebar p {
color: #888;
padding: 5px 10px 10px 5px;
margin: 0 0 10px 0;
font-size: 0.9176em;
}
div.sphinxsidebar form {
margin-top: 5px;
margin-bottom: 30px;
}
div.sphinxsidebar form label {
font-size: 0.9167em;
}
div.sphinxsidebar ul {
margin: 5px 10px 10px 5px;
padding: 0;
font-weight: bold;
}
div.sphinxsidebar ul ul {
margin-top: 5px;
font-weight: normal;
}
div.sphinxsidebar ul li {
margin-bottom: 5px;
font-size: 0.9176em;
}
div.sphinxsidebar ul ul li {
margin-bottom: 5px;
font-size: 1em;
}
div.sphinxsidebar ul.square {
list-style-type: square;
margin-left: 15px;
}
div.sphinxsidebar input {
border: 0;
font-size: 1em;
padding: 0;
}
div.sphinxsidebar input[type=text] {
margin-left: 0;
background: url(searchbox.png) no-repeat left top;
width: 184px;
height: 33px;
float: left;
padding: 0 5px;
line-height: 33px;
}
div.sphinxsidebar input[type=submit] {
padding: 1px 3px;
background: url(searchbtn.png) no-repeat left top;
color: #FFFFFF;
float: left;
width: 36px !important;
height: 33px;
text-indent: -9999px;
* font-size: 1px;
}
div.crosslinks {
clear: left;