[Pkg-owncloud-commits] [owncloud-doc] 171/270: Merge branch 'owncloudorg-newdesign'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 5c03ab5d45043693a23e3f5129f4c25752b117ed
Merge: 4432ffc 2639851
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Tue Jun 24 13:29:20 2014 +0200

    Merge branch 'owncloudorg-newdesign'

 _shared_assets/themes/owncloud_org/README.rst      |   89 -
 _shared_assets/themes/owncloud_org/globaltoc.html  |   12 +-
 _shared_assets/themes/owncloud_org/layout.html     |  319 +-
 _shared_assets/themes/owncloud_org/localtoc.html   |    6 +-
 _shared_assets/themes/owncloud_org/navbar-2.html   |   51 +
 _shared_assets/themes/owncloud_org/navbar.html     |   50 +
 .../themes/owncloud_org/navbarsearchbox.html       |    9 +
 _shared_assets/themes/owncloud_org/navbartoc.html  |   10 +
 _shared_assets/themes/owncloud_org/relations.html  |   25 +-
 _shared_assets/themes/owncloud_org/search.html     |   71 +
 _shared_assets/themes/owncloud_org/searchbox.html  |    6 +-
 .../themes/owncloud_org/searchresults.html         |   38 +
 _shared_assets/themes/owncloud_org/sourcelink.html |    6 +-
 .../static/bootstrap-3.1.0/css/bootstrap-theme.css |  347 ++
 .../bootstrap-3.1.0/css/bootstrap-theme.css.map    |    1 +
 .../bootstrap-3.1.0/css/bootstrap-theme.min.css    |    7 +
 .../static/bootstrap-3.1.0/css/bootstrap.css       | 5831 ++++++++++++++++++++
 .../static/bootstrap-3.1.0/css/bootstrap.css.map   |    1 +
 .../static/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 +++++++
 .../static/bootstrap-3.1.0/js/bootstrap.min.js     |    6 +
 .../owncloud_org/static/bootstrap-responsive.css   |    9 -
 .../owncloud_org/static/bootstrap-sphinx.css_t     |  239 +-
 .../owncloud_org/static/bootstrap-sphinx.js_t      |  173 +
 .../themes/owncloud_org/static/bootstrap.css       |    9 -
 .../themes/owncloud_org/static/bootstrap.js        |    6 -
 .../static/img/glyphicons-halflings-white.png      |  Bin 8777 -> 0 bytes
 .../static/img/glyphicons-halflings.png            |  Bin 13826 -> 0 bytes
 .../owncloud_org/static/img/logo_owncloud.svg      |    4 +
 .../themes/owncloud_org/static/img/note.svg        |  103 -
 .../themes/owncloud_org/static/img/todo.svg        |  114 -
 .../themes/owncloud_org/static/jquery.js           |    4 -
 .../owncloud_org/static/js/jquery-1.11.0.min.js    |    4 +
 .../themes/owncloud_org/static/js/jquery-fix.js    |    2 +
 .../themes/owncloud_org/static/main.min.css        |    6 +
 .../themes/owncloud_org/static/style.css           | 1262 -----
 .../themes/owncloud_org/static/styles.css          |  210 +
 _shared_assets/themes/owncloud_org/theme.conf      |   55 +-
 42 files changed, 9489 insertions(+), 1783 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git