From c9750c24e2879fcaa9389144c1fc09c0d028667f Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 20 Mar 2016 15:56:42 +0100 Subject: [PATCH] Adapt new theme from owncloud.org --- .../themes/owncloud_release/README.rst | 89 - .../themes/owncloud_release/globaltoc.html | 12 +- .../themes/owncloud_release/layout.html | 213 +- .../themes/owncloud_release/localtoc.html | 6 +- .../themes/owncloud_release/navbar-2.html | 51 + .../themes/owncloud_release/navbar.html | 50 + .../owncloud_release/navbarsearchbox.html | 9 + .../themes/owncloud_release/navbartoc.html | 10 + .../themes/owncloud_release/relations.html | 23 +- .../themes/owncloud_release/search.html | 71 + .../themes/owncloud_release/searchbox.html | 6 +- .../owncloud_release/searchresults.html | 38 + .../themes/owncloud_release/sourcelink.html | 6 +- .../bootstrap-3.1.0/css/bootstrap-theme.css | 347 + .../css/bootstrap-theme.css.map | 1 + .../css/bootstrap-theme.min.css | 7 + .../static/bootstrap-3.1.0/css/bootstrap.css | 5831 +++++++++++++++++ .../bootstrap-3.1.0/css/bootstrap.css.map | 1 + .../bootstrap-3.1.0/css/bootstrap.min.css | 7 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20290 bytes .../fonts/glyphicons-halflings-regular.svg | 229 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41236 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23292 bytes .../static/bootstrap-3.1.0/js/bootstrap.js | 1951 ++++++ .../bootstrap-3.1.0/js/bootstrap.min.js | 6 + .../static/bootstrap-responsive.css | 9 - .../static/bootstrap-sphinx.css_t | 241 +- .../static/bootstrap-sphinx.js_t | 173 + .../owncloud_release/static/bootstrap.css | 9 - .../owncloud_release/static/bootstrap.js | 6 - .../static/fonts/OpenSans-Bold.ttf | Bin 0 -> 224592 bytes .../static/fonts/OpenSans-Bold.woff | Bin 0 -> 21272 bytes .../static/fonts/OpenSans-Italic.ttf | Bin 0 -> 212896 bytes .../static/fonts/OpenSans-Italic.woff | Bin 0 -> 23188 bytes .../static/fonts/OpenSans-Light.ttf | Bin 0 -> 222412 bytes .../static/fonts/OpenSans-Light.woff | Bin 0 -> 62844 bytes .../static/fonts/OpenSans-Regular.ttf | Bin 0 -> 217360 bytes .../static/fonts/OpenSans-Regular.woff | Bin 0 -> 20544 bytes .../static/fonts/fontawesome-webfont.eot | Bin 0 -> 72449 bytes .../static/fonts/fontawesome-webfont.svg | 504 ++ .../static/fonts/fontawesome-webfont.ttf | Bin 0 -> 141564 bytes .../static/fonts/fontawesome-webfont.woff | Bin 0 -> 83760 bytes .../static/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../static/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes .../static/img/logo_owncloud.svg | 4 + .../owncloud_release/static/img/note.svg | 103 - .../static/img/social/diaspora.png | Bin 0 -> 792 bytes .../static/img/social/diaspora.svg | 57 + .../static/img/social/diasporaround.png | Bin 0 -> 2601 bytes .../static/img/social/facebook.png | Bin 0 -> 2493 bytes .../static/img/social/facebook.svg | 1 + .../static/img/social/googleplus.png | Bin 0 -> 4334 bytes .../static/img/social/googleplus.svg | 1 + .../static/img/social/mail.svg | 80 + .../static/img/social/ownCloud7launch.png | Bin 0 -> 17597 bytes .../static/img/social/rss.png | Bin 0 -> 4400 bytes .../static/img/social/rss.svg | 60 + .../static/img/social/twitter.png | Bin 0 -> 1885 bytes .../static/img/social/twitter.svg | 1 + .../static/img/social/twitterround.png | Bin 0 -> 3719 bytes .../static/img/social/youtube.svg | 1 + .../owncloud_release/static/img/todo.svg | 114 - .../themes/owncloud_release/static/jquery.js | 4 - .../static/js/jquery-1.11.0.min.js | 4 + .../owncloud_release/static/js/jquery-fix.js | 2 + .../owncloud_release/static/main.min.css | 6 + .../themes/owncloud_release/static/style.css | 1218 ---- .../themes/owncloud_release/static/styles.css | 453 ++ .../themes/owncloud_release/theme.conf | 57 +- 69 files changed, 10380 insertions(+), 1692 deletions(-) delete mode 100644 _shared_assets/themes/owncloud_release/README.rst create mode 100644 _shared_assets/themes/owncloud_release/navbar-2.html create mode 100644 _shared_assets/themes/owncloud_release/navbar.html create mode 100644 _shared_assets/themes/owncloud_release/navbarsearchbox.html create mode 100644 _shared_assets/themes/owncloud_release/navbartoc.html create mode 100644 _shared_assets/themes/owncloud_release/search.html create mode 100644 _shared_assets/themes/owncloud_release/searchresults.html create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/css/bootstrap-theme.css create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/css/bootstrap-theme.css.map create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/css/bootstrap-theme.min.css create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/css/bootstrap.css create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/css/bootstrap.css.map create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/css/bootstrap.min.css create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/fonts/glyphicons-halflings-regular.eot create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/fonts/glyphicons-halflings-regular.svg create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/fonts/glyphicons-halflings-regular.ttf create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/fonts/glyphicons-halflings-regular.woff create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/js/bootstrap.js create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-3.1.0/js/bootstrap.min.js delete mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-responsive.css create mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap-sphinx.js_t delete mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap.css delete mode 100644 _shared_assets/themes/owncloud_release/static/bootstrap.js create mode 100644 _shared_assets/themes/owncloud_release/static/fonts/OpenSans-Bold.ttf create mode 100644 _shared_assets/themes/owncloud_release/static/fonts/OpenSans-Bold.woff create mode 100644 _shared_assets/themes/owncloud_release/static/fonts/OpenSans-Italic.ttf create mode 100644 _shared_assets/themes/owncloud_release/static/fonts/OpenSans-Italic.woff create mode 100644 _shared_assets/themes/owncloud_release/static/fonts/OpenSans-Light.ttf create mode 100644 _shared_assets/themes/owncloud_release/static/fonts/OpenSans-Light.woff create mode 100644 _shared_assets/themes/owncloud_release/static/fonts/OpenSans-Regular.ttf create mode 100644 _shared_assets/themes/owncloud_release/static/fonts/OpenSans-Regular.woff create mode 100755 _shared_assets/themes/owncloud_release/static/fonts/fontawesome-webfont.eot create mode 100755 _shared_assets/themes/owncloud_release/static/fonts/fontawesome-webfont.svg create mode 100755 _shared_assets/themes/owncloud_release/static/fonts/fontawesome-webfont.ttf create mode 100755 _shared_assets/themes/owncloud_release/static/fonts/fontawesome-webfont.woff delete mode 100644 _shared_assets/themes/owncloud_release/static/img/glyphicons-halflings-white.png delete mode 100644 _shared_assets/themes/owncloud_release/static/img/glyphicons-halflings.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/logo_owncloud.svg delete mode 100644 _shared_assets/themes/owncloud_release/static/img/note.svg create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/diaspora.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/diaspora.svg create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/diasporaround.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/facebook.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/facebook.svg create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/googleplus.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/googleplus.svg create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/mail.svg create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/ownCloud7launch.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/rss.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/rss.svg create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/twitter.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/twitter.svg create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/twitterround.png create mode 100644 _shared_assets/themes/owncloud_release/static/img/social/youtube.svg delete mode 100644 _shared_assets/themes/owncloud_release/static/img/todo.svg delete mode 100644 _shared_assets/themes/owncloud_release/static/jquery.js create mode 100644 _shared_assets/themes/owncloud_release/static/js/jquery-1.11.0.min.js create mode 100644 _shared_assets/themes/owncloud_release/static/js/jquery-fix.js create mode 100644 _shared_assets/themes/owncloud_release/static/main.min.css delete mode 100644 _shared_assets/themes/owncloud_release/static/style.css create mode 100644 _shared_assets/themes/owncloud_release/static/styles.css diff --git a/_shared_assets/themes/owncloud_release/README.rst b/_shared_assets/themes/owncloud_release/README.rst deleted file mode 100644 index b43a04c14..000000000 --- a/_shared_assets/themes/owncloud_release/README.rst +++ /dev/null @@ -1,89 +0,0 @@ -======================== - Sphinx Bootstrap Theme -======================== - -This repository integrates the Twitter Bootstrap_ CSS / JavaScript framework -as a Sphinx_ theme_. A live demo_ is available to preview the theme. - -.. _Bootstrap: http://twitter.github.com/bootstrap/ -.. _Sphinx: http://sphinx.pocoo.org/ -.. _theme: http://sphinx.pocoo.org/theming.html -.. _demo: http://ryan-roemer.github.com/sphinx-bootstrap-theme - - -Installation -============ -To install the theme, download the theme directory and update your -configuration - -1. Create a "_themes" directory in your project source root. -2. Get the "bootstrap" themes either as raw files or as a zipfile from - the repository. - - a. Most current way is to just clone this repo or download the full - repo source and move the "bootstrap" directory to "_themes". - b. Alternatively, there are some prepackaged theme zip files (containing - only the theme files), which can be read directly by Sphinx. See the - repo downloads_ page for available packages. Then download - "bootstrap.zip":: - - $ cd /path/to/_themes - $ wget https://github.com/downloads/ryan-roemer/sphinx-bootstrap-theme/bootstrap.zip - - In addition to the "current" release, the GitHub zipfiles have either git - hash releases (for development builds) or tags for official tagged - releases. E.g.:: - - bootstrap.zip - bootstrap-v0.0.2.zip - bootstrap-f51d73491e9bae68eb1b1c57059d9e0ece03d125.zip - -3. Edit your configuration file to point to the bootstrap theme:: - - # Activate the theme. - sys.path.append(os.path.abspath('_themes')) - html_theme_path = ['_themes'] - html_theme = 'bootstrap' - - # (Optional) Use a shorter name to conserve nav. bar space. - html_short_title = "Demo" - - # (Optional) Logo. Should be exactly 32x32 px to fit the nav. bar. - # Path should be relative to the html_static_path setting (e.g., - # "_static") in source. - html_logo = "my_logo.png" - -.. _downloads: https://github.com/ryan-roemer/sphinx-bootstrap-theme/downloads - -Theme Notes -=========== -Sphinx ------- -The theme places the global TOC, local TOC, navigation (prev, next) and -source links all in the top Bootstrap navigation bar, along with the Sphinx -search bar on the left side. - -The global (site-wide) table of contents is the "Site" navigation dropdown, -which is a multi-level deep rendering of the ``toctree`` for the entire site. -The local (page-level) table of contents is the "Page" navigation dropdown, -which is a multi-level rendering of the current page's ``toc``. - -Generally speaking, this is a quick and dirty hack to get the basic theme -going, so there are likely some oversights and lurking issues. Help and -bug filings for the project are most welcome. - - -Bootstrap ---------- -The theme uses Twitter Bootstrap v2.0. You can override any static JS/CSS files -by dropping different versions in your Sphinx "_static" directory. - - -Licenses -======== -Sphinx Bootstrap Theme is licensed under the MIT_ license. - -Twitter Bootstrap is licensed under the Apache_ license. - -.. _MIT: https://github.com/ryan-roemer/sphinx-bootstrap-theme/blob/master/LICENSE.txt -.. _Apache: https://github.com/twitter/bootstrap/blob/master/LICENSE diff --git a/_shared_assets/themes/owncloud_release/globaltoc.html b/_shared_assets/themes/owncloud_release/globaltoc.html index cb9f38fb6..d5df46c60 100644 --- a/_shared_assets/themes/owncloud_release/globaltoc.html +++ b/_shared_assets/themes/owncloud_release/globaltoc.html @@ -1,4 +1,10 @@ - diff --git a/_shared_assets/themes/owncloud_release/layout.html b/_shared_assets/themes/owncloud_release/layout.html index 9025e92d9..acbec5584 100644 --- a/_shared_assets/themes/owncloud_release/layout.html +++ b/_shared_assets/themes/owncloud_release/layout.html @@ -1,122 +1,119 @@ {% extends "basic/layout.html" %} -{% set script_files = script_files + ['_static/bootstrap.js'] %} -{% set css_files = [ '_static/style.css', '_static/bootstrap-sphinx.css'] + css_files %} -{# Sidebar: Rework into our Boostrap nav section. #} +{% set theme_css_files = []%} +{% if theme_bootstrap_version == "3" %} + {% set bootstrap_version, bootstrap_additional_css, navbar_version = "3.1.0", "theme", "" %} + {% set bs_span_prefix = "col-md-" %} +{% else %} + {% set bootstrap_version, bootstrap_additional_css, navbar_version = "2.3.2", "responsive", "-2" %} + {% set bs_span_prefix = "span" %} +{% endif %} + +{% if theme_bootswatch_theme %} + {# BS2 needs "bootstrap-responsive.css". BS3 doesn't. #} + {% if theme_bootstrap_version == "3" %} + {% set theme_css_files = theme_css_files + [ + '_static/bootswatch-' + bootstrap_version + '/' + theme_bootswatch_theme + '/bootstrap.min.css', + '_static/bootstrap-sphinx.css' + ] + %} + {% else %} + {% set theme_css_files = theme_css_files + [ + '_static/bootswatch-' + bootstrap_version + '/' + theme_bootswatch_theme + '/bootstrap.min.css', + '_static/bootstrap-' + bootstrap_version + '/css/bootstrap-' + bootstrap_additional_css + '.min.css', + '_static/bootstrap-sphinx.css' + ] + %} + {% endif %} +{% else %} + {% set theme_css_files = theme_css_files + ['_static/main.min.css', '_static/styles.css'] + %} +{% endif %} + +{% if not bootswatch_css_custom %} + {% set bootswatch_css_custom = [] %} +{% endif %} +{% set css_files = css_files + theme_css_files + bootswatch_css_custom %} + +{% set script_files = script_files + [ + '_static/js/jquery-1.11.0.min.js', + '_static/js/jquery-fix.js', + '_static/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js', + '_static/bootstrap-sphinx.js' + ] +%} + +{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and sidebars %} + +{%- set bs_content_width = render_sidebar and "9" or "12"%} + +{%- block doctype -%} + +{%- endblock %} + +{# Sidebar: Rework into our Bootstrap nav section. #} {% macro navBar() %} - {# - - - #} {% endmacro %} +{% if theme_bootstrap_version == "3" %} + {%- macro bsidebar() %} + {%- if render_sidebar %} +
+ +
+ {%- endif %} + {%- endmacro %} +{% else %} + {%- macro bsidebar() %} + {%- if render_sidebar %} +
+ +
+ {%- endif %} + {%- endmacro %} +{% endif %} + {%- block extrahead %} - + + + + + {% endblock %} -{% block header %}{{ navBar() }}{% endblock %} - {# Silence the sidebar's, relbar's #} -{% block sidebar1 %}{% endblock %} -{% block sidebar2 %}{% endblock %} +{% block header %}{% endblock %} {% block relbar1 %}{% endblock %} {% block relbar2 %}{% endblock %} +{% block sidebarsourcelink %}{% endblock %} {%- block content %} -
-
-