logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ihabu...@apache.org
Subject [2/3] git commit: Further refinements on the bootstrap docs theme
Date Sat, 23 Feb 2013 10:20:42 GMT
Further refinements on the bootstrap docs theme

Signed-off-by: Ivan Habunek <ihabunek@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/logging-log4php/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4php/commit/99a7d858
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4php/tree/99a7d858
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4php/diff/99a7d858

Branch: refs/heads/docs
Commit: 99a7d85872013f229b4f6df3b6f5c254a6eb775d
Parents: d58a38b
Author: Ivan Habunek <ihabunek@apache.org>
Authored: Sat Feb 23 11:18:16 2013 +0100
Committer: Ivan Habunek <ihabunek@apache.org>
Committed: Sat Feb 23 11:18:16 2013 +0100

----------------------------------------------------------------------
 docs/_theme/log4php/layout.html          |   78 ++++++++++++++++---------
 docs/_theme/log4php/static/log4php.css_t |   12 +++-
 2 files changed, 61 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/99a7d858/docs/_theme/log4php/layout.html
----------------------------------------------------------------------
diff --git a/docs/_theme/log4php/layout.html b/docs/_theme/log4php/layout.html
index 65bd88c..c969af2 100644
--- a/docs/_theme/log4php/layout.html
+++ b/docs/_theme/log4php/layout.html
@@ -34,7 +34,7 @@
     {%- if prev %}
     <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
     {%- endif %}
-    
+
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:    '{{ url_root }}',
@@ -44,7 +44,7 @@
             HAS_SOURCE:  {{ has_source|lower }}
         };
     </script>
-    
+
     <script type="text/javascript" src="{{ pathto('_static/jquery-1.8.2.min.js', 1) }}"></script>
     <script type="text/javascript" src="{{ pathto('_static/bootstrap/js/bootstrap-2.2.1.min.js
', 1) }}"></script>
     <script type="text/javascript" src="{{ pathto('_static/log4php.js', 1) }}"></script>
@@ -53,7 +53,7 @@
     {%- block header %}{% endblock %}
 
     {% block relbar1 %}
-    <div class="navbar">
+    <div class="navbar navbar-inverse">
         <div class="navbar-inner">
             <div class="container-fluid">
                 <a class="brand" href="http://logging.apache.org/log4php">Apache log4php
&trade;</a>
@@ -80,39 +80,63 @@
     {% endblock %}
 
     {% block content %}
-    <table class="layout-table">
-        <tr>
-            <td class="sidebar">
-                <div class="well sidebar-nav">
-                    {{ toctree(collapse=False,maxdepth=1) }}
-                </div>
-            </td>
-            <td class="content">
-                <ul class="breadcrumbs">
-                    <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>
&raquo;</li>
-                    {%- for parent in parents %}
-                        <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U")
}}{% endif %}>{{ parent.title }}</a> &raquo;</li>
-                    {%- endfor %}
-                </ul>
-                {% block body %}{% endblock %}
-            </td>
-        </tr>
-    </table>
+    <div class="container-fluid">
+        <table class="layout-table">
+            <tr>
+                <td class="content">
+                    <ul class="breadcrumbs">
+                        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e
}}</a> &raquo;</li>
+                        {%- for parent in parents %}
+                            <li><a href="{{ parent.link|e }}" {% if loop.last %}{{
accesskey("U") }}{% endif %}>{{ parent.title }}</a> &raquo;</li>
+                        {%- endfor %}
+                    </ul>
+                    {% block body %}{% endblock %}
+                </td>
+                <td class="sidebar">
+                    <div class="well sidebar-nav">
+                        <h3>{{ _('Chapters') }}</h3>
+                        {{ toctree(collapse=False,maxdepth=1) }}
+
+                        {%- include "localtoc.html" %}
+
+                        <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>
+                            {%- endfor %}
+                            {%- block rootrellink %}
+                            <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|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>
+                            {%- endfor %}
+                            {%- block relbaritems %} {% endblock %}
+                            </ul>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
     {% endblock %}
-    
+
     <div class="footer">
         <p>
-            Copyright &#169; {{ year }} <a href="http://www.apache.org">Apache
Software Foundation</a>. 
-            All Rights Reserved. Licensed under the 
-            <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License,
Version 2.0</a>. 
+            Copyright &#169; {{ year }} <a href="http://www.apache.org">Apache
Software Foundation</a>.
+            All Rights Reserved. Licensed under the
+            <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License,
Version 2.0</a>.
             Please read the <a href="./privacy.html">Privacy policy</a>
         </p>
         <p>
-            Apache log4php, Apache, log4php, the Apache feather logo, the Apache Logging
Services 
+            Apache log4php, Apache, log4php, the Apache feather logo, the Apache Logging
Services
             project logo and the Built by Maven logo are trademarks of The Apache Software
Foundation.
         </p>
         <p>
-            Site powered by <a class="external" href="http://twitter.github.com/bootstrap/">Twitter
Bootstrap</a>. 
+            Site powered by <a class="external" href="http://twitter.github.com/bootstrap/">Twitter
Bootstrap</a>.
             Icons from <a class="external" href="http://glyphicons.com/">Glyphicons
Free</a>.
         </p>
     </div>

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/99a7d858/docs/_theme/log4php/static/log4php.css_t
----------------------------------------------------------------------
diff --git a/docs/_theme/log4php/static/log4php.css_t b/docs/_theme/log4php/static/log4php.css_t
index 60366eb..da09c93 100644
--- a/docs/_theme/log4php/static/log4php.css_t
+++ b/docs/_theme/log4php/static/log4php.css_t
@@ -2,7 +2,7 @@
 
 .layout-table { width: 100%; }
 .sidebar { width: 250px; vertical-align: top; }
-.content { padding-left: 20px; vertical-align: top; }
+.content { padding-right: 20px; vertical-align: top; }
 .footer { background-color: whitesmoke; padding: 15px; margin-top: 15px; text-align: right;
border-top: 1px solid #EEEEEE; }
 .footer p { font-size: 11px; margin: 0 } 
 
@@ -21,6 +21,15 @@ h5 { font-size: 11.9px }
 
 dl.function dd { margin-top: 15px }
 
+/* -- sidebar --------------------------------------------------------------- */
+
+.sidebar-nav ul { list-style: none; margin-left: 0 }
+.sidebar-nav ul li a { display: block; padding: 3px 15px; text-decoration: none; margin-left:
-19px; margin-right: -19px; }
+.sidebar-nav ul li a:hover { background-color: #eeeeee; }
+.sidebar-nav ul li a.current { color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,0.2); background-color:
#08c }
+
+.sidebar-nav h3 { text-transform: uppercase; font-size: 11px; font-weight: bold; margin:
0 0 0 -10px }
+
 /* -- header links ---------------------------------------------------------- */
 
 a.headerlink { visibility: hidden; margin-left: 10px; color: lightgrey; }
@@ -59,7 +68,6 @@ dt:hover > a.headerlink { visibility: visible; }
 .container.tabs li.active { border-bottom: none; background-color: lemonchiffon }
 .container.tabs li a { text-decoration: none }
 
-
 .highlighttable { width: 100%; }
 .highlighttable td.linenos { width: 22px; text-align: right; padding-right: 5px } 
 .highlighttable td.linenos pre { padding: 5px 0px; border: 0; background-color: transparent;
color: #aaa }


Mime
View raw message