From 9c5708cc92af894e414bc76ee35ec2230de5d288 Mon Sep 17 00:00:00 2001 From: Agustin Henze Date: Wed, 2 Jan 2013 08:35:03 -0300 Subject: Imported Upstream version 5.1 --- nikola/data/samplesite/README.txt | 27 +- nikola/data/samplesite/conf.py | 274 ----- nikola/data/samplesite/conf.py.in | 268 ----- nikola/data/samplesite/posts/1.txt | 2 + nikola/data/samplesite/stories/listings-demo.txt | 10 + nikola/data/samplesite/stories/slides-demo.txt | 17 + .../default/assets/css/bootstrap-responsive.css | 68 +- .../data/themes/default/assets/css/bootstrap.css | 1245 +++++++++++++------- nikola/data/themes/default/assets/css/slides.css | 11 + nikola/data/themes/default/assets/js/bootstrap.js | 386 ++++-- .../data/themes/default/assets/js/slides.jquery.js | 555 +++++++++ nikola/data/themes/default/bundles | 4 +- nikola/data/themes/default/messages/de.py | 21 - nikola/data/themes/default/messages/en.py | 25 - nikola/data/themes/default/messages/es.py | 21 - nikola/data/themes/default/messages/fr.py | 17 - nikola/data/themes/default/messages/gr.py | 20 - nikola/data/themes/default/messages/it.py | 20 - nikola/data/themes/default/messages/messages_de.py | 22 + nikola/data/themes/default/messages/messages_en.py | 27 + nikola/data/themes/default/messages/messages_es.py | 22 + nikola/data/themes/default/messages/messages_fr.py | 18 + nikola/data/themes/default/messages/messages_gr.py | 21 + nikola/data/themes/default/messages/messages_it.py | 23 + nikola/data/themes/default/messages/messages_ru.py | 22 + nikola/data/themes/default/messages/ru.py | 21 - nikola/data/themes/default/templates/base.tmpl | 62 +- .../data/themes/default/templates/base_helper.tmpl | 74 ++ nikola/data/themes/default/templates/index.tmpl | 28 +- .../themes/default/templates/index_helper.tmpl | 31 + .../data/themes/default/templates/list_post.tmpl | 14 + nikola/data/themes/default/templates/post.tmpl | 49 +- .../data/themes/default/templates/post_helper.tmpl | 54 + nikola/data/themes/default/templates/tag.tmpl | 2 +- nikola/data/themes/default/templates/tags.tmpl | 2 +- nikola/data/themes/jinja-default/README | 2 +- .../data/themes/jinja-default/templates/base.tmpl | 31 +- .../data/themes/jinja-default/templates/index.tmpl | 2 +- .../themes/jinja-default/templates/list_post.tmpl | 13 + .../data/themes/jinja-default/templates/post.tmpl | 2 +- .../data/themes/jinja-default/templates/tag.tmpl | 2 +- nikola/data/themes/monospace/assets/css/code.css | 62 + .../data/themes/monospace/assets/css/colorbox.css | 85 ++ nikola/data/themes/monospace/assets/css/rst.css | 315 +++++ nikola/data/themes/monospace/assets/css/theme.css | 14 + nikola/data/themes/monospace/bundles | 1 + nikola/data/themes/monospace/messages | 1 + nikola/data/themes/monospace/templates/base.tmpl | 44 + .../themes/monospace/templates/base_helper.tmpl | 64 + .../data/themes/monospace/templates/gallery.tmpl | 27 + nikola/data/themes/monospace/templates/index.tmpl | 27 + .../themes/monospace/templates/index_helper.tmpl | 31 + nikola/data/themes/monospace/templates/list.tmpl | 14 + .../data/themes/monospace/templates/list_post.tmpl | 14 + .../data/themes/monospace/templates/listing.tmpl | 10 + nikola/data/themes/monospace/templates/post.tmpl | 28 + .../themes/monospace/templates/post_helper.tmpl | 54 + nikola/data/themes/monospace/templates/story.tmpl | 8 + nikola/data/themes/monospace/templates/tag.tmpl | 7 + nikola/data/themes/monospace/templates/tags.tmpl | 14 + nikola/data/themes/orphan/assets/css/code.css | 1 + nikola/data/themes/orphan/assets/css/colorbox.css | 1 + nikola/data/themes/orphan/assets/css/rst.css | 1 + nikola/data/themes/orphan/assets/css/theme.css | 0 nikola/data/themes/orphan/bundles | 1 + nikola/data/themes/orphan/messages | 1 + nikola/data/themes/orphan/templates/base.tmpl | 36 + .../data/themes/orphan/templates/base_helper.tmpl | 64 + nikola/data/themes/orphan/templates/gallery.tmpl | 27 + nikola/data/themes/orphan/templates/index.tmpl | 18 + .../data/themes/orphan/templates/index_helper.tmpl | 31 + nikola/data/themes/orphan/templates/list.tmpl | 14 + nikola/data/themes/orphan/templates/list_post.tmpl | 14 + nikola/data/themes/orphan/templates/listing.tmpl | 10 + nikola/data/themes/orphan/templates/post.tmpl | 20 + .../data/themes/orphan/templates/post_helper.tmpl | 54 + nikola/data/themes/orphan/templates/story.tmpl | 8 + nikola/data/themes/orphan/templates/tag.tmpl | 7 + nikola/data/themes/orphan/templates/tags.tmpl | 14 + nikola/data/themes/site/assets/css/theme.css | 12 +- nikola/data/themes/site/templates/base.tmpl | 67 +- nikola/data/themes/site/templates/post.tmpl | 45 +- 82 files changed, 3298 insertions(+), 1503 deletions(-) delete mode 100755 nikola/data/samplesite/conf.py delete mode 100755 nikola/data/samplesite/conf.py.in create mode 100644 nikola/data/samplesite/stories/listings-demo.txt create mode 100644 nikola/data/samplesite/stories/slides-demo.txt create mode 100644 nikola/data/themes/default/assets/css/slides.css create mode 100755 nikola/data/themes/default/assets/js/slides.jquery.js delete mode 100644 nikola/data/themes/default/messages/de.py delete mode 100644 nikola/data/themes/default/messages/en.py delete mode 100644 nikola/data/themes/default/messages/es.py delete mode 100644 nikola/data/themes/default/messages/fr.py delete mode 100644 nikola/data/themes/default/messages/gr.py delete mode 100644 nikola/data/themes/default/messages/it.py create mode 100644 nikola/data/themes/default/messages/messages_de.py create mode 100644 nikola/data/themes/default/messages/messages_en.py create mode 100644 nikola/data/themes/default/messages/messages_es.py create mode 100644 nikola/data/themes/default/messages/messages_fr.py create mode 100644 nikola/data/themes/default/messages/messages_gr.py create mode 100644 nikola/data/themes/default/messages/messages_it.py create mode 100644 nikola/data/themes/default/messages/messages_ru.py delete mode 100644 nikola/data/themes/default/messages/ru.py create mode 100644 nikola/data/themes/default/templates/base_helper.tmpl create mode 100644 nikola/data/themes/default/templates/index_helper.tmpl create mode 100644 nikola/data/themes/default/templates/list_post.tmpl create mode 100644 nikola/data/themes/default/templates/post_helper.tmpl create mode 100644 nikola/data/themes/jinja-default/templates/list_post.tmpl create mode 100644 nikola/data/themes/monospace/assets/css/code.css create mode 100644 nikola/data/themes/monospace/assets/css/colorbox.css create mode 100644 nikola/data/themes/monospace/assets/css/rst.css create mode 100644 nikola/data/themes/monospace/assets/css/theme.css create mode 100644 nikola/data/themes/monospace/bundles create mode 120000 nikola/data/themes/monospace/messages create mode 100644 nikola/data/themes/monospace/templates/base.tmpl create mode 100644 nikola/data/themes/monospace/templates/base_helper.tmpl create mode 100644 nikola/data/themes/monospace/templates/gallery.tmpl create mode 100644 nikola/data/themes/monospace/templates/index.tmpl create mode 100644 nikola/data/themes/monospace/templates/index_helper.tmpl create mode 100644 nikola/data/themes/monospace/templates/list.tmpl create mode 100644 nikola/data/themes/monospace/templates/list_post.tmpl create mode 100644 nikola/data/themes/monospace/templates/listing.tmpl create mode 100644 nikola/data/themes/monospace/templates/post.tmpl create mode 100644 nikola/data/themes/monospace/templates/post_helper.tmpl create mode 100644 nikola/data/themes/monospace/templates/story.tmpl create mode 100644 nikola/data/themes/monospace/templates/tag.tmpl create mode 100644 nikola/data/themes/monospace/templates/tags.tmpl create mode 120000 nikola/data/themes/orphan/assets/css/code.css create mode 120000 nikola/data/themes/orphan/assets/css/colorbox.css create mode 120000 nikola/data/themes/orphan/assets/css/rst.css create mode 100644 nikola/data/themes/orphan/assets/css/theme.css create mode 100644 nikola/data/themes/orphan/bundles create mode 120000 nikola/data/themes/orphan/messages create mode 100644 nikola/data/themes/orphan/templates/base.tmpl create mode 100644 nikola/data/themes/orphan/templates/base_helper.tmpl create mode 100644 nikola/data/themes/orphan/templates/gallery.tmpl create mode 100644 nikola/data/themes/orphan/templates/index.tmpl create mode 100644 nikola/data/themes/orphan/templates/index_helper.tmpl create mode 100644 nikola/data/themes/orphan/templates/list.tmpl create mode 100644 nikola/data/themes/orphan/templates/list_post.tmpl create mode 100644 nikola/data/themes/orphan/templates/listing.tmpl create mode 100644 nikola/data/themes/orphan/templates/post.tmpl create mode 100644 nikola/data/themes/orphan/templates/post_helper.tmpl create mode 100644 nikola/data/themes/orphan/templates/story.tmpl create mode 100644 nikola/data/themes/orphan/templates/tag.tmpl create mode 100644 nikola/data/themes/orphan/templates/tags.tmpl (limited to 'nikola/data') diff --git a/nikola/data/samplesite/README.txt b/nikola/data/samplesite/README.txt index ca94b34..a1220d0 100644 --- a/nikola/data/samplesite/README.txt +++ b/nikola/data/samplesite/README.txt @@ -1,31 +1,20 @@ -How To make This Work ---------------------- +This folder contains the source used to generate a static site by nikola. -The full manual is in stories/manual.txt, but here is the very short version: +Installation and documentation at http://nikola.ralsina.com.ar -1. Install docutils (http://docutils.sourceforge.net) -2. Install Mako (http://makotemplates.org) -3. Install doit (http://python-doit.sourceforge.net) -4. Install PIL (http://www.pythonware.com/products/pil/) -5. Install Pygments (http://pygments.org/) -6. Install unidecode (http://pypi.python.org/pypi/Unidecode/) -7. Install lxml (http://lxml.de/) +Configuration file for the site is `conf.py`. -To build or update the demo site run this command in the nikola's folder:: +To build the site:: - doit + nikola build To see it:: - doit serve -p 8000 + nikola serve And point your browser to http://localhost:8000 -Notes on Requirements ---------------------- -If you don't have PIL, then image galleries will be inefficient because Nikola -will not generate thumbnails. Alternatively, you may install pillow instead of -PIL. +To check all available commands:: -If you don't have pygments, the code-block directive will not highlight syntax. + nikola help diff --git a/nikola/data/samplesite/conf.py b/nikola/data/samplesite/conf.py deleted file mode 100755 index 552eb68..0000000 --- a/nikola/data/samplesite/conf.py +++ /dev/null @@ -1,274 +0,0 @@ -# -*- coding: utf-8 -*- - -import os - -######################################## -# Configuration, please edit -######################################## - -# Data about this site -BLOG_AUTHOR = "Your Name" -BLOG_TITLE = "Demo Site" -BLOG_URL = "http://nikola.ralsina.com.ar" -BLOG_EMAIL = "joe@demo.site" -BLOG_DESCRIPTION = "This is a demo site for Nikola." - -# post_pages contains (wildcard, destination, template, use_in_feed) tuples. -# -# The wildcard is used to generate a list of reSt source files -# (whatever/thing.txt). -# That fragment must have an associated metadata file (whatever/thing.meta), -# and opcionally translated files (example for spanish, with code "es"): -# whatever/thing.txt.es and whatever/thing.meta.es -# -# From those files, a set of HTML fragment files will be generated: -# cache/whatever/thing.html (and maybe cache/whatever/thing.html.es) -# -# These files are combinated with the template to produce rendered -# pages, which will be placed at -# output / TRANSLATIONS[lang] / destination / pagename.html -# -# where "pagename" is specified in the metadata file. -# -# if use_in_feed is True, then those posts will be added to the site's -# rss feeds. -# - -post_pages = ( - ("posts/*.txt", "posts", "post.tmpl", True), - ("stories/*.txt", "stories", "story.tmpl", False), -) - -# One or more folders containing files to be copied as-is into the output. -# The format is a dictionary of "source" "relative destination". -# Default is: -# FILES_FOLDERS = {'files': '' } -# Which means copy 'files' into 'output' - -# A mapping of languages to file-extensions that represent that language. -# Feel free to add or delete extensions to any list, but don't add any new -# compilers unless you write the interface for it yourself. -# -# 'rest' is reStructuredText -# 'markdown' is MarkDown -# 'html' assumes the file is html and just copies it -post_compilers = { - "rest": ('.txt', '.rst'), - "markdown": ('.md', '.mdown', '.markdown'), - "html": ('.html', '.htm') - } - -# Nikola is multilingual! -# -# Currently supported languages are: -# English -> en -# Greek -> gr -# German -> de -# French -> fr -# Russian -> ru -# Spanish -> es -# Italian -> it -# -# If you want to use Nikola with a non-supported language you have to provide -# a module containing the necessary translations -# (p.e. look at the modules at: ./nikola/data/themes/default/messages/fr.py). -# If a specific post is not translated to a language, then the version -# in the default language will be shown instead. - -# What is the default language? -DEFAULT_LANG = "en" - -# What other languages do you have? -# The format is {"translationcode" : "path/to/translation" } -# the path will be used as a prefix for the generated pages location -TRANSLATIONS = { - DEFAULT_LANG: "", - #"gr": "./gr", - #"de": "./de", - #"fr": "./fr", - #"ru": "./ru", - #"es": "./es", - } - -# Paths for different autogenerated bits. These are combined with the -# translation paths. - -# Final locations are: -# output / TRANSLATION[lang] / TAG_PATH / index.html (list of tags) -# output / TRANSLATION[lang] / TAG_PATH / tag.html (list of posts for a tag) -# output / TRANSLATION[lang] / TAG_PATH / tag.xml (RSS feed for a tag) -TAG_PATH = "categories" - -# If TAG_PAGES_ARE_INDEXES is set to True, each tag's page will contain -# the posts themselves. If set to False, it will be just a list of links. -TAG_PAGES_ARE_INDEXES = True - -# Final location is output / TRANSLATION[lang] / INDEX_PATH / index-*.html -INDEX_PATH = "" -# Final locations for the archives are: -# output / TRANSLATION[lang] / ARCHIVE_PATH / ARCHIVE_FILENAME -# output / TRANSLATION[lang] / ARCHIVE_PATH / YEAR / index.html -ARCHIVE_PATH = "" -ARCHIVE_FILENAME = "archive.html" -# Final locations are: -# output / TRANSLATION[lang] / RSS_PATH / rss.xml -RSS_PATH = "" - -# Slug the Tag URL easier for users to type, special characters are -# often removed or replaced as well. -SLUG_TAG_PATH = True - -# A list of redirection tuples, [("foo/from.html", "/bar/to.html")]. -# -# A HTML file will be created in output/foo/from.html that redirects -# to the "/bar/to.html" URL. notice that the "from" side MUST be a -# relative URL. -# -# If you don't need any of these, just set to [] - -REDIRECTIONS = [] - -# Commands to execute to deploy. Can be anything, for example, -# you may use rsync: -# "rsync -rav output/* joe@my.site:/srv/www/site" -# And then do a backup, or ping pingomatic. -# To do manual deployment, set it to [] -DEPLOY_COMMANDS = [] - -# Where the output site should be located -# If you don't use an absolute path, it will be considered as relative -# to the location of conf.py - -OUTPUT_FOLDER = 'output' - -# Filters to apply to the output. -# A directory where the keys are either: a file extensions, or -# a tuple of file extensions. -# -# And the value is a list of commands to be applied in order. -# -# Each command must be either: -# -# A string containing a '%s' which will -# be replaced with a filename. The command *must* produce output -# in place. -# -# Or: -# -# A python callable, which will be called with the filename as -# argument. -# -# By default, there are no filters. -FILTERS = { -# ".jpg": ["jpegoptim --strip-all -m75 -v %s"], -} - -############################################################################## -# Image Gallery Options -############################################################################## - -# Galleries are folders in galleries/ -# Final location of galleries will be output / GALLERY_PATH / gallery_name -GALLERY_PATH = "galleries" -THUMBNAIL_SIZE = 180 -MAX_IMAGE_SIZE = 1280 -USE_FILENAME_AS_TITLE = True - -############################################################################## -# HTML fragments and diverse things that are used by the templates -############################################################################## - -# Data about post-per-page indexes -INDEXES_TITLE = "" # If this is empty, the default is BLOG_TITLE -INDEXES_PAGES = "" # If this is empty, the default is 'old posts page %d' translated - -# Name of the theme to use. Themes are located in themes/theme_name -THEME = 'site' - -# Show only teasers in the index pages? Defaults to False. -# INDEX_TEASERS = False - -# A HTML fragment describing the license, for the sidebar. -# I recomment using the Creative Commons' wizard: -# http://creativecommons.org/choose/ -LICENSE = """ - -Creative Commons License BY-NC-SA""" - -# A small copyright notice for the page footer (in HTML) -CONTENT_FOOTER = u'Contents © 2012 Example Joe' - -# To enable comments via Disqus, you need to create a forum at -# http://disqus.com, and set DISQUS_FORUM to the short name you selected. -# If you want to disable comments, set it to False. -DISQUS_FORUM = "nikolademo" - -# Enable Addthis social buttons? -# Defaults to true -# ADD_THIS_BUTTONS = True - -# Modify the number of Post per Index Page -# Defaults to 10 -# INDEX_DISPLAY_POST_COUNT = 10 - -# RSS_LINK is a HTML fragment to link the RSS or Atom feeds. If set to None, -# the base.tmpl will use the feed Nikola generates. However, you may want to -# change it for a feedburner feed or something else. -RSS_LINK = None - -# A search form to search this site, for the sidebar. You can use a google -# custom search (http://www.google.com/cse/) -# Or a duckduckgo search: https://duckduckgo.com/search_box.html -# This example should work for pretty much any site we generate. -SEARCH_FORM = "" -# This search form is better for the "site" theme where it -# appears on the navigation bar -#SEARCH_FORM = """ -# -# -# -#""" % BLOG_URL - -# Google analytics or whatever else you use. Added to the bottom of -# in the default template (base.tmpl). -ANALYTICS = """ - """ - -# Put in global_context things you want available on all your templates. -# It can be anything, data, functions, modules, etc. -GLOBAL_CONTEXT = { - 'analytics': ANALYTICS, - 'blog_author': BLOG_AUTHOR, - 'blog_title': BLOG_TITLE, - 'blog_url': BLOG_URL, - 'blog_desc': BLOG_DESCRIPTION, - 'translations': TRANSLATIONS, - 'license': LICENSE, - 'search_form': SEARCH_FORM, - 'disqus_forum': DISQUS_FORUM, - 'content_footer': CONTENT_FOOTER, - 'rss_path': RSS_PATH, - 'rss_link': RSS_LINK, - # Locale-dependent links for the sidebar - # You should provide a key-value pair for each used language. - 'sidebar_links': { - DEFAULT_LANG: ( - ('/' + os.path.join(ARCHIVE_PATH, ARCHIVE_FILENAME), 'Archives'), - ('/categories/index.html', 'Tags'), - ('/stories/about-nikola.html', 'About Nikola'), - ('/stories/handbook.html', 'The Nikola Handbook'), - ('http://nikola.ralsina.com.ar', 'Powered by Nikola!'), - ), - } - } diff --git a/nikola/data/samplesite/conf.py.in b/nikola/data/samplesite/conf.py.in deleted file mode 100755 index 8794565..0000000 --- a/nikola/data/samplesite/conf.py.in +++ /dev/null @@ -1,268 +0,0 @@ -# -*- coding: utf-8 -*- - -import os - -######################################## -# Configuration, please edit -######################################## - -# Data about this site -BLOG_AUTHOR = "${BLOG_AUTHOR}" -BLOG_TITLE = "${BLOG_TITLE}" -BLOG_URL = "${BLOG_URL}" -BLOG_EMAIL = "${BLOG_EMAIL}" -BLOG_DESCRIPTION = "${BLOG_DESCRIPTION}" - - -# post_pages contains (wildcard, destination, template, use_in_feed) tuples. -# -# The wildcard is used to generate a list of reSt source files -# (whatever/thing.txt). -# That fragment must have an associated metadata file (whatever/thing.meta), -# and opcionally translated files (example for spanish, with code "es"): -# whatever/thing.txt.es and whatever/thing.meta.es -# -# From those files, a set of HTML fragment files will be generated: -# cache/whatever/thing.html (and maybe cache/whatever/thing.html.es) -# -# These files are combinated with the template to produce rendered -# pages, which will be placed at -# output / TRANSLATIONS[lang] / destination / pagename.html -# -# where "pagename" is specified in the metadata file. -# -# if use_in_feed is True, then those posts will be added to the site's -# rss feeds. -# - -post_pages = ${POST_PAGES} - -# One or more folders containing files to be copied as-is into the output. -# The format is a dictionary of "source" "relative destination". -# Default is: -# FILES_FOLDERS = {'files': '' } -# Which means copy 'files' into 'output' - -# A mapping of languages to file-extensions that represent that language. -# Feel free to add or delete extensions to any list, but don't add any new -# compilers unless you write the interface for it yourself. -# -# 'rest' is reStructuredTextq -# 'markdown' is MarkDown -# 'html' assumes the file is html and just copies it -post_compilers = ${POST_COMPILERS} - -# Nikola is multilingual! -# -# Currently supported languages are: -# English -> en -# Greek -> gr -# German -> de -# French -> fr -# Russian -> ru -# Spanish -> es -# Italian -> it -# -# If you want to use Nikola with a non-supported language you have to provide -# a module containing the necessary translations -# (p.e. look at the modules at: ./nikola/data/themes/default/messages/fr.py). -# If a specific post is not translated to a language, then the version -# in the default language will be shown instead. - -# What is the default language? -DEFAULT_LANG = "${DEFAULT_LANG}" - -# What other languages do you have? -# The format is {"translationcode" : "path/to/translation" } -# the path will be used as a prefix for the generated pages location -TRANSLATIONS = { - "${DEFAULT_LANG}": "", - #"gr": "./gr", - #"de": "./de", - #"fr": "./fr", - #"ru": "./ru", - #"es": "./es", - } - -# Paths for different autogenerated bits. These are combined with the -# translation paths. - -# Final locations are: -# output / TRANSLATION[lang] / TAG_PATH / index.html (list of tags) -# output / TRANSLATION[lang] / TAG_PATH / tag.html (list of posts for a tag) -# output / TRANSLATION[lang] / TAG_PATH / tag.xml (RSS feed for a tag) -TAG_PATH = "categories" - -# If TAG_PAGES_ARE_INDEXES is set to True, each tag's page will contain -# the posts themselves. If set to False, it will be just a list of links. -TAG_PAGES_ARE_INDEXES = True - -# Final location is output / TRANSLATION[lang] / INDEX_PATH / index-*.html -INDEX_PATH = "" -# Final locations for the archives are: -# output / TRANSLATION[lang] / ARCHIVE_PATH / ARCHIVE_FILENAME -# output / TRANSLATION[lang] / ARCHIVE_PATH / YEAR / index.html -ARCHIVE_PATH = "" -ARCHIVE_FILENAME = "archive.html" -# Final locations are: -# output / TRANSLATION[lang] / RSS_PATH / rss.xml -RSS_PATH = "" - -# Slug the Tag URL easier for users to type, special characters are -# often removed or replaced as well. -SLUG_TAG_PATH = True - -# A list of redirection tuples, [("foo/from.html", "/bar/to.html")]. -# -# A HTML file will be created in output/foo/from.html that redirects -# to the "/bar/to.html" URL. notice that the "from" side MUST be a -# relative URL. -# -# If you don't need any of these, just set to [] - -REDIRECTIONS = [] - -# Commands to execute to deploy. Can be anything, for example, -# you may use rsync: -# "rsync -rav output/* joe@my.site:/srv/www/site" -# And then do a backup, or ping pingomatic. -# To do manual deployment, set it to [] -DEPLOY_COMMANDS = [] - -# Where the output site should be located -# If you don't use an absolute path, it will be considered as relative -# to the location of conf.py - -OUTPUT_FOLDER = 'output' - -# Filters to apply to the output. -# A directory where the keys are either: a file extensions, or -# a tuple of file extensions. -# -# And the value is a list of commands to be applied in order. -# -# Each command must be either: -# -# A string containing a '%s' which will -# be replaced with a filename. The command *must* produce output -# in place. -# -# Or: -# -# A python callable, which will be called with the filename as -# argument. -# -# By default, there are no filters. -FILTERS = { -# ".jpg": ["jpegoptim --strip-all -m75 -v %s"], -} - -############################################################################## -# Image Gallery Options -############################################################################## - -# Galleries are folders in galleries/ -# Final location of galleries will be output / GALLERY_PATH / gallery_name -GALLERY_PATH = "galleries" -THUMBNAIL_SIZE = 180 -MAX_IMAGE_SIZE = 1280 -USE_FILENAME_AS_TITLE = True - -############################################################################## -# HTML fragments and diverse things that are used by the templates -############################################################################## - -# Data about post-per-page indexes -INDEXES_TITLE = "" # If this is empty, the default is BLOG_TITLE -INDEXES_PAGES = "" # If this is empty, the default is 'old posts page %d' translated - -# Name of the theme to use. Themes are located in themes/theme_name -THEME = 'site' - -# Show only teasers in the index pages? Defaults to False. -# INDEX_TEASERS = False - -# A HTML fragment describing the license, for the sidebar. -# I recomment using the Creative Commons' wizard: -# http://creativecommons.org/choose/ -LICENSE = """ - -Creative Commons License BY-NC-SA""" - -# A small copyright notice for the page footer (in HTML) -CONTENT_FOOTER = u'Contents © 2012 ${BLOG_AUTHOR}' - -# To enable comments via Disqus, you need to create a forum at -# http://disqus.com, and set DISQUS_FORUM to the short name you selected. -# If you want to disable comments, set it to False. -DISQUS_FORUM = "nikolademo" - -# Enable Addthis social buttons? -# Defaults to true -# ADD_THIS_BUTTONS = True - -# Modify the number of Post per Index Page -# Defaults to 10 -# INDEX_DISPLAY_POST_COUNT = 10 - -# RSS_LINK is a HTML fragment to link the RSS or Atom feeds. If set to None, -# the base.tmpl will use the feed Nikola generates. However, you may want to -# change it for a feedburner feed or something else. -RSS_LINK = None - -# A search form to search this site, for the sidebar. You can use a google -# custom search (http://www.google.com/cse/) -# Or a duckduckgo search: https://duckduckgo.com/search_box.html -# This example should work for pretty much any site we generate. -SEARCH_FORM = "" -# This search form is better for the "site" theme where it -# appears on the navigation bar -#SEARCH_FORM = """ -# -# -# -#""" % BLOG_URL - -# Google analytics or whatever else you use. Added to the bottom of -# in the default template (base.tmpl). -ANALYTICS = """ - """ - -# Put in global_context things you want available on all your templates. -# It can be anything, data, functions, modules, etc. -GLOBAL_CONTEXT = { - 'analytics': ANALYTICS, - 'blog_author': BLOG_AUTHOR, - 'blog_title': BLOG_TITLE, - 'blog_url': BLOG_URL, - 'blog_desc': BLOG_DESCRIPTION, - 'translations': TRANSLATIONS, - 'license': LICENSE, - 'search_form': SEARCH_FORM, - 'disqus_forum': DISQUS_FORUM, - 'content_footer': CONTENT_FOOTER, - 'rss_path': RSS_PATH, - 'rss_link': RSS_LINK, - # Locale-dependent links for the sidebar - # You should provide a key-value pair for each used language. - 'sidebar_links': { - DEFAULT_LANG: ( - ('/' + os.path.join(ARCHIVE_PATH, ARCHIVE_FILENAME), 'Archives'), - ('/categories/index.html', 'Tags'), - ('/stories/about-nikola.html', 'About Nikola'), - ('/stories/handbook.html', 'The Nikola Handbook'), - ('http://nikola.ralsina.com.ar', 'Powered by Nikola!'), - ), - } - } diff --git a/nikola/data/samplesite/posts/1.txt b/nikola/data/samplesite/posts/1.txt index 4e583db..5741e05 100644 --- a/nikola/data/samplesite/posts/1.txt +++ b/nikola/data/samplesite/posts/1.txt @@ -9,5 +9,7 @@ and build a site using it. Congratulations! * You can read the manual `here `__ * You can learn more about Nikola at http://nikola.ralsina.com.ar * You can see a demo photo gallery `here `__ +* Demo usage of listings `here `__ +* Demo of slideshows `here `__ Send feedback to ralsina@netmanagers.com.ar! diff --git a/nikola/data/samplesite/stories/listings-demo.txt b/nikola/data/samplesite/stories/listings-demo.txt new file mode 100644 index 0000000..7875f17 --- /dev/null +++ b/nikola/data/samplesite/stories/listings-demo.txt @@ -0,0 +1,10 @@ +.. title: Listings Demo +.. slug: listings-demo +.. date: 2012/12/15 10:16:20 +.. tags: +.. link: +.. description: + +Nikola intends to let you show code easily via listings: + +.. listing:: hello.py python diff --git a/nikola/data/samplesite/stories/slides-demo.txt b/nikola/data/samplesite/stories/slides-demo.txt new file mode 100644 index 0000000..fb1356b --- /dev/null +++ b/nikola/data/samplesite/stories/slides-demo.txt @@ -0,0 +1,17 @@ +.. title: Slides Demo +.. slug: slides-demo +.. date: 2012/12/27 10:16:20 +.. tags: +.. link: +.. description: + +Nikola intends to let you do slideshows easily: + +.. slides:: + + /galleries/demo/tesla_conducts_lg.jpg + /galleries/demo/tesla_lightning2_lg.jpg + /galleries/demo/tesla4_lg.jpg + /galleries/demo/tesla_lightning1_lg.jpg + /galleries/demo/tesla_tower1_lg.jpg + diff --git a/nikola/data/themes/default/assets/css/bootstrap-responsive.css b/nikola/data/themes/default/assets/css/bootstrap-responsive.css index daafa91..a3352d7 100644 --- a/nikola/data/themes/default/assets/css/bootstrap-responsive.css +++ b/nikola/data/themes/default/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.1.0 + * Bootstrap Responsive v2.2.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -8,6 +8,10 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ +@-ms-viewport { + width: device-width; +} + .clearfix { *zoom: 1; } @@ -107,6 +111,7 @@ } [class*="span"] { float: left; + min-height: 1px; margin-left: 30px; } .container, @@ -214,6 +219,9 @@ .row-fluid [class*="span"]:first-child { margin-left: 0; } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.564102564102564%; + } .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; @@ -453,6 +461,7 @@ } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, @@ -560,6 +569,9 @@ .row-fluid [class*="span"]:first-child { margin-left: 0; } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.7624309392265194%; + } .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; @@ -780,7 +792,8 @@ padding-left: 20px; } .navbar-fixed-top, - .navbar-fixed-bottom { + .navbar-fixed-bottom, + .navbar-static-top { margin-right: -20px; margin-left: -20px; } @@ -811,11 +824,15 @@ margin-left: 0; } [class*="span"], + .uneditable-input[class*="span"], .row-fluid [class*="span"] { display: block; float: none; - width: auto; + width: 100%; margin-left: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .span12, .row-fluid .span12 { @@ -824,6 +841,9 @@ -moz-box-sizing: border-box; box-sizing: border-box; } + .row-fluid [class*="offset"]:first-child { + margin-left: 0; + } .input-large, .input-xlarge, .input-xxlarge, @@ -845,6 +865,9 @@ display: inline-block; width: auto; } + .controls-row [class*="span"] + [class*="span"] { + margin-left: 0; + } .modal { position: fixed; top: 20px; @@ -853,8 +876,11 @@ width: auto; margin: 0; } + .modal.fade { + top: -100px; + } .modal.fade.in { - top: auto; + top: 20px; } } @@ -870,7 +896,7 @@ input[type="radio"] { border: 1px solid #ccc; } - .form-horizontal .control-group > label { + .form-horizontal .control-label { float: none; width: auto; padding-top: 0; @@ -886,6 +912,16 @@ padding-right: 10px; padding-left: 10px; } + .media .pull-left, + .media .pull-right { + display: block; + float: none; + margin-bottom: 10px; + } + .media-object { + margin-right: 0; + margin-left: 0; + } .modal { top: 10px; right: 10px; @@ -944,14 +980,14 @@ display: none; } .nav-collapse .nav .nav-header { - color: #555555; + color: #777777; text-shadow: none; } .nav-collapse .nav > li > a, .nav-collapse .dropdown-menu a { padding: 9px 15px; font-weight: bold; - color: #555555; + color: #777777; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -970,6 +1006,10 @@ .nav-collapse .dropdown-menu a:hover { background-color: #f2f2f2; } + .navbar-inverse .nav-collapse .nav > li > a, + .navbar-inverse .nav-collapse .dropdown-menu a { + color: #999999; + } .navbar-inverse .nav-collapse .nav > li > a:hover, .navbar-inverse .nav-collapse .dropdown-menu a:hover { background-color: #111111; @@ -982,7 +1022,7 @@ position: static; top: auto; left: auto; - display: block; + display: none; float: none; max-width: none; padding: 0; @@ -996,6 +1036,9 @@ -moz-box-shadow: none; box-shadow: none; } + .nav-collapse .open > .dropdown-menu { + display: block; + } .nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:after { display: none; @@ -1003,6 +1046,10 @@ .nav-collapse .dropdown-menu .divider { display: none; } + .nav-collapse .nav > li > .dropdown-menu:before, + .nav-collapse .nav > li > .dropdown-menu:after { + display: none; + } .nav-collapse .navbar-form, .nav-collapse .navbar-search { float: none; @@ -1014,6 +1061,11 @@ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); } + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: #111111; + border-bottom-color: #111111; + } .navbar .nav-collapse .nav.pull-right { float: none; margin-left: 0; diff --git a/nikola/data/themes/default/assets/css/bootstrap.css b/nikola/data/themes/default/assets/css/bootstrap.css index 0664207..8ab3cef 100644 --- a/nikola/data/themes/default/assets/css/bootstrap.css +++ b/nikola/data/themes/default/assets/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.1.0 + * Bootstrap v2.2.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -67,6 +67,7 @@ sub { } img { + width: auto\9; height: auto; max-width: 100%; vertical-align: middle; @@ -74,7 +75,8 @@ img { -ms-interpolation-mode: bicubic; } -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; } @@ -100,13 +102,24 @@ input::-moz-focus-inner { } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; } +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; +} + input[type="search"] { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; @@ -124,6 +137,58 @@ textarea { vertical-align: top; } +@media print { + * { + color: #000 !important; + text-shadow: none !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} + .clearfix { *zoom: 1; } @@ -215,6 +280,7 @@ a:hover { [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } @@ -353,6 +419,10 @@ a:hover { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} + .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; @@ -583,7 +653,7 @@ p { .lead { margin-bottom: 20px; - font-size: 20px; + font-size: 21px; font-weight: 200; line-height: 30px; } @@ -608,6 +678,42 @@ cite { color: #999999; } +a.muted:hover { + color: #808080; +} + +.text-warning { + color: #c09853; +} + +a.text-warning:hover { + color: #a47e3c; +} + +.text-error { + color: #b94a48; +} + +a.text-error:hover { + color: #953b39; +} + +.text-info { + color: #3a87ad; +} + +a.text-info:hover { + color: #2d6987; +} + +.text-success { + color: #468847; +} + +a.text-success:hover { + color: #356635; +} + h1, h2, h3, @@ -617,7 +723,7 @@ h6 { margin: 10px 0; font-family: inherit; font-weight: bold; - line-height: 1; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -633,42 +739,42 @@ h6 small { color: #999999; } -h1 { - font-size: 36px; +h1, +h2, +h3 { line-height: 40px; } +h1 { + font-size: 38.5px; +} + h2 { - font-size: 30px; - line-height: 40px; + font-size: 31.5px; } h3 { - font-size: 24px; - line-height: 40px; + font-size: 24.5px; } h4 { - font-size: 18px; - line-height: 20px; + font-size: 17.5px; } h5 { font-size: 14px; - line-height: 20px; } h6 { - font-size: 12px; - line-height: 20px; + font-size: 11.9px; } h1 small { - font-size: 24px; + font-size: 24.5px; } h2 small { - font-size: 18px; + font-size: 17.5px; } h3 small { @@ -708,6 +814,19 @@ ol.unstyled { list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} + +ul.inline > li, +ol.inline > li { + display: inline-block; + padding-right: 5px; + padding-left: 5px; +} + dl { margin-bottom: 20px; } @@ -725,9 +844,24 @@ dd { margin-left: 10px; } +.dl-horizontal { + *zoom: 1; +} + +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + line-height: 0; + content: ""; +} + +.dl-horizontal:after { + clear: both; +} + .dl-horizontal dt { float: left; - width: 120px; + width: 160px; overflow: hidden; clear: left; text-align: right; @@ -736,7 +870,7 @@ dd { } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { @@ -746,7 +880,8 @@ hr { border-bottom: 1px solid #ffffff; } -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; border-bottom: 1px dotted #999999; } @@ -828,6 +963,7 @@ pre { code { padding: 2px 4px; color: #d14; + white-space: nowrap; background-color: #f7f7f9; border: 1px solid #e1e1e8; } @@ -857,6 +993,8 @@ pre.prettyprint { pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -935,18 +1073,20 @@ input[type="color"], display: inline-block; height: 20px; padding: 4px 6px; - margin-bottom: 9px; + margin-bottom: 10px; font-size: 14px; line-height: 20px; color: #555555; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + vertical-align: middle; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } input, -textarea { - width: 210px; +textarea, +.uneditable-input { + width: 206px; } textarea { @@ -1012,7 +1152,6 @@ input[type="checkbox"] { margin-top: 1px \9; *margin-top: 0; line-height: normal; - cursor: pointer; } input[type="file"], @@ -1039,7 +1178,7 @@ input[type="file"] { select { width: 220px; background-color: #ffffff; - border: 1px solid #bbb; + border: 1px solid #cccccc; } select[multiple], @@ -1094,14 +1233,14 @@ textarea::-webkit-input-placeholder { .radio, .checkbox { - min-height: 18px; - padding-left: 18px; + min-height: 20px; + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; - margin-left: -18px; + margin-left: -20px; } .controls > .radio:first-child, @@ -1268,10 +1407,16 @@ textarea.span1, clear: both; } -.controls-row [class*="span"] { +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { float: left; } +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; +} + input[disabled], select[disabled], textarea[disabled], @@ -1289,7 +1434,7 @@ input[type="checkbox"][readonly] { background-color: transparent; } -.control-group.warning > label, +.control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; @@ -1301,14 +1446,17 @@ input[type="checkbox"][readonly] { .control-group.warning select, .control-group.warning textarea { color: #c09853; +} + +.control-group.warning input, +.control-group.warning select, +.control-group.warning textarea { border-color: #c09853; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } -.control-group.warning .checkbox:focus, -.control-group.warning .radio:focus, .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { @@ -1325,7 +1473,7 @@ input[type="checkbox"][readonly] { border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b94a48; @@ -1337,14 +1485,17 @@ input[type="checkbox"][readonly] { .control-group.error select, .control-group.error textarea { color: #b94a48; +} + +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b94a48; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } -.control-group.error .checkbox:focus, -.control-group.error .radio:focus, .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { @@ -1361,7 +1512,7 @@ input[type="checkbox"][readonly] { border-color: #b94a48; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; @@ -1373,14 +1524,17 @@ input[type="checkbox"][readonly] { .control-group.success select, .control-group.success textarea { color: #468847; +} + +.control-group.success input, +.control-group.success select, +.control-group.success textarea { border-color: #468847; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } -.control-group.success .checkbox:focus, -.control-group.success .radio:focus, .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { @@ -1397,16 +1551,55 @@ input[type="checkbox"][readonly] { border-color: #468847; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +.control-group.info .control-label, +.control-group.info .help-block, +.control-group.info .help-inline { + color: #3a87ad; +} + +.control-group.info .checkbox, +.control-group.info .radio, +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + color: #3a87ad; +} + +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + border-color: #3a87ad; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} + +.control-group.info input:focus, +.control-group.info select:focus, +.control-group.info textarea:focus { + border-color: #2d6987; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; +} + +.control-group.info .input-prepend .add-on, +.control-group.info .input-append .add-on { + color: #3a87ad; + background-color: #d9edf7; + border-color: #3a87ad; +} + +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; @@ -1458,6 +1651,17 @@ select:focus:required:invalid:focus { white-space: nowrap; } +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input, +.input-append .dropdown-menu, +.input-prepend .dropdown-menu { + font-size: 14px; +} + .input-append input, .input-prepend input, .input-append select, @@ -1467,11 +1671,10 @@ select:focus:required:invalid:focus { position: relative; margin-bottom: 0; *margin-left: 0; - font-size: 14px; vertical-align: top; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-append input:focus, @@ -1502,8 +1705,9 @@ select:focus:required:invalid:focus { .input-append .add-on, .input-prepend .add-on, .input-append .btn, -.input-prepend .btn { - margin-left: -1px; +.input-prepend .btn, +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -1523,24 +1727,39 @@ select:focus:required:invalid:focus { .input-prepend .add-on:first-child, .input-prepend .btn:first-child { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-append input, .input-append select, .input-append .uneditable-input { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} + +.input-append input + .btn-group .btn:last-child, +.input-append select + .btn-group .btn:last-child, +.input-append .uneditable-input + .btn-group .btn:last-child { + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} + +.input-append .add-on, +.input-append .btn, +.input-append .btn-group { + margin-left: -1px; } .input-append .add-on:last-child, -.input-append .btn:last-child { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-prepend.input-append input, @@ -1551,20 +1770,32 @@ select:focus:required:invalid:focus { border-radius: 0; } +.input-prepend.input-append input + .btn-group .btn, +.input-prepend.input-append select + .btn-group .btn, +.input-prepend.input-append .uneditable-input + .btn-group .btn { + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} + .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-prepend.input-append .add-on:last-child, .input-prepend.input-append .btn:last-child { margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} + +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; } input.search-query { @@ -1706,7 +1937,7 @@ legend + .control-group { .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } @@ -1714,21 +1945,29 @@ legend + .control-group { .form-horizontal .controls { *display: inline-block; *padding-left: 20px; - margin-left: 160px; + margin-left: 180px; *margin-left: 0; } .form-horizontal .controls:first-child { - *padding-left: 160px; + *padding-left: 180px; } .form-horizontal .help-block { - margin-top: 10px; margin-bottom: 0; } +.form-horizontal input + .help-block, +.form-horizontal select + .help-block, +.form-horizontal textarea + .help-block, +.form-horizontal .uneditable-input + .help-block, +.form-horizontal .input-prepend + .help-block, +.form-horizontal .input-append + .help-block { + margin-top: 10px; +} + .form-horizontal .form-actions { - padding-left: 160px; + padding-left: 180px; } table { @@ -1773,6 +2012,10 @@ table { border-top: 2px solid #dddddd; } +.table .table { + background-color: #ffffff; +} + .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1805,39 +2048,48 @@ table { border-top: 0; } -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child > th:first-child, +.table-bordered tbody:first-child tr:first-child > td:first-child { -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; } -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child > th:last-child, +.table-bordered tbody:first-child tr:first-child > td:last-child { -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-topright: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child, -.table-bordered tfoot:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; +.table-bordered thead:last-child tr:last-child > th:first-child, +.table-bordered tbody:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; } -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child, -.table-bordered tfoot:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; } +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; +} + +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; +} + .table-bordered caption + thead tr:first-child th:first-child, .table-bordered caption + tbody tr:first-child td:first-child, .table-bordered colgroup + thead tr:first-child th:first-child, @@ -1853,11 +2105,11 @@ table { .table-bordered colgroup + tbody tr:first-child td:last-child { -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; - -moz-border-right-topleft: 4px; + -moz-border-radius-topright: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } @@ -1866,167 +2118,129 @@ table { background-color: #f5f5f5; } -table [class*=span], -.row-fluid table [class*=span] { +table td[class*="span"], +table th[class*="span"], +.row-fluid table td[class*="span"], +.row-fluid table th[class*="span"] { display: table-cell; float: none; margin-left: 0; } -table .span1 { +.table td.span1, +.table th.span1 { float: none; width: 44px; margin-left: 0; } -table .span2 { +.table td.span2, +.table th.span2 { float: none; width: 124px; margin-left: 0; } -table .span3 { +.table td.span3, +.table th.span3 { float: none; width: 204px; margin-left: 0; } -table .span4 { +.table td.span4, +.table th.span4 { float: none; width: 284px; margin-left: 0; } -table .span5 { +.table td.span5, +.table th.span5 { float: none; width: 364px; margin-left: 0; } -table .span6 { +.table td.span6, +.table th.span6 { float: none; width: 444px; margin-left: 0; } -table .span7 { +.table td.span7, +.table th.span7 { float: none; width: 524px; margin-left: 0; } -table .span8 { +.table td.span8, +.table th.span8 { float: none; width: 604px; margin-left: 0; } -table .span9 { +.table td.span9, +.table th.span9 { float: none; width: 684px; margin-left: 0; } -table .span10 { +.table td.span10, +.table th.span10 { float: none; width: 764px; margin-left: 0; } -table .span11 { +.table td.span11, +.table th.span11 { float: none; width: 844px; margin-left: 0; } -table .span12 { +.table td.span12, +.table th.span12 { float: none; width: 924px; margin-left: 0; } -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} - -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} - -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} - -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} - -table .span17 { - float: none; - width: 1324px; - margin-left: 0; -} - -table .span18 { - float: none; - width: 1404px; - margin-left: 0; -} - -table .span19 { - float: none; - width: 1484px; - margin-left: 0; -} - -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.success td { + background-color: #dff0d8; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table tbody tr.error td { + background-color: #f2dede; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table tbody tr.warning td { + background-color: #fcf8e3; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table tbody tr.info td { + background-color: #d9edf7; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.success:hover td { + background-color: #d0e9c6; } -.table tbody tr.success td { - background-color: #dff0d8; +.table-hover tbody tr.error:hover td { + background-color: #ebcccc; } -.table tbody tr.error td { - background-color: #f2dede; +.table-hover tbody tr.warning:hover td { + background-color: #faf2cc; } -.table tbody tr.info td { - background-color: #d9edf7; +.table-hover tbody tr.info:hover td { + background-color: #c4e3f3; } [class^="icon-"], @@ -2046,12 +2260,18 @@ table .span24 { /* White icons with optional class, or on hover/active states of certain elements */ .icon-white, -.nav > .active > a > [class^="icon-"], -.nav > .active > a > [class*=" icon-"], +.nav-pills > .active > a > [class^="icon-"], +.nav-pills > .active > a > [class*=" icon-"], +.nav-list > .active > a > [class^="icon-"], +.nav-list > .active > a > [class*=" icon-"], +.navbar-inverse .nav > .active > a > [class^="icon-"], +.navbar-inverse .nav > .active > a > [class*=" icon-"], .dropdown-menu > li > a:hover > [class^="icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"], .dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"] { +.dropdown-menu > .active > a > [class*=" icon-"], +.dropdown-submenu:hover > a > [class^="icon-"], +.dropdown-submenu:hover > a > [class*=" icon-"] { background-image: url("../img/glyphicons-halflings-white.png"); } @@ -2689,7 +2909,7 @@ table .span24 { border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu li > a { display: block; padding: 3px 20px; clear: both; @@ -2704,7 +2924,6 @@ table .span24 { .dropdown-submenu:hover > a { color: #ffffff; text-decoration: none; - background-color: #0088cc; background-color: #0081c2; background-image: -moz-linear-gradient(top, #0088cc, #0077b3); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); @@ -2712,23 +2931,22 @@ table .span24 { background-image: -o-linear-gradient(top, #0088cc, #0077b3); background-image: linear-gradient(to bottom, #0088cc, #0077b3); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; - background-color: #0088cc; background-color: #0081c2; - background-image: linear-gradient(to bottom, #0088cc, #0077b3); background-image: -moz-linear-gradient(top, #0088cc, #0077b3); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(to bottom, #0088cc, #0077b3); background-repeat: repeat-x; outline: 0; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } .dropdown-menu .disabled > a, @@ -2740,6 +2958,8 @@ table .span24 { text-decoration: none; cursor: default; background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .open { @@ -2759,7 +2979,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, @@ -2783,10 +3003,20 @@ table .span24 { border-radius: 0 6px 6px 6px; } -.dropdown-submenu:hover .dropdown-menu { +.dropdown-submenu:hover > .dropdown-menu { display: block; } +.dropup .dropdown-submenu > .dropdown-menu { + top: auto; + bottom: 0; + margin-top: 0; + margin-bottom: -2px; + -webkit-border-radius: 5px 5px 5px 0; + -moz-border-radius: 5px 5px 5px 0; + border-radius: 5px 5px 5px 0; +} + .dropdown-submenu > a:after { display: block; float: right; @@ -2805,12 +3035,25 @@ table .span24 { border-left-color: #ffffff; } +.dropdown-submenu.pull-left { + float: none; +} + +.dropdown-submenu.pull-left > .dropdown-menu { + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} + .dropdown .dropdown-menu .nav-header { padding-right: 20px; padding-left: 20px; } .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -2866,7 +3109,6 @@ table .span24 { position: relative; height: 0; overflow: hidden; - overflow: visible \9; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; -o-transition: height 0.35s ease; @@ -2907,12 +3149,11 @@ button.close { .btn { display: inline-block; *display: inline; - padding: 4px 14px; + padding: 4px 12px; margin-bottom: 0; *margin-left: .3em; font-size: 14px; line-height: 20px; - *line-height: 20px; color: #333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); @@ -2920,22 +3161,22 @@ button.close { cursor: pointer; background-color: #f5f5f5; *background-color: #e6e6e6; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); background-repeat: repeat-x; border: 1px solid #bbbbbb; *border: 0; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-bottom-color: #a2a2a2; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); *zoom: 1; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -2964,10 +3205,6 @@ button.close { .btn:hover { color: #333333; text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; @@ -2983,8 +3220,6 @@ button.close { .btn.active, .btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -2995,7 +3230,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -3005,32 +3239,42 @@ button.close { } .btn-large { - padding: 9px 14px; - font-size: 16px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + padding: 11px 19px; + font-size: 17.5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.btn-large [class^="icon-"] { - margin-top: 2px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; +} + +.btn-small { + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-small { - padding: 3px 9px; - font-size: 12px; - line-height: 18px; +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { + margin-top: 0; } -.btn-small [class^="icon-"] { - margin-top: 0; +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] { + margin-top: -1px; } .btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 16px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .btn-block { @@ -3047,6 +3291,12 @@ button.close { margin-top: 5px; } +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; +} + .btn-primary.active, .btn-warning.active, .btn-danger.active, @@ -3066,16 +3316,16 @@ button.close { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #006dcc; *background-color: #0044cc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); background-image: -o-linear-gradient(top, #0088cc, #0044cc); background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-repeat: repeat-x; border-color: #0044cc #0044cc #002a80; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-primary:hover, @@ -3098,16 +3348,16 @@ button.close { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; *background-color: #f89406; + background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-repeat: repeat-x; border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-warning:hover, @@ -3130,16 +3380,16 @@ button.close { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; *background-color: #bd362f; + background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); background-repeat: repeat-x; border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-danger:hover, @@ -3162,16 +3412,16 @@ button.close { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; *background-color: #51a351; + background-image: -moz-linear-gradient(top, #62c462, #51a351); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); background-image: -o-linear-gradient(top, #62c462, #51a351); background-image: linear-gradient(to bottom, #62c462, #51a351); - background-image: -moz-linear-gradient(top, #62c462, #51a351); background-repeat: repeat-x; border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-success:hover, @@ -3194,16 +3444,16 @@ button.close { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; *background-color: #2f96b4; + background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); background-repeat: repeat-x; border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-info:hover, @@ -3226,16 +3476,16 @@ button.close { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #363636; *background-color: #222222; + background-image: -moz-linear-gradient(top, #444444, #222222); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); background-image: -webkit-linear-gradient(top, #444444, #222222); background-image: -o-linear-gradient(top, #444444, #222222); background-image: linear-gradient(to bottom, #444444, #222222); - background-image: -moz-linear-gradient(top, #444444, #222222); background-repeat: repeat-x; border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .btn-inverse:hover, @@ -3284,7 +3534,8 @@ input[type="submit"].btn.btn-mini { } .btn-link, -.btn-link:active { +.btn-link:active, +.btn-link[disabled] { background-color: transparent; background-image: none; -webkit-box-shadow: none; @@ -3307,11 +3558,20 @@ input[type="submit"].btn.btn-mini { background-color: transparent; } +.btn-link[disabled]:hover { + color: #333333; + text-decoration: none; +} + .btn-group { position: relative; + display: inline-block; + *display: inline; *margin-left: .3em; font-size: 0; white-space: nowrap; + vertical-align: middle; + *zoom: 1; } .btn-group:first-child { @@ -3328,17 +3588,9 @@ input[type="submit"].btn.btn-mini { font-size: 0; } -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-toolbar .btn + .btn, -.btn-toolbar .btn-group + .btn, -.btn-toolbar .btn + .btn-group { +.btn-toolbar > .btn + .btn, +.btn-toolbar > .btn-group + .btn, +.btn-toolbar > .btn + .btn-group { margin-left: 5px; } @@ -3354,20 +3606,21 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn, -.btn-group > .dropdown-menu { +.btn-group > .dropdown-menu, +.btn-group > .popover { font-size: 14px; } .btn-group > .btn-mini { - font-size: 11px; + font-size: 10.5px; } .btn-group > .btn-small { - font-size: 12px; + font-size: 11.9px; } .btn-group > .btn-large { - font-size: 16px; + font-size: 17.5px; } .btn-group > .btn:first-child { @@ -3504,8 +3757,7 @@ input[type="submit"].btn.btn-mini { } .dropup .btn-large .caret { - border-top: 0; - border-bottom: 5px solid #000000; + border-bottom-width: 5px; } .btn-primary .caret, @@ -3526,39 +3778,39 @@ input[type="submit"].btn.btn-mini { *zoom: 1; } -.btn-group-vertical .btn { +.btn-group-vertical > .btn { display: block; float: none; - width: 100%; + max-width: 100%; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.btn-group-vertical .btn + .btn { +.btn-group-vertical > .btn + .btn { margin-top: -1px; margin-left: 0; } -.btn-group-vertical .btn:first-child { +.btn-group-vertical > .btn:first-child { -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.btn-group-vertical .btn:last-child { +.btn-group-vertical > .btn:last-child { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.btn-group-vertical .btn-large:first-child { +.btn-group-vertical > .btn-large:first-child { -webkit-border-radius: 6px 6px 0 0; -moz-border-radius: 6px 6px 0 0; border-radius: 6px 6px 0 0; } -.btn-group-vertical .btn-large:last-child { +.btn-group-vertical > .btn-large:last-child { -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; @@ -3567,7 +3819,6 @@ input[type="submit"].btn.btn-mini { .alert { padding: 8px 35px 8px 14px; margin-bottom: 20px; - color: #c09853; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; @@ -3576,6 +3827,11 @@ input[type="submit"].btn.btn-mini { border-radius: 4px; } +.alert, +.alert h4 { + color: #c09853; +} + .alert h4 { margin: 0; } @@ -3593,6 +3849,10 @@ input[type="submit"].btn.btn-mini { border-color: #d6e9c6; } +.alert-success h4 { + color: #468847; +} + .alert-danger, .alert-error { color: #b94a48; @@ -3600,12 +3860,21 @@ input[type="submit"].btn.btn-mini { border-color: #eed3d7; } +.alert-danger h4, +.alert-error h4 { + color: #b94a48; +} + .alert-info { color: #3a87ad; background-color: #d9edf7; border-color: #bce8f1; } +.alert-info h4 { + color: #3a87ad; +} + .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -3635,6 +3904,10 @@ input[type="submit"].btn.btn-mini { background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} + .nav > .pull-right { float: right; } @@ -3678,7 +3951,8 @@ input[type="submit"].btn.btn-mini { background-color: #0088cc; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } @@ -4018,7 +4292,6 @@ input[type="submit"].btn.btn-mini { *z-index: 2; margin-bottom: 20px; overflow: visible; - color: #555555; } .navbar-inner { @@ -4036,18 +4309,31 @@ input[type="submit"].btn.btn-mini { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + *zoom: 1; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); } +.navbar-inner:before, +.navbar-inner:after { + display: table; + line-height: 0; + content: ""; +} + +.navbar-inner:after { + clear: both; +} + .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; + overflow: visible; } .navbar .brand { @@ -4057,7 +4343,7 @@ input[type="submit"].btn.btn-mini { margin-left: -20px; font-size: 20px; font-weight: 200; - color: #555555; + color: #777777; text-shadow: 0 1px 0 #ffffff; } @@ -4068,10 +4354,11 @@ input[type="submit"].btn.btn-mini { .navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } .navbar-link { - color: #555555; + color: #777777; } .navbar-link:hover { @@ -4087,11 +4374,13 @@ input[type="submit"].btn.btn-mini { .navbar .btn, .navbar .btn-group { - margin-top: 6px; + margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn { + margin-top: 0; } .navbar-form { @@ -4132,7 +4421,7 @@ input[type="submit"].btn.btn-mini { .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } @@ -4162,7 +4451,6 @@ input[type="submit"].btn.btn-mini { .navbar-static-top { position: static; - width: 100%; margin-bottom: 0; } @@ -4182,9 +4470,12 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner, .navbar-static-top .navbar-inner { - border: 0; + border-width: 0 0 1px; +} + +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; } .navbar-fixed-top .navbar-inner, @@ -4208,9 +4499,9 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); } .navbar-fixed-bottom { @@ -4218,9 +4509,9 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); } .navbar .nav { @@ -4233,6 +4524,7 @@ input[type="submit"].btn.btn-mini { .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { @@ -4242,7 +4534,7 @@ input[type="submit"].btn.btn-mini { .navbar .nav > li > a { float: none; padding: 10px 15px 10px; - color: #555555; + color: #777777; text-decoration: none; text-shadow: 0 1px 0 #ffffff; } @@ -4279,16 +4571,16 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #ededed; *background-color: #e5e5e5; + background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); background-repeat: repeat-x; border-color: #e5e5e5 #e5e5e5 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -4364,6 +4656,11 @@ input[type="submit"].btn.btn-mini { border-bottom: 0; } +.navbar .nav li.dropdown > a:hover .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} + .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { @@ -4372,8 +4669,8 @@ input[type="submit"].btn.btn-mini { } .navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; + border-top-color: #777777; + border-bottom-color: #777777; } .navbar .nav li.dropdown.open > .dropdown-toggle .caret, @@ -4412,10 +4709,6 @@ input[type="submit"].btn.btn-mini { border-radius: 6px 0 6px 6px; } -.navbar-inverse { - color: #999999; -} - .navbar-inverse .navbar-inner { background-color: #1b1b1b; background-image: -moz-linear-gradient(top, #222222, #111111); @@ -4425,7 +4718,7 @@ input[type="submit"].btn.btn-mini { background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; border-color: #252525; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); } .navbar-inverse .brand, @@ -4439,6 +4732,14 @@ input[type="submit"].btn.btn-mini { color: #ffffff; } +.navbar-inverse .brand { + color: #999999; +} + +.navbar-inverse .navbar-text { + color: #999999; +} + .navbar-inverse .nav > li > a:focus, .navbar-inverse .nav > li > a:hover { color: #ffffff; @@ -4472,6 +4773,11 @@ input[type="submit"].btn.btn-mini { background-color: #111111; } +.navbar-inverse .nav li.dropdown > a:hover .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} + .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { border-top-color: #999999; border-bottom-color: #999999; @@ -4527,16 +4833,16 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e0e0e; *background-color: #040404; + background-image: -moz-linear-gradient(top, #151515, #040404); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); background-image: -webkit-linear-gradient(top, #151515, #040404); background-image: -o-linear-gradient(top, #151515, #040404); background-image: linear-gradient(to bottom, #151515, #040404); - background-image: -moz-linear-gradient(top, #151515, #040404); background-repeat: repeat-x; border-color: #040404 #040404 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .navbar-inverse .btn-navbar:hover, @@ -4564,24 +4870,23 @@ input[type="submit"].btn.btn-mini { border-radius: 4px; } -.breadcrumb li { +.breadcrumb > li { display: inline-block; *display: inline; text-shadow: 0 1px 0 #ffffff; *zoom: 1; } -.breadcrumb .divider { +.breadcrumb > li > .divider { padding: 0 5px; color: #ccc; } -.breadcrumb .active { +.breadcrumb > .active { color: #999999; } .pagination { - height: 40px; margin: 20px 0; } @@ -4590,63 +4895,69 @@ input[type="submit"].btn.btn-mini { *display: inline; margin-bottom: 0; margin-left: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; *zoom: 1; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } -.pagination li { +.pagination ul > li { display: inline; } -.pagination a, -.pagination span { +.pagination ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 38px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; background-color: #ffffff; border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a, -.pagination .active span { +.pagination ul > li > a:hover, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a, -.pagination .active span { +.pagination ul > .active > a, +.pagination ul > .active > span { color: #999999; cursor: default; } -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { +.pagination ul > .disabled > span, +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover { color: #999999; cursor: default; background-color: transparent; } -.pagination li:first-child a, -.pagination li:first-child span { +.pagination ul > li:first-child > a, +.pagination ul > li:first-child > span { border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -moz-border-radius-topleft: 4px; } -.pagination li:last-child a, -.pagination li:last-child span { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.pagination ul > li:last-child > a, +.pagination ul > li:last-child > span { + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-bottomright: 4px; } .pagination-centered { @@ -4657,6 +4968,68 @@ input[type="submit"].btn.btn-mini { text-align: right; } +.pagination-large ul > li > a, +.pagination-large ul > li > span { + padding: 11px 19px; + font-size: 17.5px; +} + +.pagination-large ul > li:first-child > a, +.pagination-large ul > li:first-child > span { + -webkit-border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; + -webkit-border-top-left-radius: 6px; + border-top-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + -moz-border-radius-topleft: 6px; +} + +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; + -moz-border-radius-topright: 6px; + -moz-border-radius-bottomright: 6px; +} + +.pagination-mini ul > li:first-child > a, +.pagination-small ul > li:first-child > a, +.pagination-mini ul > li:first-child > span, +.pagination-small ul > li:first-child > span { + -webkit-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; + -webkit-border-top-left-radius: 3px; + border-top-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + -moz-border-radius-topleft: 3px; +} + +.pagination-mini ul > li:last-child > a, +.pagination-small ul > li:last-child > a, +.pagination-mini ul > li:last-child > span, +.pagination-small ul > li:last-child > span { + -webkit-border-top-right-radius: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; + -moz-border-radius-topright: 3px; + -moz-border-radius-bottomright: 3px; +} + +.pagination-small ul > li > a, +.pagination-small ul > li > span { + padding: 2px 10px; + font-size: 11.9px; +} + +.pagination-mini ul > li > a, +.pagination-mini ul > li > span { + padding: 0 6px; + font-size: 10.5px; +} + .pager { margin: 20px 0; text-align: center; @@ -4679,7 +5052,8 @@ input[type="submit"].btn.btn-mini { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -4689,42 +5063,29 @@ input[type="submit"].btn.btn-mini { border-radius: 15px; } -.pager a:hover { +.pager li > a:hover { text-decoration: none; background-color: #f5f5f5; } -.pager .next a { +.pager .next > a, +.pager .next > span { float: right; } -.pager .previous a { +.pager .previous > a, +.pager .previous > span { float: left; } -.pager .disabled a, -.pager .disabled a:hover { +.pager .disabled > a, +.pager .disabled > a:hover, +.pager .disabled > span { color: #999999; cursor: default; background-color: #fff; } -.modal-open .dropdown-menu { - z-index: 2050; -} - -.modal-open .dropdown.open { - *z-index: 2050; -} - -.modal-open .popover { - z-index: 2060; -} - -.modal-open .tooltip { - z-index: 2080; -} - .modal-backdrop { position: fixed; top: 0; @@ -4747,12 +5108,11 @@ input[type="submit"].btn.btn-mini { .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; width: 560px; - margin: -250px 0 0 -280px; - overflow: auto; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -4760,6 +5120,7 @@ input[type="submit"].btn.btn-mini { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; + outline: none; -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -4777,7 +5138,7 @@ input[type="submit"].btn.btn-mini { } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { @@ -4795,6 +5156,7 @@ input[type="submit"].btn.btn-mini { } .modal-body { + position: relative; max-height: 400px; padding: 15px; overflow-y: auto; @@ -4839,6 +5201,10 @@ input[type="submit"].btn.btn-mini { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} + .tooltip { position: absolute; z-index: 1030; @@ -4931,6 +5297,8 @@ input[type="submit"].btn.btn-mini { display: none; width: 236px; padding: 1px; + text-align: left; + white-space: normal; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); @@ -4946,7 +5314,7 @@ input[type="submit"].btn.btn-mini { } .popover.top { - margin-bottom: 10px; + margin-top: -10px; } .popover.right { @@ -4958,7 +5326,7 @@ input[type="submit"].btn.btn-mini { } .popover.left { - margin-right: 10px; + margin-left: -10px; } .popover-title { @@ -4978,85 +5346,87 @@ input[type="submit"].btn.btn-mini { padding: 9px 14px; } -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; -} - .popover .arrow, .popover .arrow:after { position: absolute; - display: inline-block; + display: block; width: 0; height: 0; border-color: transparent; border-style: solid; } +.popover .arrow { + border-width: 11px; +} + .popover .arrow:after { - z-index: -1; + border-width: 10px; content: ""; } .popover.top .arrow { - bottom: -10px; + bottom: -11px; left: 50%; - margin-left: -10px; - border-top-color: #ffffff; - border-width: 10px 10px 0; + margin-left: -11px; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + border-bottom-width: 0; } .popover.top .arrow:after { - bottom: -1px; - left: -11px; - border-top-color: rgba(0, 0, 0, 0.25); - border-width: 11px 11px 0; + bottom: 1px; + margin-left: -10px; + border-top-color: #ffffff; + border-bottom-width: 0; } .popover.right .arrow { top: 50%; - left: -10px; - margin-top: -10px; - border-right-color: #ffffff; - border-width: 10px 10px 10px 0; + left: -11px; + margin-top: -11px; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); + border-left-width: 0; } .popover.right .arrow:after { - bottom: -11px; - left: -1px; - border-right-color: rgba(0, 0, 0, 0.25); - border-width: 11px 11px 11px 0; + bottom: -10px; + left: 1px; + border-right-color: #ffffff; + border-left-width: 0; } .popover.bottom .arrow { - top: -10px; + top: -11px; left: 50%; - margin-left: -10px; - border-bottom-color: #ffffff; - border-width: 0 10px 10px; + margin-left: -11px; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + border-top-width: 0; } .popover.bottom .arrow:after { - top: -1px; - left: -11px; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-width: 0 11px 11px; + top: 1px; + margin-left: -10px; + border-bottom-color: #ffffff; + border-top-width: 0; } .popover.left .arrow { top: 50%; - right: -10px; - margin-top: -10px; - border-left-color: #ffffff; - border-width: 10px 0 10px 10px; + right: -11px; + margin-top: -11px; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); + border-right-width: 0; } .popover.left .arrow:after { - right: -1px; - bottom: -11px; - border-left-color: rgba(0, 0, 0, 0.25); - border-width: 11px 0 11px 11px; + right: 1px; + bottom: -10px; + border-left-color: #ffffff; + border-right-width: 0; } .thumbnails { @@ -5122,8 +5492,47 @@ a.thumbnail:hover { color: #555555; } +.media, +.media-body { + overflow: hidden; + *overflow: visible; + zoom: 1; +} + +.media, +.media .media { + margin-top: 15px; +} + +.media:first-child { + margin-top: 0; +} + +.media-object { + display: block; +} + +.media-heading { + margin: 0 0 5px; +} + +.media .pull-left { + margin-right: 10px; +} + +.media .pull-right { + margin-left: 10px; +} + +.media-list { + margin-left: 0; + list-style: none; +} + .label, .badge { + display: inline-block; + padding: 2px 4px; font-size: 11.844px; font-weight: bold; line-height: 14px; @@ -5135,19 +5544,24 @@ a.thumbnail:hover { } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-right: 9px; + padding-left: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} + a.label:hover, a.badge:hover { color: #ffffff; @@ -5275,7 +5689,7 @@ a.badge:hover { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -5296,7 +5710,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #149bdf, #0480be); background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); @@ -5345,7 +5759,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } .progress-danger.progress-striped .bar, @@ -5367,7 +5781,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #62c462, #57a957); background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } .progress-success.progress-striped .bar, @@ -5389,7 +5803,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #5bc0de, #339bb9); background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } .progress-info.progress-striped .bar, @@ -5411,7 +5825,7 @@ a.badge:hover { background-image: -o-linear-gradient(top, #fbb450, #f89406); background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } .progress-warning.progress-striped .bar, @@ -5466,7 +5880,7 @@ a.badge:hover { overflow: hidden; } -.carousel .item { +.carousel-inner > .item { position: relative; display: none; -webkit-transition: 0.6s ease-in-out left; @@ -5475,46 +5889,46 @@ a.badge:hover { transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img { display: block; line-height: 1; } -.carousel .active, -.carousel .next, -.carousel .prev { +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { display: block; } -.carousel .active { +.carousel-inner > .active { left: 0; } -.carousel .next, -.carousel .prev { +.carousel-inner > .next, +.carousel-inner > .prev { position: absolute; top: 0; width: 100%; } -.carousel .next { +.carousel-inner > .next { left: 100%; } -.carousel .prev { +.carousel-inner > .prev { left: -100%; } -.carousel .next.left, -.carousel .prev.right { +.carousel-inner > .next.left, +.carousel-inner > .prev.right { left: 0; } -.carousel .active.left { +.carousel-inner > .active.left { left: -100%; } -.carousel .active.right { +.carousel-inner > .active.right { left: 100%; } @@ -5578,6 +5992,10 @@ a.badge:hover { .hero-unit { padding: 60px; margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: 30px; + color: inherit; background-color: #eeeeee; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -5592,11 +6010,8 @@ a.badge:hover { color: inherit; } -.hero-unit p { - font-size: 18px; - font-weight: 200; +.hero-unit li { line-height: 30px; - color: inherit; } .pull-right { diff --git a/nikola/data/themes/default/assets/css/slides.css b/nikola/data/themes/default/assets/css/slides.css new file mode 100644 index 0000000..272c83e --- /dev/null +++ b/nikola/data/themes/default/assets/css/slides.css @@ -0,0 +1,11 @@ +.slides_container { + display: block; + margin-left: auto; + margin-right: auto; + max-width: 80%; + width: 400px; + height: 300px; +} +.slide-current { + font-weight: bold; +} diff --git a/nikola/data/themes/default/assets/js/bootstrap.js b/nikola/data/themes/default/assets/js/bootstrap.js index 7f303eb..6c15a58 100644 --- a/nikola/data/themes/default/assets/js/bootstrap.js +++ b/nikola/data/themes/default/assets/js/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.1.0 + * bootstrap-transition.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -20,13 +20,13 @@ !function ($) { - $(function () { + "use strict"; // jshint ;_; - "use strict"; // jshint ;_; + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) + * ======================================================= */ - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ + $(function () { $.support.transition = (function () { @@ -58,7 +58,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.1.0 + * bootstrap-alert.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -127,6 +127,8 @@ /* ALERT PLUGIN DEFINITION * ======================= */ + var old = $.fn.alert + $.fn.alert = function (option) { return this.each(function () { var $this = $(this) @@ -139,15 +141,22 @@ $.fn.alert.Constructor = Alert + /* ALERT NO CONFLICT + * ================= */ + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + /* ALERT DATA-API * ============== */ - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) + $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) }(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.1.0 + * bootstrap-button.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -199,7 +208,7 @@ } Button.prototype.toggle = function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') + var $parent = this.$element.closest('[data-toggle="buttons-radio"]') $parent && $parent .find('.active') @@ -212,6 +221,8 @@ /* BUTTON PLUGIN DEFINITION * ======================== */ + var old = $.fn.button + $.fn.button = function (option) { return this.each(function () { var $this = $(this) @@ -230,19 +241,26 @@ $.fn.button.Constructor = Button + /* BUTTON NO CONFLICT + * ================== */ + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + /* BUTTON DATA-API * =============== */ - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) + $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.1.0 + * bootstrap-carousel.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -272,7 +290,6 @@ var Carousel = function (element, options) { this.$element = $(element) this.options = options - this.options.slide && this.slide(this.options.slide) this.options.pause == 'hover' && this.$element .on('mouseenter', $.proxy(this.pause, this)) .on('mouseleave', $.proxy(this.cycle, this)) @@ -337,9 +354,7 @@ , direction = type == 'next' ? 'left' : 'right' , fallback = type == 'next' ? 'first' : 'last' , that = this - , e = $.Event('slide', { - relatedTarget: $next[0] - }) + , e this.sliding = true @@ -347,6 +362,10 @@ $next = $next.length ? $next : this.$element.find('.item')[fallback]() + e = $.Event('slide', { + relatedTarget: $next[0] + }) + if ($next.hasClass('active')) return if ($.support.transition && this.$element.hasClass('slide')) { @@ -382,6 +401,8 @@ /* CAROUSEL PLUGIN DEFINITION * ========================== */ + var old = $.fn.carousel + $.fn.carousel = function (option) { return this.each(function () { var $this = $(this) @@ -403,21 +424,27 @@ $.fn.carousel.Constructor = Carousel + /* CAROUSEL NO CONFLICT + * ==================== */ + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + /* CAROUSEL DATA-API * ================= */ - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) + $(document).on('click.carousel.data-api', '[data-slide]', function (e) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , options = $.extend({}, $target.data(), $this.data()) + $target.carousel(options) + e.preventDefault() }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.1.0 + * bootstrap-collapse.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -538,8 +565,10 @@ } - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ + /* COLLAPSE PLUGIN DEFINITION + * ========================== */ + + var old = $.fn.collapse $.fn.collapse = function (option) { return this.each(function () { @@ -558,23 +587,30 @@ $.fn.collapse.Constructor = Collapse - /* COLLAPSIBLE DATA-API + /* COLLAPSE NO CONFLICT * ==================== */ - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + /* COLLAPSE DATA-API + * ================= */ + + $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + , target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + , option = $(target).data('collapse') ? 'toggle' : $this.data() + $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + $(target).collapse(option) }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.1.0 + * bootstrap-dropdown.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -628,9 +664,10 @@ if (!isActive) { $parent.toggleClass('open') - $this.focus() } + $this.focus() + return false } @@ -657,7 +694,7 @@ if (!isActive || (isActive && e.keyCode == 27)) return $this.click() - $items = $('[role=menu] li:not(.divider) a', $parent) + $items = $('[role=menu] li:not(.divider):visible a', $parent) if (!$items.length) return @@ -675,8 +712,9 @@ } function clearMenus() { - getParent($(toggle)) - .removeClass('open') + $(toggle).each(function () { + getParent($(this)).removeClass('open') + }) } function getParent($this) { @@ -685,7 +723,7 @@ if (!selector) { selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 } $parent = $(selector) @@ -698,6 +736,8 @@ /* DROPDOWN PLUGIN DEFINITION * ========================== */ + var old = $.fn.dropdown + $.fn.dropdown = function (option) { return this.each(function () { var $this = $(this) @@ -710,20 +750,27 @@ $.fn.dropdown.Constructor = Dropdown + /* DROPDOWN NO CONFLICT + * ==================== */ + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + /* APPLY TO STANDARD DROPDOWN ELEMENTS * =================================== */ - $(function () { - $('html') - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - $('body') - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - }) + $(document) + .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) + .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(window.jQuery);/* ========================================================= - * bootstrap-modal.js v2.1.0 + * bootstrap-modal.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -773,8 +820,6 @@ if (this.isShown || e.isDefaultPrevented()) return - $('body').addClass('modal-open') - this.isShown = true this.escape() @@ -796,13 +841,12 @@ that.$element .addClass('in') .attr('aria-hidden', false) - .focus() that.enforceFocus() transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') + that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : + that.$element.focus().trigger('shown') }) } @@ -820,8 +864,6 @@ this.isShown = false - $('body').removeClass('modal-open') - this.escape() $(document).off('focusin.modal') @@ -891,9 +933,11 @@ this.$backdrop = $('
') .appendTo(document.body) - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } + this.$backdrop.click( + this.options.backdrop == 'static' ? + $.proxy(this.$element[0].focus, this.$element[0]) + : $.proxy(this.hide, this) + ) if (doAnimate) this.$backdrop[0].offsetWidth // force reflow @@ -920,6 +964,8 @@ /* MODAL PLUGIN DEFINITION * ======================= */ + var old = $.fn.modal + $.fn.modal = function (option) { return this.each(function () { var $this = $(this) @@ -940,28 +986,36 @@ $.fn.modal.Constructor = Modal + /* MODAL NO CONFLICT + * ================= */ + + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } + + /* MODAL DATA-API * ============== */ - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + , href = $this.attr('href') + , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) - e.preventDefault() + e.preventDefault() - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) + $target + .modal(option) + .one('hide', function () { + $this.focus() + }) }) -}(window.jQuery);/* =========================================================== - * bootstrap-tooltip.js v2.1.0 +}(window.jQuery); +/* =========================================================== + * bootstrap-tooltip.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -1081,9 +1135,9 @@ inside = /in/.test(placement) $tip - .remove() + .detach() .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) + .insertAfter(this.$element) pos = this.getPosition(inside) @@ -1106,7 +1160,7 @@ } $tip - .css(tp) + .offset(tp) .addClass(placement) .addClass('in') } @@ -1128,18 +1182,18 @@ function removeWithAnimation() { var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() + $tip.off($.support.transition.end).detach() }, 500) $tip.one($.support.transition.end, function () { clearTimeout(timeout) - $tip.remove() + $tip.detach() }) } $.support.transition && this.$tip.hasClass('fade') ? removeWithAnimation() : - $tip.remove() + $tip.detach() return this } @@ -1197,8 +1251,9 @@ this.enabled = !this.enabled } - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() + , toggle: function (e) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + self[self.tip().hasClass('in') ? 'hide' : 'show']() } , destroy: function () { @@ -1211,6 +1266,8 @@ /* TOOLTIP PLUGIN DEFINITION * ========================= */ + var old = $.fn.tooltip + $.fn.tooltip = function ( option ) { return this.each(function () { var $this = $(this) @@ -1231,12 +1288,20 @@ , trigger: 'hover' , title: '' , delay: 0 - , html: true + , html: false } -}(window.jQuery); -/* =========================================================== - * bootstrap-popover.js v2.1.0 + + /* TOOLTIP NO CONFLICT + * =================== */ + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(window.jQuery);/* =========================================================== + * bootstrap-popover.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1281,7 +1346,7 @@ , content = this.getContent() $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) $tip.removeClass('fade top bottom left right in') } @@ -1318,6 +1383,8 @@ /* POPOVER PLUGIN DEFINITION * ======================= */ + var old = $.fn.popover + $.fn.popover = function (option) { return this.each(function () { var $this = $(this) @@ -1334,11 +1401,20 @@ placement: 'right' , trigger: 'click' , content: '' - , template: '

' + , template: '

' }) + + /* POPOVER NO CONFLICT + * =================== */ + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + }(window.jQuery);/* ============================================================= - * bootstrap-scrollspy.js v2.1.0 + * bootstrap-scrollspy.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1398,7 +1474,7 @@ , $href = /^#\w/.test(href) && $(href) return ( $href && $href.length - && [[ $href.position().top, href ]] ) || null + && [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { @@ -1460,6 +1536,8 @@ /* SCROLLSPY PLUGIN DEFINITION * =========================== */ + var old = $.fn.scrollspy + $.fn.scrollspy = function (option) { return this.each(function () { var $this = $(this) @@ -1477,6 +1555,15 @@ } + /* SCROLLSPY NO CONFLICT + * ===================== */ + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this + } + + /* SCROLLSPY DATA-API * ================== */ @@ -1488,7 +1575,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.1.0 + * bootstrap-tab.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1538,7 +1625,7 @@ if ( $this.parent('li').hasClass('active') ) return - previous = $ul.find('.active a').last()[0] + previous = $ul.find('.active:last a')[0] e = $.Event('show', { relatedTarget: previous @@ -1599,6 +1686,8 @@ /* TAB PLUGIN DEFINITION * ===================== */ + var old = $.fn.tab + $.fn.tab = function ( option ) { return this.each(function () { var $this = $(this) @@ -1611,18 +1700,25 @@ $.fn.tab.Constructor = Tab + /* TAB NO CONFLICT + * =============== */ + + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + /* TAB DATA-API * ============ */ - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) + $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.1.0 + * bootstrap-typeahead.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1656,8 +1752,8 @@ this.sorter = this.options.sorter || this.sorter this.highlighter = this.options.highlighter || this.highlighter this.updater = this.options.updater || this.updater - this.$menu = $(this.options.menu).appendTo('body') this.source = this.options.source + this.$menu = $(this.options.menu) this.shown = false this.listen() } @@ -1679,16 +1775,18 @@ } , show: function () { - var pos = $.extend({}, this.$element.offset(), { + var pos = $.extend({}, this.$element.position(), { height: this.$element[0].offsetHeight }) - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) + this.$menu + .insertAfter(this.$element) + .css({ + top: pos.top + pos.height + , left: pos.left + }) + .show() - this.$menu.show() this.shown = true return this } @@ -1797,7 +1895,7 @@ .on('keypress', $.proxy(this.keypress, this)) .on('keyup', $.proxy(this.keyup, this)) - if ($.browser.webkit || $.browser.msie) { + if (this.eventSupported('keydown')) { this.$element.on('keydown', $.proxy(this.keydown, this)) } @@ -1806,6 +1904,15 @@ .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) } + , eventSupported: function(eventName) { + var isSupported = eventName in this.$element + if (!isSupported) { + this.$element.setAttribute(eventName, 'return;') + isSupported = typeof this.$element[eventName] === 'function' + } + return isSupported + } + , move: function (e) { if (!this.shown) return @@ -1831,7 +1938,7 @@ } , keydown: function (e) { - this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27]) + this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]) this.move(e) } @@ -1844,6 +1951,9 @@ switch(e.keyCode) { case 40: // down arrow case 38: // up arrow + case 16: // shift + case 17: // ctrl + case 18: // alt break case 9: // tab @@ -1887,6 +1997,8 @@ /* TYPEAHEAD PLUGIN DEFINITION * =========================== */ + var old = $.fn.typeahead + $.fn.typeahead = function (option) { return this.each(function () { var $this = $(this) @@ -1908,21 +2020,28 @@ $.fn.typeahead.Constructor = Typeahead - /* TYPEAHEAD DATA-API + /* TYPEAHEAD NO CONFLICT + * =================== */ + + $.fn.typeahead.noConflict = function () { + $.fn.typeahead = old + return this + } + + + /* TYPEAHEAD DATA-API * ================== */ - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) + $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { + var $this = $(this) + if ($this.data('typeahead')) return + e.preventDefault() + $this.typeahead($this.data()) }) }(window.jQuery); /* ========================================================== - * bootstrap-affix.js v2.1.0 + * bootstrap-affix.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. @@ -1951,7 +2070,9 @@ var Affix = function (element, options) { this.options = $.extend({}, $.fn.affix.defaults, options) - this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) + this.$window = $(window) + .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) this.$element = $(element) this.checkPosition() } @@ -1989,6 +2110,8 @@ /* AFFIX PLUGIN DEFINITION * ======================= */ + var old = $.fn.affix + $.fn.affix = function (option) { return this.each(function () { var $this = $(this) @@ -2006,6 +2129,15 @@ } + /* AFFIX NO CONFLICT + * ================= */ + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + /* AFFIX DATA-API * ============== */ diff --git a/nikola/data/themes/default/assets/js/slides.jquery.js b/nikola/data/themes/default/assets/js/slides.jquery.js new file mode 100755 index 0000000..f2e09c8 --- /dev/null +++ b/nikola/data/themes/default/assets/js/slides.jquery.js @@ -0,0 +1,555 @@ +/* +* Slides, A Slideshow Plugin for jQuery +* Intructions: http://slidesjs.com +* By: Nathan Searles, http://nathansearles.com +* Version: 1.1.9 +* Updated: September 5th, 2011 +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +(function($){ + $.fn.slides = function( option ) { + // override defaults with specified option + option = $.extend( {}, $.fn.slides.option, option ); + + return this.each(function(){ + // wrap slides in control container, make sure slides are block level + $('.' + option.container, $(this)).children().wrapAll('
'); + + var elem = $(this), + control = $('.slides_control',elem), + total = control.children().size(), + width = control.children().outerWidth(), + height = control.children().outerHeight(), + start = option.start - 1, + effect = option.effect.indexOf(',') < 0 ? option.effect : option.effect.replace(' ', '').split(',')[0], + paginationEffect = option.effect.indexOf(',') < 0 ? effect : option.effect.replace(' ', '').split(',')[1], + next = 0, prev = 0, number = 0, current = 0, loaded, active, clicked, position, direction, imageParent, pauseTimeout, playInterval; + + // is there only one slide? + if (total < 2) { + // Fade in .slides_container + $('.' + option.container, $(this)).fadeIn(option.fadeSpeed, option.fadeEasing, function(){ + // let the script know everything is loaded + loaded = true; + // call the loaded funciton + option.slidesLoaded(); + }); + // Hide the next/previous buttons + $('.' + option.next + ', .' + option.prev).fadeOut(0); + return false; + } + + // animate slides + function animate(direction, effect, clicked) { + if (!active && loaded) { + active = true; + // start of animation + option.animationStart(current + 1); + switch(direction) { + case 'next': + // change current slide to previous + prev = current; + // get next from current + 1 + next = current + 1; + // if last slide, set next to first slide + next = total === next ? 0 : next; + // set position of next slide to right of previous + position = width*2; + // distance to slide based on width of slides + direction = -width*2; + // store new current slide + current = next; + break; + case 'prev': + // change current slide to previous + prev = current; + // get next from current - 1 + next = current - 1; + // if first slide, set next to last slide + next = next === -1 ? total-1 : next; + // set position of next slide to left of previous + position = 0; + // distance to slide based on width of slides + direction = 0; + // store new current slide + current = next; + break; + case 'pagination': + // get next from pagination item clicked, convert to number + next = parseInt(clicked,10); + // get previous from pagination item with class of current + prev = $('.' + option.paginationClass + ' li.'+ option.currentClass +' a', elem).attr('href').match('[^#/]+$'); + // if next is greater then previous set position of next slide to right of previous + if (next > prev) { + position = width*2; + direction = -width*2; + } else { + // if next is less then previous set position of next slide to left of previous + position = 0; + direction = 0; + } + // store new current slide + current = next; + break; + } + + // fade animation + if (effect === 'fade') { + // fade animation with crossfade + if (option.crossfade) { + // put hidden next above current + control.children(':eq('+ next +')', elem).css({ + zIndex: 10 + // fade in next + }).fadeIn(option.fadeSpeed, option.fadeEasing, function(){ + if (option.autoHeight) { + // animate container to height of next + control.animate({ + height: control.children(':eq('+ next +')', elem).outerHeight() + }, option.autoHeightSpeed, function(){ + // hide previous + control.children(':eq('+ prev +')', elem).css({ + display: 'none', + zIndex: 0 + }); + // reset z index + control.children(':eq('+ next +')', elem).css({ + zIndex: 0 + }); + // end of animation + option.animationComplete(next + 1); + active = false; + }); + } else { + // hide previous + control.children(':eq('+ prev +')', elem).css({ + display: 'none', + zIndex: 0 + }); + // reset zindex + control.children(':eq('+ next +')', elem).css({ + zIndex: 0 + }); + // end of animation + option.animationComplete(next + 1); + active = false; + } + }); + } else { + // fade animation with no crossfade + control.children(':eq('+ prev +')', elem).fadeOut(option.fadeSpeed, option.fadeEasing, function(){ + // animate to new height + if (option.autoHeight) { + control.animate({ + // animate container to height of next + height: control.children(':eq('+ next +')', elem).outerHeight() + }, option.autoHeightSpeed, + // fade in next slide + function(){ + control.children(':eq('+ next +')', elem).fadeIn(option.fadeSpeed, option.fadeEasing); + }); + } else { + // if fixed height + control.children(':eq('+ next +')', elem).fadeIn(option.fadeSpeed, option.fadeEasing, function(){ + // fix font rendering in ie, lame + if($.browser.msie) { + $(this).get(0).style.removeAttribute('filter'); + } + }); + } + // end of animation + option.animationComplete(next + 1); + active = false; + }); + } + // slide animation + } else { + // move next slide to right of previous + control.children(':eq('+ next +')').css({ + left: position, + display: 'block' + }); + // animate to new height + if (option.autoHeight) { + control.animate({ + left: direction, + height: control.children(':eq('+ next +')').outerHeight() + },option.slideSpeed, option.slideEasing, function(){ + control.css({ + left: -width + }); + control.children(':eq('+ next +')').css({ + left: width, + zIndex: 5 + }); + // reset previous slide + control.children(':eq('+ prev +')').css({ + left: width, + display: 'none', + zIndex: 0 + }); + // end of animation + option.animationComplete(next + 1); + active = false; + }); + // if fixed height + } else { + // animate control + control.animate({ + left: direction + },option.slideSpeed, option.slideEasing, function(){ + // after animation reset control position + control.css({ + left: -width + }); + // reset and show next + control.children(':eq('+ next +')').css({ + left: width, + zIndex: 5 + }); + // reset previous slide + control.children(':eq('+ prev +')').css({ + left: width, + display: 'none', + zIndex: 0 + }); + // end of animation + option.animationComplete(next + 1); + active = false; + }); + } + } + // set current state for pagination + if (option.pagination) { + // remove current class from all + $('.'+ option.paginationClass +' li.' + option.currentClass, elem).removeClass(option.currentClass); + // add current class to next + $('.' + option.paginationClass + ' li:eq('+ next +')', elem).addClass(option.currentClass); + } + } + } // end animate function + + function stop() { + // clear interval from stored id + clearInterval(elem.data('interval')); + } + + function pause() { + if (option.pause) { + // clear timeout and interval + clearTimeout(elem.data('pause')); + clearInterval(elem.data('interval')); + // pause slide show for option.pause amount + pauseTimeout = setTimeout(function() { + // clear pause timeout + clearTimeout(elem.data('pause')); + // start play interval after pause + playInterval = setInterval( function(){ + animate("next", effect); + },option.play); + // store play interval + elem.data('interval',playInterval); + },option.pause); + // store pause interval + elem.data('pause',pauseTimeout); + } else { + // if no pause, just stop + stop(); + } + } + + // 2 or more slides required + if (total < 2) { + return; + } + + // error corection for start slide + if (start < 0) { + start = 0; + } + + if (start > total) { + start = total - 1; + } + + // change current based on start option number + if (option.start) { + current = start; + } + + // randomizes slide order + if (option.randomize) { + control.randomize(); + } + + // make sure overflow is hidden, width is set + $('.' + option.container, elem).css({ + overflow: 'hidden', + // fix for ie + position: 'relative' + }); + + // set css for slides + control.children().css({ + position: 'absolute', + top: 0, + left: control.children().outerWidth(), + zIndex: 0, + display: 'none' + }); + + // set css for control div + control.css({ + position: 'relative', + // size of control 3 x slide width + width: (width * 3), + // set height to slide height + height: height, + // center control to slide + left: -width + }); + + // show slides + $('.' + option.container, elem).css({ + display: 'block' + }); + + // if autoHeight true, get and set height of first slide + if (option.autoHeight) { + control.children().css({ + height: 'auto' + }); + control.animate({ + height: control.children(':eq('+ start +')').outerHeight() + },option.autoHeightSpeed); + } + + // checks if image is loaded + if (option.preload && control.find('img:eq(' + start + ')').length) { + // adds preload image + $('.' + option.container, elem).css({ + background: 'url(' + option.preloadImage + ') no-repeat 50% 50%' + }); + + // gets image src, with cache buster + var img = control.find('img:eq(' + start + ')').attr('src') + '?' + (new Date()).getTime(); + + // check if the image has a parent + if ($('img', elem).parent().attr('class') != 'slides_control') { + // If image has parent, get tag name + imageParent = control.children(':eq(0)')[0].tagName.toLowerCase(); + } else { + // Image doesn't have parent, use image tag name + imageParent = control.find('img:eq(' + start + ')'); + } + + // checks if image is loaded + control.find('img:eq(' + start + ')').attr('src', img).load(function() { + // once image is fully loaded, fade in + control.find(imageParent + ':eq(' + start + ')').fadeIn(option.fadeSpeed, option.fadeEasing, function(){ + $(this).css({ + zIndex: 5 + }); + // removes preload image + $('.' + option.container, elem).css({ + background: '' + }); + // let the script know everything is loaded + loaded = true; + // call the loaded funciton + option.slidesLoaded(); + }); + }); + } else { + // if no preloader fade in start slide + control.children(':eq(' + start + ')').fadeIn(option.fadeSpeed, option.fadeEasing, function(){ + // let the script know everything is loaded + loaded = true; + // call the loaded funciton + option.slidesLoaded(); + }); + } + + // click slide for next + if (option.bigTarget) { + // set cursor to pointer + control.children().css({ + cursor: 'pointer' + }); + // click handler + control.children().click(function(){ + // animate to next on slide click + animate('next', effect); + return false; + }); + } + + // pause on mouseover + if (option.hoverPause && option.play) { + control.bind('mouseover',function(){ + // on mouse over stop + stop(); + }); + control.bind('mouseleave',function(){ + // on mouse leave start pause timeout + pause(); + }); + } + + // generate next/prev buttons + if (option.generateNextPrev) { + $('.' + option.container, elem).after('Prev'); + $('.' + option.prev, elem).after('Next'); + } + + // next button + $('.' + option.next ,elem).click(function(e){ + e.preventDefault(); + if (option.play) { + pause(); + } + animate('next', effect); + }); + + // previous button + $('.' + option.prev, elem).click(function(e){ + e.preventDefault(); + if (option.play) { + pause(); + } + animate('prev', effect); + }); + + // generate pagination + if (option.generatePagination) { + // create unordered list + if (option.prependPagination) { + elem.prepend('
    '); + } else { + elem.append('
      '); + } + // for each slide create a list item and link + control.children().each(function(){ + $('.' + option.paginationClass, elem).append('
    • '+ (number+1) +'
      • '); + number++; + }); + } else { + // if pagination exists, add href w/ value of item number to links + $('.' + option.paginationClass + ' li a', elem).each(function(){ + $(this).attr('href', '#' + number); + number++; + }); + } + + // add current class to start slide pagination + $('.' + option.paginationClass + ' li:eq('+ start +')', elem).addClass(option.currentClass); + + // click handling + $('.' + option.paginationClass + ' li a', elem ).click(function(){ + // pause slideshow + if (option.play) { + pause(); + } + // get clicked, pass to animate function + clicked = $(this).attr('href').match('[^#/]+$'); + // if current slide equals clicked, don't do anything + if (current != clicked) { + animate('pagination', paginationEffect, clicked); + } + return false; + }); + + // click handling + $('a.link', elem).click(function(){ + // pause slideshow + if (option.play) { + pause(); + } + // get clicked, pass to animate function + clicked = $(this).attr('href').match('[^#/]+$') - 1; + // if current slide equals clicked, don't do anything + if (current != clicked) { + animate('pagination', paginationEffect, clicked); + } + return false; + }); + + if (option.play) { + // set interval + playInterval = setInterval(function() { + animate('next', effect); + }, option.play); + // store interval id + elem.data('interval',playInterval); + } + }); + }; + + // default options + $.fn.slides.option = { + preload: false, // boolean, Set true to preload images in an image based slideshow + preloadImage: '/img/loading.gif', // string, Name and location of loading image for preloader. Default is "/img/loading.gif" + container: 'slides_container', // string, Class name for slides container. Default is "slides_container" + generateNextPrev: false, // boolean, Auto generate next/prev buttons + next: 'next', // string, Class name for next button + prev: 'prev', // string, Class name for previous button + pagination: true, // boolean, If you're not using pagination you can set to false, but don't have to + generatePagination: true, // boolean, Auto generate pagination + prependPagination: false, // boolean, prepend pagination + paginationClass: 'pagination', // string, Class name for pagination + currentClass: 'current', // string, Class name for current class + fadeSpeed: 350, // number, Set the speed of the fading animation in milliseconds + fadeEasing: '', // string, must load jQuery's easing plugin before http://gsgd.co.uk/sandbox/jquery/easing/ + slideSpeed: 350, // number, Set the speed of the sliding animation in milliseconds + slideEasing: '', // string, must load jQuery's easing plugin before http://gsgd.co.uk/sandbox/jquery/easing/ + start: 1, // number, Set the speed of the sliding animation in milliseconds + effect: 'slide', // string, '[next/prev], [pagination]', e.g. 'slide, fade' or simply 'fade' for both + crossfade: false, // boolean, Crossfade images in a image based slideshow + randomize: false, // boolean, Set to true to randomize slides + play: 0, // number, Autoplay slideshow, a positive number will set to true and be the time between slide animation in milliseconds + pause: 0, // number, Pause slideshow on click of next/prev or pagination. A positive number will set to true and be the time of pause in milliseconds + hoverPause: false, // boolean, Set to true and hovering over slideshow will pause it + autoHeight: false, // boolean, Set to true to auto adjust height + autoHeightSpeed: 350, // number, Set auto height animation time in milliseconds + bigTarget: false, // boolean, Set to true and the whole slide will link to next slide on click + animationStart: function(){}, // Function called at the start of animation + animationComplete: function(){}, // Function called at the completion of animation + slidesLoaded: function() {} // Function is called when slides is fully loaded + }; + + // Randomize slide order on load + $.fn.randomize = function(callback) { + function randomizeOrder() { return(Math.round(Math.random())-0.5); } + return($(this).each(function() { + var $this = $(this); + var $children = $this.children(); + var childCount = $children.length; + if (childCount > 1) { + $children.hide(); + var indices = []; + for (i=0;i - - - - - ${title} | ${blog_title} - - %if use_bundles: - - - %else: - - - - - - - %if exists("files/assets/css/custom.css", not_empty=True): - - %endif - - - %endif - - - %if rss_link: - ${rss_link} - %else: - %for language in translations: - - %endfor - %endif + ${html_head()} <%block name="extra_head"> @@ -54,18 +23,14 @@ %if len(translations) > 1: ${(messages[lang][u"Also available in"])}:  - %for langname in translations.keys(): - %if langname != lang: - ${messages[langname]["LANGUAGE"]} - %endif - %endfor + ${html_translations()} %endif
      -
      +
      <%block name="content"> @@ -77,23 +42,8 @@
      • ${license} - - %if add_this_buttons: -
      • -
        - - - - - - -
        - - - % endif - %for url, text in sidebar_links[lang]: -
      • ${text} - %endfor + ${html_social()} + ${html_sidebar_links()}
      • ${search_form}
      diff --git a/nikola/data/themes/default/templates/base_helper.tmpl b/nikola/data/themes/default/templates/base_helper.tmpl new file mode 100644 index 0000000..3f27f23 --- /dev/null +++ b/nikola/data/themes/default/templates/base_helper.tmpl @@ -0,0 +1,74 @@ +<%def name="html_head()"> + + + + + ${title} | ${blog_title} + + %if use_bundles: + + + %else: + + + + + + + + %if has_custom_css: + + %endif + + + + %endif + + + %if rss_link: + ${rss_link} + %else: + %for language in translations: + + %endfor + %endif + + + +<%def name="html_social()"> +%if add_this_buttons: + +
      + Share +
        • +
        • +
        • +
        • +
      +
      + + +%endif + + + +<%def name="html_sidebar_links()"> + %for url, text in sidebar_links[lang]: + % if rel_link(permalink, url) == "#": +
    • ${text} + %else: +
    • ${text} + %endif + %endfor + + + +<%def name="html_translations()"> + %for langname in translations.keys(): + %if langname != lang: + ${messages[langname]["LANGUAGE"]} + %endif + %endfor + diff --git a/nikola/data/themes/default/templates/index.tmpl b/nikola/data/themes/default/templates/index.tmpl index 2c7b4be..03dd1f8 100644 --- a/nikola/data/themes/default/templates/index.tmpl +++ b/nikola/data/themes/default/templates/index.tmpl @@ -1,36 +1,18 @@ ## -*- coding: utf-8 -*- +<%namespace name="helper" file="index_helper.tmpl"/> <%inherit file="base.tmpl"/> <%block name="content"> % for post in posts:

      ${post.title(lang)}    - ${messages[lang]["Posted"]}: ${post.date} + ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)}

      ${post.text(lang, index_teasers)} -

      - %if disqus_forum: - Comments - %endif + ${helper.html_disqus_link(post)}

      % endfor -
      - - -
      - %if disqus_forum: - - %endif + ${helper.html_pager()} + ${helper.html_disqus_script()} diff --git a/nikola/data/themes/default/templates/index_helper.tmpl b/nikola/data/themes/default/templates/index_helper.tmpl new file mode 100644 index 0000000..cfecdf3 --- /dev/null +++ b/nikola/data/themes/default/templates/index_helper.tmpl @@ -0,0 +1,31 @@ +<%def name="html_pager()"> +
      + +
      + + + +<%def name="html_disqus_link(post)"> +

      + %if disqus_forum: + Comments + %endif + + + +<%def name="html_disqus_script()"> + %if disqus_forum: + + %endif + diff --git a/nikola/data/themes/default/templates/list_post.tmpl b/nikola/data/themes/default/templates/list_post.tmpl new file mode 100644 index 0000000..1a1cdee --- /dev/null +++ b/nikola/data/themes/default/templates/list_post.tmpl @@ -0,0 +1,14 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> + +

      +

      ${title}

      + +
      + + diff --git a/nikola/data/themes/default/templates/post.tmpl b/nikola/data/themes/default/templates/post.tmpl index 6bbb460..306192d 100644 --- a/nikola/data/themes/default/templates/post.tmpl +++ b/nikola/data/themes/default/templates/post.tmpl @@ -1,51 +1,20 @@ ## -*- coding: utf-8 -*- +<%namespace name="helper" file="post_helper.tmpl"/> <%inherit file="base.tmpl"/> <%block name="content">
      -

      ${title}

      - % if link: -

      ${messages[lang]["Original site"]}

      - % endif + ${helper.html_title()}
      - ${messages[lang]["Posted"]}: ${post.date}  |   - - %if len(translations) > 1: - %for langname in translations.keys(): - %if langname != lang: - ${messages[langname][u"Read in English"]} -   |   - %endif - %endfor - %endif - - ${messages[lang]["Source"]} - %if post.tags: -   |  ${messages[lang]["More posts about"]} - %for tag in post.tags: - ${tag} - %endfor - %endif + ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)} + ${helper.html_translations(post)} +   |   + ${messages[lang]["Source"]} + ${helper.html_tags(post)}
      ${post.text(lang)} - - %if disqus_forum: -
      - - - comments powered by Disqus - %endif + ${helper.html_pager(post)} + ${helper.html_disqus(post)}
      diff --git a/nikola/data/themes/default/templates/post_helper.tmpl b/nikola/data/themes/default/templates/post_helper.tmpl new file mode 100644 index 0000000..3e874e9 --- /dev/null +++ b/nikola/data/themes/default/templates/post_helper.tmpl @@ -0,0 +1,54 @@ +<%def name="html_title()"> +

      ${title}

      + % if link: +

      ${messages[lang]["Original site"]}

      + % endif + + + +<%def name="html_translations(post)"> + %if len(translations) > 1: + %for langname in translations.keys(): + %if langname != lang: +   |   + ${messages[langname]["Read in English"]} + %endif + %endfor + %endif + + + +<%def name="html_tags(post)"> + %if post.tags: +   |  ${messages[lang]["More posts about"]} + %for tag in post.tags: + ${tag} + %endfor + %endif + + + +<%def name="html_disqus(post)"> + %if disqus_forum: +
      + + + comments powered by Disqus + %endif + + + +<%def name="html_pager(post)"> + + diff --git a/nikola/data/themes/default/templates/tag.tmpl b/nikola/data/themes/default/templates/tag.tmpl index ac97829..7c89ad1 100644 --- a/nikola/data/themes/default/templates/tag.tmpl +++ b/nikola/data/themes/default/templates/tag.tmpl @@ -1,5 +1,5 @@ ## -*- coding: utf-8 -*- -<%inherit file="list.tmpl"/> +<%inherit file="list_post.tmpl"/> <%block name="extra_head"> %for language in translations: diff --git a/nikola/data/themes/default/templates/tags.tmpl b/nikola/data/themes/default/templates/tags.tmpl index 10040ca..369a3d5 100644 --- a/nikola/data/themes/default/templates/tags.tmpl +++ b/nikola/data/themes/default/templates/tags.tmpl @@ -6,7 +6,7 @@

      ${title}

      diff --git a/nikola/data/themes/jinja-default/README b/nikola/data/themes/jinja-default/README index 3fb7d3f..4b0bf04 100644 --- a/nikola/data/themes/jinja-default/README +++ b/nikola/data/themes/jinja-default/README @@ -1,3 +1,3 @@ This theme is exactly the same as "default" but using Jinja2 templates. -To try it, set TEMPLATE_ENGINE="jinja" and THEME="jinja-default" in your 'conf.py' +To try it, set THEME="jinja-default" in your 'conf.py' diff --git a/nikola/data/themes/jinja-default/templates/base.tmpl b/nikola/data/themes/jinja-default/templates/base.tmpl index 546e1a7..0f394d3 100644 --- a/nikola/data/themes/jinja-default/templates/base.tmpl +++ b/nikola/data/themes/jinja-default/templates/base.tmpl @@ -17,7 +17,7 @@ - {% if exists("files/assets/css/custom.css", not_empty=True) %} + {% if has_custom_css %} {% endif %} @@ -64,7 +64,7 @@
      • -
      +
      {% block content %}{% endblock %} @@ -76,20 +76,6 @@
      • {{license}} - -` {% if add_this_buttons %} -
      • -
        - - - - - - -
        - - - {% endif %} {% for url, text in sidebar_links[lang] %}
      • {{text}} {% endfor %} @@ -97,6 +83,19 @@
      + {% if add_this_buttons %} + +
      + Share +
        • +
        • +
        • +
        • +
      +
      + + + {% endif %} {{analytics}} diff --git a/nikola/data/themes/jinja-default/templates/index.tmpl b/nikola/data/themes/jinja-default/templates/index.tmpl index 6244e10..c068417 100644 --- a/nikola/data/themes/jinja-default/templates/index.tmpl +++ b/nikola/data/themes/jinja-default/templates/index.tmpl @@ -4,7 +4,7 @@

      {{post.title(lang)}}    - {{messages[lang]["Posted"]}}: {{post.date}} + {{messages[lang]["Posted"]}}: {{post.date.strftime(date_format)}}

      {{post.text(lang, index_teasers)}} diff --git a/nikola/data/themes/jinja-default/templates/list_post.tmpl b/nikola/data/themes/jinja-default/templates/list_post.tmpl new file mode 100644 index 0000000..7723214 --- /dev/null +++ b/nikola/data/themes/jinja-default/templates/list_post.tmpl @@ -0,0 +1,13 @@ +{% extends "base.tmpl" %} +{% block content %} + +
      +

      {{title}}

      + +
      + +{% endblock %} diff --git a/nikola/data/themes/jinja-default/templates/post.tmpl b/nikola/data/themes/jinja-default/templates/post.tmpl index 4748959..3ce6abe 100644 --- a/nikola/data/themes/jinja-default/templates/post.tmpl +++ b/nikola/data/themes/jinja-default/templates/post.tmpl @@ -7,7 +7,7 @@ {% endif %}
      - {{messages[lang]["Posted"]}}: {{post.date}}  |   + {{messages[lang]["Posted"]}}: {{post.date.strftime(date_format)}}  |   {% if translations|length > 1 %} {% for langname in translations.keys() %} diff --git a/nikola/data/themes/jinja-default/templates/tag.tmpl b/nikola/data/themes/jinja-default/templates/tag.tmpl index 59facb4..42720fd 100644 --- a/nikola/data/themes/jinja-default/templates/tag.tmpl +++ b/nikola/data/themes/jinja-default/templates/tag.tmpl @@ -1,4 +1,4 @@ -{% extends "list.tmpl"%} +{% extends "list_post.tmpl"%} {%block extra_head %} {% for language in translations %} diff --git a/nikola/data/themes/monospace/assets/css/code.css b/nikola/data/themes/monospace/assets/css/code.css new file mode 100644 index 0000000..b1d7ace --- /dev/null +++ b/nikola/data/themes/monospace/assets/css/code.css @@ -0,0 +1,62 @@ +pre { word-break: pre; white-space: pre; word-wrap: pre; overflow: auto; max-width: 100%;} +td.linenos { vertical-align: top; width: 4em;} +div.code > pre, .code +{ background: #f8f8f8; white-space: pre;} +.code .c { color: #008800; font-style: italic } /* Comment */ +.code .err { border: 1px solid #FF0000 } /* Error */ +.code .k { color: #AA22FF; font-weight: bold } /* Keyword */ +.code .o { color: #666666 } /* Operator */ +.code .cm { color: #008800; font-style: italic } /* Comment.Multiline */ +.code .cp { color: #008800 } /* Comment.Preproc */ +.code .c1 { color: #008800; font-style: italic } /* Comment.Single */ +.code .cs { color: #008800; font-weight: bold } /* Comment.Special */ +.code .gd { color: #A00000 } /* Generic.Deleted */ +.code .ge { font-style: italic } /* Generic.Emph */ +.code .gr { color: #FF0000 } /* Generic.Error */ +.code .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.code .gi { color: #00A000 } /* Generic.Inserted */ +.code .go { color: #808080 } /* Generic.Output */ +.code .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.code .gs { font-weight: bold } /* Generic.Strong */ +.code .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.code .gt { color: #0040D0 } /* Generic.Traceback */ +.code .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */ +.code .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */ +.code .kp { color: #AA22FF } /* Keyword.Pseudo */ +.code .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */ +.code .kt { color: #AA22FF; font-weight: bold } /* Keyword.Type */ +.code .m { color: #666666 } /* Literal.Number */ +.code .s { color: #BB4444 } /* Literal.String */ +.code .na { color: #BB4444 } /* Name.Attribute */ +.code .nb { color: #AA22FF } /* Name.Builtin */ +.code .nc { color: #0000FF } /* Name.Class */ +.code .no { color: #880000 } /* Name.Constant */ +.code .nd { color: #AA22FF } /* Name.Decorator */ +.code .ni { color: #999999; font-weight: bold } /* Name.Entity */ +.code .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.code .nf { color: #00A000 } /* Name.Function */ +.code .nl { color: #A0A000 } /* Name.Label */ +.code .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.code .nt { color: #008000; font-weight: bold } /* Name.Tag */ +.code .nv { color: #B8860B } /* Name.Variable */ +.code .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.code .mf { color: #666666 } /* Literal.Number.Float */ +.code .mh { color: #666666 } /* Literal.Number.Hex */ +.code .mi { color: #666666 } /* Literal.Number.Integer */ +.code .mo { color: #666666 } /* Literal.Number.Oct */ +.code .sb { color: #BB4444 } /* Literal.String.Backtick */ +.code .sc { color: #BB4444 } /* Literal.String.Char */ +.code .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */ +.code .s2 { color: #BB4444 } /* Literal.String.Double */ +.code .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.code .sh { color: #BB4444 } /* Literal.String.Heredoc */ +.code .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.code .sx { color: #008000 } /* Literal.String.Other */ +.code .sr { color: #BB6688 } /* Literal.String.Regex */ +.code .s1 { color: #BB4444 } /* Literal.String.Single */ +.code .ss { color: #B8860B } /* Literal.String.Symbol */ +.code .bp { color: #AA22FF } /* Name.Builtin.Pseudo */ +.code .vc { color: #B8860B } /* Name.Variable.Class */ +.code .vg { color: #B8860B } /* Name.Variable.Global */ +.code .vi { color: #B8860B } /* Name.Variable.Instance */ +.code .il { color: #666666 } /* Literal.Number.Integer.Long */ diff --git a/nikola/data/themes/monospace/assets/css/colorbox.css b/nikola/data/themes/monospace/assets/css/colorbox.css new file mode 100644 index 0000000..f67c346 --- /dev/null +++ b/nikola/data/themes/monospace/assets/css/colorbox.css @@ -0,0 +1,85 @@ +/* + ColorBox Core Style: + The following CSS is consistent between example themes and should not be altered. +*/ +#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} +#cboxOverlay{position:fixed; width:100%; height:100%;} +#cboxMiddleLeft, #cboxBottomLeft{clear:left;} +#cboxContent{position:relative;} +#cboxLoadedContent{overflow:auto;} +#cboxTitle{margin:0;} +#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;} +#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} +.cboxPhoto{float:left; margin:auto; border:0; display:block;} +.cboxIframe{width:100%; height:100%; display:block; border:0;} + +/* + User Style: + Change the following styles to modify the appearance of ColorBox. They are + ordered & tabbed in a way that represents the nesting of the generated HTML. +*/ +#cboxOverlay{background:url(images/overlay.png) repeat 0 0;} +#colorbox{} + #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;} + #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;} + #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px -29px;} + #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px -29px;} + #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;} + #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;} + #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;} + #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;} + #cboxContent{background:#fff; overflow:hidden;} + .cboxIframe{background:#fff;} + #cboxError{padding:50px; border:1px solid #ccc;} + #cboxLoadedContent{margin-bottom:28px;} + #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;} + #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;} + #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;} + #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;} + #cboxPrevious:hover{background-position:-75px -25px;} + #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;} + #cboxNext:hover{background-position:-50px -25px;} + #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;} + #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;} + #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;} + #cboxClose:hover{background-position:-25px -25px;} + +/* + The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill + when an alpha filter (opacity change) is set on the element or ancestor element. This style is not applied to or needed in IE9. + See: http://jacklmoore.com/notes/ie-transparency-problems/ +*/ +.cboxIE #cboxTopLeft, +.cboxIE #cboxTopCenter, +.cboxIE #cboxTopRight, +.cboxIE #cboxBottomLeft, +.cboxIE #cboxBottomCenter, +.cboxIE #cboxBottomRight, +.cboxIE #cboxMiddleLeft, +.cboxIE #cboxMiddleRight { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF); +} + +/* + The following provides PNG transparency support for IE6 + Feel free to remove this and the /ie6/ directory if you have dropped IE6 support. +*/ +.cboxIE6 #cboxTopLeft{background:url(images/ie6/borderTopLeft.png);} +.cboxIE6 #cboxTopCenter{background:url(images/ie6/borderTopCenter.png);} +.cboxIE6 #cboxTopRight{background:url(images/ie6/borderTopRight.png);} +.cboxIE6 #cboxBottomLeft{background:url(images/ie6/borderBottomLeft.png);} +.cboxIE6 #cboxBottomCenter{background:url(images/ie6/borderBottomCenter.png);} +.cboxIE6 #cboxBottomRight{background:url(images/ie6/borderBottomRight.png);} +.cboxIE6 #cboxMiddleLeft{background:url(images/ie6/borderMiddleLeft.png);} +.cboxIE6 #cboxMiddleRight{background:url(images/ie6/borderMiddleRight.png);} + +.cboxIE6 #cboxTopLeft, +.cboxIE6 #cboxTopCenter, +.cboxIE6 #cboxTopRight, +.cboxIE6 #cboxBottomLeft, +.cboxIE6 #cboxBottomCenter, +.cboxIE6 #cboxBottomRight, +.cboxIE6 #cboxMiddleLeft, +.cboxIE6 #cboxMiddleRight { + _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')"); +} diff --git a/nikola/data/themes/monospace/assets/css/rst.css b/nikola/data/themes/monospace/assets/css/rst.css new file mode 100644 index 0000000..1f0edcb --- /dev/null +++ b/nikola/data/themes/monospace/assets/css/rst.css @@ -0,0 +1,315 @@ +/* +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:Date: $Date: 2005-12-18 01:56:14 +0100 (Sun, 18 Dec 2005) $ +:Revision: $Revision: 4224 $ +:Copyright: This stylesheet has been placed in the public domain. + +Default cascading style sheet for the HTML output of Docutils. + +See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to +customize this style sheet. +*/ + +/* used to remove borders from tables and images */ +.borderless, table.borderless td, table.borderless th { + border: 0 } + +table.borderless td, table.borderless th { + /* Override padding for "table.docutils td" with "! important". + The right padding separates the table cells. */ + padding: 0 0.5em 0 0 ! important } + +.first { + /* Override more specific margin styles with "! important". */ + margin-top: 0 ! important } + +.last, .with-subtitle { + margin-bottom: 0 ! important } + +.hidden { + display: none } + +a.toc-backref { + text-decoration: none ; + color: black } + +blockquote.epigraph { + margin: 2em 1em ; } + +dl.docutils dd { + margin-bottom: 0.5em } + +/* Uncomment (and remove this text!) to get bold-faced definition list terms +dl.docutils dt { + font-weight: bold } +*/ + +div.abstract { + margin: 2em 5em } + +div.abstract p.topic-title { + font-weight: bold ; + text-align: center } + +div.admonition, div.attention, div.caution, div.danger, div.error, +div.hint, div.important, div.note, div.tip, div.warning { + padding: 8px 35px 8px 14px; + margin-bottom: 18px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #d9edf7; + color: #3a87ad; + border: 1px solid #bce8f1; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + +div.admonition p.admonition-title, div.hint p.admonition-title, +div.important p.admonition-title, div.note p.admonition-title, +div.tip p.admonition-title { + font-weight: bold ; + font-family: sans-serif } + +div.attention p.admonition-title, div.caution p.admonition-title, +div.danger p.admonition-title, div.error p.admonition-title, +div.warning p.admonition-title { + color: red ; + font-weight: bold ; + font-family: sans-serif } + +/* Uncomment (and remove this text!) to get reduced vertical space in + compound paragraphs. +div.compound .compound-first, div.compound .compound-middle { + margin-bottom: 0.5em } + +div.compound .compound-last, div.compound .compound-middle { + margin-top: 0.5em } +*/ + +div.dedication { + margin: 2em 5em ; + text-align: center ; + font-style: italic } + +div.dedication p.topic-title { + font-weight: bold ; + font-style: normal } + +div.figure { + text-align: center; + margin-left: 2em ; + margin-right: 2em } + +div.footer, div.header { + clear: both; + font-size: smaller } + +div.line-block { + display: block ; + margin-top: 1em ; + margin-bottom: 1em } + +div.line-block div.line-block { + margin-top: 0 ; + margin-bottom: 0 ; + margin-left: 1.5em } + +div.sidebar { + margin-left: 1em ; + border: medium outset ; + padding: 1em ; + background-color: #ffffee ; + width: 40% ; + float: right ; + clear: right } + +div.sidebar p.rubric { + font-family: sans-serif ; + font-size: medium } + +div.system-messages { + margin: 5em } + +div.system-messages h1 { + color: red } + +div.system-message { + padding: 8px 35px 8px 14px; + margin-bottom: 18px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + border: 1px solid #eed3d7; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + padding: 1em; + background-color: #f2dede; + color: #b94a48; + +} + +div.system-message p.system-message-title { + color: inherit ; + font-weight: bold } + +div.topic { + margin: 2em } + +h1.section-subtitle, h2.section-subtitle, h3.section-subtitle, +h4.section-subtitle, h5.section-subtitle, h6.section-subtitle { + margin-top: 0.4em } + +h1.title { + text-align: center } + +h2.subtitle { + text-align: center } + +hr.docutils { + width: 75% } + +img.align-left { + clear: left } + +img.align-right { + clear: right } + +ol.simple, ul.simple { + margin-bottom: 1em } + +ol.arabic { + list-style: decimal } + +ol.loweralpha { + list-style: lower-alpha } + +ol.upperalpha { + list-style: upper-alpha } + +ol.lowerroman { + list-style: lower-roman } + +ol.upperroman { + list-style: upper-roman } + +p.attribution { + text-align: right ; + margin-left: 50% } + +p.caption { + font-style: italic } + +p.credits { + font-style: italic ; + font-size: smaller } + +p.label { + white-space: nowrap } + +p.rubric { + font-weight: bold ; + font-size: larger ; + color: maroon ; + text-align: center } + +p.sidebar-title { + font-family: sans-serif ; + font-weight: bold ; + font-size: larger } + +p.sidebar-subtitle { + font-family: sans-serif ; + font-weight: bold } + +p.topic-title { + font-weight: bold } + +pre.address { + margin-bottom: 0 ; + margin-top: 0 ; + font-family: serif ; + font-size: 100% } + +pre.literal-block, pre.doctest-block { + margin: 0 0 0 0 ; + background-color: #eeeeee; + padding: 1em; + overflow: auto; +/* font-family: "Courier New", Courier, monospace;*/ +} + +span.classifier { + font-family: sans-serif ; + font-style: oblique } + +span.classifier-delimiter { + font-family: sans-serif ; + font-weight: bold } + +span.interpreted { + font-family: sans-serif } + +span.option { + white-space: nowrap } + +span.pre { + white-space: pre } + +span.problematic { + color: red } + +span.section-subtitle { + /* font-size relative to parent (h1..h6 element) */ + font-size: 80% } + +table.citation { + border-left: solid 1px gray; + margin-left: 1px } + +table.docinfo { + margin: 2em 4em } + +table.docutils { + margin-top: 0.5em ; + margin-bottom: 0.5em } + +table.footnote { + border-left: solid 1px black; + margin-left: 1px } + +table.docutils td, table.docutils th, +table.docinfo td, table.docinfo th { + padding-left: 0.5em ; + padding-right: 0.5em ; + vertical-align: top } + +table.docutils th.field-name, table.docinfo th.docinfo-name { + font-weight: bold ; + text-align: left ; + white-space: nowrap ; + padding-left: 0 } + +h1 tt.docutils, h2 tt.docutils, h3 tt.docutils, +h4 tt.docutils, h5 tt.docutils, h6 tt.docutils { + font-size: 100% } + +tt.docutils { + background-color: #eeeeee } + +ul.auto-toc { + list-style-type: none } + +#blog-title { + font-size: 34pt; + /*margin:0 0.3em -14px;*/ + background-color: #FFF; + font-family: "courier"; + text-align: right; + margin-top: 20px; + margin-bottom: 10px; +} + +img { + margin-top: 12px; + margin-bottom: 12px; +} diff --git a/nikola/data/themes/monospace/assets/css/theme.css b/nikola/data/themes/monospace/assets/css/theme.css new file mode 100644 index 0000000..b66d7bd --- /dev/null +++ b/nikola/data/themes/monospace/assets/css/theme.css @@ -0,0 +1,14 @@ +body { margin:0px; padding:20px 0px; text-align:center; font-family:Monospace; color:#585858; } +.post { margin:0px 0px 30px 0px; padding:0px 0px 30px 0px; border-bottom:1px dotted #C8C8C8; } +.meta { margin:10px; padding:15px; background:#EAEAEA; clear:both; } +#footer { text-align:center; clear:both; margin:30px 0px 0px 0px; padding:30px 0px 0px 0px; border-top:1px dotted #C8C8C8; } +#wrap { margin:0px auto; text-align:left; font-size: 13px; line-height: 1.4; } +#container { float:right; } +#sidebar { overflow:hidden; clear:left; text-align:right; width:250px; height:auto; padding:0px 15px 0px 0px; border-right:1px dotted #C8C8C8; } +#sidebar li { list-style-type:none; } +#sidebar > li { margin:20px 0px; } +#sidebar h1 { border-bottom:1px dotted #C8C8C8; } +#sidebar .description { display:block; width:100%; height:auto; margin:0px 0px 10px 0px; } +h1, h2, h3, h4, h5, h6, h7 { margin:0px; text-transform:uppercase; } +h4, h5, h6 { font-size:14px; } +h1 { padding:0px 0px 15px; margin:0px 0px 15px 0px; } diff --git a/nikola/data/themes/monospace/bundles b/nikola/data/themes/monospace/bundles new file mode 100644 index 0000000..aa35d9c --- /dev/null +++ b/nikola/data/themes/monospace/bundles @@ -0,0 +1 @@ +assets/css/all.css=rst.css,code.css,theme.css diff --git a/nikola/data/themes/monospace/messages b/nikola/data/themes/monospace/messages new file mode 120000 index 0000000..3047ea2 --- /dev/null +++ b/nikola/data/themes/monospace/messages @@ -0,0 +1 @@ +../default/messages/ \ No newline at end of file diff --git a/nikola/data/themes/monospace/templates/base.tmpl b/nikola/data/themes/monospace/templates/base.tmpl new file mode 100644 index 0000000..7758ded --- /dev/null +++ b/nikola/data/themes/monospace/templates/base.tmpl @@ -0,0 +1,44 @@ +## -*- coding: utf-8 -*- +<%namespace file="base_helper.tmpl" import="*"/> + + + + ${html_head()} + <%block name="extra_head"> + + + + %if add_this_buttons: + + % endif +
      +
      + <%block name="content"> +
      + + +
      + ${analytics} + + diff --git a/nikola/data/themes/monospace/templates/base_helper.tmpl b/nikola/data/themes/monospace/templates/base_helper.tmpl new file mode 100644 index 0000000..f5fe80c --- /dev/null +++ b/nikola/data/themes/monospace/templates/base_helper.tmpl @@ -0,0 +1,64 @@ +<%def name="html_head()"> + + + + + ${title} | ${blog_title} + %if use_bundles: + + + %else: + + + + + %if has_custom_css: + + + %endif + %endif + %if rss_link: + ${rss_link} + %else: + %for language in translations: + + %endfor + %endif + + + +<%def name="html_social()"> +%if add_this_buttons: + +
      + Share +
        • +
        • +
        • +
        • +
      +
      + + +%endif + + + +<%def name="html_sidebar_links()"> + %for url, text in sidebar_links[lang]: + % if rel_link(permalink, url) == "#": +
    • ${text} + %else: +
    • ${text} + %endif + %endfor + + + +<%def name="html_translations()"> + %for langname in translations.keys(): + %if langname != lang: + ${messages[langname]["LANGUAGE"]} + %endif + %endfor + diff --git a/nikola/data/themes/monospace/templates/gallery.tmpl b/nikola/data/themes/monospace/templates/gallery.tmpl new file mode 100644 index 0000000..37d749f --- /dev/null +++ b/nikola/data/themes/monospace/templates/gallery.tmpl @@ -0,0 +1,27 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="sourcelink"> + +<%block name="content"> +
        + % for link, crumb in crumbs: +
      • / ${crumb}
        • + % endfor +
      + %if text: +

      + ${text} +

      + %endif +
        + % for folder in folders: +
      •  ${folder}
        • + % endfor +
      +
        + %for image in images: +
      • +
        • + %endfor +
      + diff --git a/nikola/data/themes/monospace/templates/index.tmpl b/nikola/data/themes/monospace/templates/index.tmpl new file mode 100644 index 0000000..bbf5529 --- /dev/null +++ b/nikola/data/themes/monospace/templates/index.tmpl @@ -0,0 +1,27 @@ +## -*- coding: utf-8 -*- +<%namespace name="helper" file="index_helper.tmpl"/> +<%inherit file="base.tmpl"/> +<%block name="content"> + % for post in posts: +
      +

      ${post.title(lang)}

      +
      + + ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)} + +
      + Tags:  + %if post.tags: + %for tag in post.tags: + ${tag} + %endfor + %endif + +
      + ${post.text(lang, index_teasers)} + ${helper.html_disqus_link(post)} +
      + % endfor + ${helper.html_pager()} + ${helper.html_disqus_script()} + diff --git a/nikola/data/themes/monospace/templates/index_helper.tmpl b/nikola/data/themes/monospace/templates/index_helper.tmpl new file mode 100644 index 0000000..cfecdf3 --- /dev/null +++ b/nikola/data/themes/monospace/templates/index_helper.tmpl @@ -0,0 +1,31 @@ +<%def name="html_pager()"> +
      + +
      + + + +<%def name="html_disqus_link(post)"> +

      + %if disqus_forum: + Comments + %endif + + + +<%def name="html_disqus_script()"> + %if disqus_forum: + + %endif + diff --git a/nikola/data/themes/monospace/templates/list.tmpl b/nikola/data/themes/monospace/templates/list.tmpl new file mode 100644 index 0000000..a60b508 --- /dev/null +++ b/nikola/data/themes/monospace/templates/list.tmpl @@ -0,0 +1,14 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> + +

      +

      ${title}

      +
        + % for text, link in items: +
      • ${text} + % endfor +
      +
      + + diff --git a/nikola/data/themes/monospace/templates/list_post.tmpl b/nikola/data/themes/monospace/templates/list_post.tmpl new file mode 100644 index 0000000..1a1cdee --- /dev/null +++ b/nikola/data/themes/monospace/templates/list_post.tmpl @@ -0,0 +1,14 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> + +
      +

      ${title}

      + +
      + + diff --git a/nikola/data/themes/monospace/templates/listing.tmpl b/nikola/data/themes/monospace/templates/listing.tmpl new file mode 100644 index 0000000..596a704 --- /dev/null +++ b/nikola/data/themes/monospace/templates/listing.tmpl @@ -0,0 +1,10 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> +
        + % for link, crumb in crumbs: +
      • / ${crumb}
        • + % endfor +
      +${code} + diff --git a/nikola/data/themes/monospace/templates/post.tmpl b/nikola/data/themes/monospace/templates/post.tmpl new file mode 100644 index 0000000..94a74f8 --- /dev/null +++ b/nikola/data/themes/monospace/templates/post.tmpl @@ -0,0 +1,28 @@ +## -*- coding: utf-8 -*- +<%namespace name="helper" file="post_helper.tmpl"/> +<%inherit file="base.tmpl"/> +<%block name="content"> +
      + ${helper.html_title()} +
      + + ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)} [${messages[lang]["Source"]}] + +
      + %if post.tags: + ${messages[lang]["Tags"]}:  + %for tag in post.tags: + ${tag} + %endfor + +
      + %endif + + ${helper.html_translations(post)} + +
      + ${post.text(lang)} + ${helper.html_pager(post)} + ${helper.html_disqus(post)} +
      + diff --git a/nikola/data/themes/monospace/templates/post_helper.tmpl b/nikola/data/themes/monospace/templates/post_helper.tmpl new file mode 100644 index 0000000..3e874e9 --- /dev/null +++ b/nikola/data/themes/monospace/templates/post_helper.tmpl @@ -0,0 +1,54 @@ +<%def name="html_title()"> +

      ${title}

      + % if link: +

      ${messages[lang]["Original site"]}

      + % endif + + + +<%def name="html_translations(post)"> + %if len(translations) > 1: + %for langname in translations.keys(): + %if langname != lang: +   |   + ${messages[langname]["Read in English"]} + %endif + %endfor + %endif + + + +<%def name="html_tags(post)"> + %if post.tags: +   |  ${messages[lang]["More posts about"]} + %for tag in post.tags: + ${tag} + %endfor + %endif + + + +<%def name="html_disqus(post)"> + %if disqus_forum: +
      + + + comments powered by Disqus + %endif + + + +<%def name="html_pager(post)"> + + diff --git a/nikola/data/themes/monospace/templates/story.tmpl b/nikola/data/themes/monospace/templates/story.tmpl new file mode 100644 index 0000000..deb0a46 --- /dev/null +++ b/nikola/data/themes/monospace/templates/story.tmpl @@ -0,0 +1,8 @@ +## -*- coding: utf-8 -*- +<%inherit file="post.tmpl"/> +<%block name="content"> +%if title: +

      ${title}

      +%endif + ${post.text(lang)} + diff --git a/nikola/data/themes/monospace/templates/tag.tmpl b/nikola/data/themes/monospace/templates/tag.tmpl new file mode 100644 index 0000000..7c89ad1 --- /dev/null +++ b/nikola/data/themes/monospace/templates/tag.tmpl @@ -0,0 +1,7 @@ +## -*- coding: utf-8 -*- +<%inherit file="list_post.tmpl"/> +<%block name="extra_head"> + %for language in translations: + + %endfor + diff --git a/nikola/data/themes/monospace/templates/tags.tmpl b/nikola/data/themes/monospace/templates/tags.tmpl new file mode 100644 index 0000000..369a3d5 --- /dev/null +++ b/nikola/data/themes/monospace/templates/tags.tmpl @@ -0,0 +1,14 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> +
      + +

      ${title}

      +
        + % for text, link in items: +
      • ${text} + % endfor +
      + +
      + diff --git a/nikola/data/themes/orphan/assets/css/code.css b/nikola/data/themes/orphan/assets/css/code.css new file mode 120000 index 0000000..6b2b872 --- /dev/null +++ b/nikola/data/themes/orphan/assets/css/code.css @@ -0,0 +1 @@ +../../../default/assets/css/code.css \ No newline at end of file diff --git a/nikola/data/themes/orphan/assets/css/colorbox.css b/nikola/data/themes/orphan/assets/css/colorbox.css new file mode 120000 index 0000000..2c48dd8 --- /dev/null +++ b/nikola/data/themes/orphan/assets/css/colorbox.css @@ -0,0 +1 @@ +../../../default/assets/css/colorbox.css \ No newline at end of file diff --git a/nikola/data/themes/orphan/assets/css/rst.css b/nikola/data/themes/orphan/assets/css/rst.css new file mode 120000 index 0000000..2e56146 --- /dev/null +++ b/nikola/data/themes/orphan/assets/css/rst.css @@ -0,0 +1 @@ +../../../default/assets/css/rst.css \ No newline at end of file diff --git a/nikola/data/themes/orphan/assets/css/theme.css b/nikola/data/themes/orphan/assets/css/theme.css new file mode 100644 index 0000000..e69de29 diff --git a/nikola/data/themes/orphan/bundles b/nikola/data/themes/orphan/bundles new file mode 100644 index 0000000..aa35d9c --- /dev/null +++ b/nikola/data/themes/orphan/bundles @@ -0,0 +1 @@ +assets/css/all.css=rst.css,code.css,theme.css diff --git a/nikola/data/themes/orphan/messages b/nikola/data/themes/orphan/messages new file mode 120000 index 0000000..3047ea2 --- /dev/null +++ b/nikola/data/themes/orphan/messages @@ -0,0 +1 @@ +../default/messages/ \ No newline at end of file diff --git a/nikola/data/themes/orphan/templates/base.tmpl b/nikola/data/themes/orphan/templates/base.tmpl new file mode 100644 index 0000000..f280d08 --- /dev/null +++ b/nikola/data/themes/orphan/templates/base.tmpl @@ -0,0 +1,36 @@ +## -*- coding: utf-8 -*- +<%namespace file="base_helper.tmpl" import="*"/> + + + + ${html_head()} + <%block name="extra_head"> + + + + %if add_this_buttons: + + % endif +

      + ${blog_title} +

      + <%block name="belowtitle"> + %if len(translations) > 1: + + ${(messages[lang][u"Also available in"])}:  + ${html_translations()} + + %endif + + <%block name="content"> + ${content_footer} + +
        +
      • ${license} + ${html_social()} + ${html_sidebar_links()} +
      • ${search_form} +
      + ${analytics} + + diff --git a/nikola/data/themes/orphan/templates/base_helper.tmpl b/nikola/data/themes/orphan/templates/base_helper.tmpl new file mode 100644 index 0000000..f5fe80c --- /dev/null +++ b/nikola/data/themes/orphan/templates/base_helper.tmpl @@ -0,0 +1,64 @@ +<%def name="html_head()"> + + + + + ${title} | ${blog_title} + %if use_bundles: + + + %else: + + + + + %if has_custom_css: + + + %endif + %endif + %if rss_link: + ${rss_link} + %else: + %for language in translations: + + %endfor + %endif + + + +<%def name="html_social()"> +%if add_this_buttons: + +
      + Share +
        • +
        • +
        • +
        • +
      +
      + + +%endif + + + +<%def name="html_sidebar_links()"> + %for url, text in sidebar_links[lang]: + % if rel_link(permalink, url) == "#": +
    • ${text} + %else: +
    • ${text} + %endif + %endfor + + + +<%def name="html_translations()"> + %for langname in translations.keys(): + %if langname != lang: + ${messages[langname]["LANGUAGE"]} + %endif + %endfor + diff --git a/nikola/data/themes/orphan/templates/gallery.tmpl b/nikola/data/themes/orphan/templates/gallery.tmpl new file mode 100644 index 0000000..37d749f --- /dev/null +++ b/nikola/data/themes/orphan/templates/gallery.tmpl @@ -0,0 +1,27 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="sourcelink"> + +<%block name="content"> +
        + % for link, crumb in crumbs: +
      • / ${crumb}
        • + % endfor +
      + %if text: +

      + ${text} +

      + %endif +
        + % for folder in folders: +
      •  ${folder}
        • + % endfor +
      +
        + %for image in images: +
      • +
        • + %endfor +
      + diff --git a/nikola/data/themes/orphan/templates/index.tmpl b/nikola/data/themes/orphan/templates/index.tmpl new file mode 100644 index 0000000..03dd1f8 --- /dev/null +++ b/nikola/data/themes/orphan/templates/index.tmpl @@ -0,0 +1,18 @@ +## -*- coding: utf-8 -*- +<%namespace name="helper" file="index_helper.tmpl"/> +<%inherit file="base.tmpl"/> +<%block name="content"> + % for post in posts: +
      +

      ${post.title(lang)} +    + ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)} +

      +
      + ${post.text(lang, index_teasers)} + ${helper.html_disqus_link(post)} +
      + % endfor + ${helper.html_pager()} + ${helper.html_disqus_script()} + diff --git a/nikola/data/themes/orphan/templates/index_helper.tmpl b/nikola/data/themes/orphan/templates/index_helper.tmpl new file mode 100644 index 0000000..cfecdf3 --- /dev/null +++ b/nikola/data/themes/orphan/templates/index_helper.tmpl @@ -0,0 +1,31 @@ +<%def name="html_pager()"> +
      + +
      + + + +<%def name="html_disqus_link(post)"> +

      + %if disqus_forum: + Comments + %endif + + + +<%def name="html_disqus_script()"> + %if disqus_forum: + + %endif + diff --git a/nikola/data/themes/orphan/templates/list.tmpl b/nikola/data/themes/orphan/templates/list.tmpl new file mode 100644 index 0000000..a60b508 --- /dev/null +++ b/nikola/data/themes/orphan/templates/list.tmpl @@ -0,0 +1,14 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> + +

      +

      ${title}

      +
        + % for text, link in items: +
      • ${text} + % endfor +
      +
      + + diff --git a/nikola/data/themes/orphan/templates/list_post.tmpl b/nikola/data/themes/orphan/templates/list_post.tmpl new file mode 100644 index 0000000..1a1cdee --- /dev/null +++ b/nikola/data/themes/orphan/templates/list_post.tmpl @@ -0,0 +1,14 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> + +
      +

      ${title}

      + +
      + + diff --git a/nikola/data/themes/orphan/templates/listing.tmpl b/nikola/data/themes/orphan/templates/listing.tmpl new file mode 100644 index 0000000..596a704 --- /dev/null +++ b/nikola/data/themes/orphan/templates/listing.tmpl @@ -0,0 +1,10 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> +
        + % for link, crumb in crumbs: +
      • / ${crumb}
        • + % endfor +
      +${code} + diff --git a/nikola/data/themes/orphan/templates/post.tmpl b/nikola/data/themes/orphan/templates/post.tmpl new file mode 100644 index 0000000..306192d --- /dev/null +++ b/nikola/data/themes/orphan/templates/post.tmpl @@ -0,0 +1,20 @@ +## -*- coding: utf-8 -*- +<%namespace name="helper" file="post_helper.tmpl"/> +<%inherit file="base.tmpl"/> +<%block name="content"> +
      + ${helper.html_title()} +
      + + ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)} + ${helper.html_translations(post)} +   |   + ${messages[lang]["Source"]} + ${helper.html_tags(post)} + +
      + ${post.text(lang)} + ${helper.html_pager(post)} + ${helper.html_disqus(post)} +
      + diff --git a/nikola/data/themes/orphan/templates/post_helper.tmpl b/nikola/data/themes/orphan/templates/post_helper.tmpl new file mode 100644 index 0000000..3e874e9 --- /dev/null +++ b/nikola/data/themes/orphan/templates/post_helper.tmpl @@ -0,0 +1,54 @@ +<%def name="html_title()"> +

      ${title}

      + % if link: +

      ${messages[lang]["Original site"]}

      + % endif + + + +<%def name="html_translations(post)"> + %if len(translations) > 1: + %for langname in translations.keys(): + %if langname != lang: +   |   + ${messages[langname]["Read in English"]} + %endif + %endfor + %endif + + + +<%def name="html_tags(post)"> + %if post.tags: +   |  ${messages[lang]["More posts about"]} + %for tag in post.tags: + ${tag} + %endfor + %endif + + + +<%def name="html_disqus(post)"> + %if disqus_forum: +
      + + + comments powered by Disqus + %endif + + + +<%def name="html_pager(post)"> + + diff --git a/nikola/data/themes/orphan/templates/story.tmpl b/nikola/data/themes/orphan/templates/story.tmpl new file mode 100644 index 0000000..deb0a46 --- /dev/null +++ b/nikola/data/themes/orphan/templates/story.tmpl @@ -0,0 +1,8 @@ +## -*- coding: utf-8 -*- +<%inherit file="post.tmpl"/> +<%block name="content"> +%if title: +

      ${title}

      +%endif + ${post.text(lang)} + diff --git a/nikola/data/themes/orphan/templates/tag.tmpl b/nikola/data/themes/orphan/templates/tag.tmpl new file mode 100644 index 0000000..7c89ad1 --- /dev/null +++ b/nikola/data/themes/orphan/templates/tag.tmpl @@ -0,0 +1,7 @@ +## -*- coding: utf-8 -*- +<%inherit file="list_post.tmpl"/> +<%block name="extra_head"> + %for language in translations: + + %endfor + diff --git a/nikola/data/themes/orphan/templates/tags.tmpl b/nikola/data/themes/orphan/templates/tags.tmpl new file mode 100644 index 0000000..369a3d5 --- /dev/null +++ b/nikola/data/themes/orphan/templates/tags.tmpl @@ -0,0 +1,14 @@ +## -*- coding: utf-8 -*- +<%inherit file="base.tmpl"/> +<%block name="content"> +
      + +

      ${title}

      +
        + % for text, link in items: +
      • ${text} + % endfor +
      + +
      + diff --git a/nikola/data/themes/site/assets/css/theme.css b/nikola/data/themes/site/assets/css/theme.css index 6b21e2e..32c9f24 100644 --- a/nikola/data/themes/site/assets/css/theme.css +++ b/nikola/data/themes/site/assets/css/theme.css @@ -1,5 +1,11 @@ -body { margin-top: 50px;} - +body { + padding-top: 60px; +} +@media (max-width: 979px) { + body { + padding-top: 0px; + } +} #container { width: 960px; margin: 50 auto; @@ -23,5 +29,3 @@ img { .footerbox {padding: 15px; text-align: center; margin-bottom: 15px;} -#addthisbox {top: 180px; left:10px;} - diff --git a/nikola/data/themes/site/templates/base.tmpl b/nikola/data/themes/site/templates/base.tmpl index 46e9b39..784f29a 100644 --- a/nikola/data/themes/site/templates/base.tmpl +++ b/nikola/data/themes/site/templates/base.tmpl @@ -1,40 +1,9 @@ ## -*- coding: utf-8 -*- +<%namespace file="base_helper.tmpl" import="*"/> - - - - - ${title} | ${blog_title} - - %if use_bundles: - - - %else: - - - - - - - %if exists("files/assets/css/custom.css", not_empty=True): - - %endif - - - %endif - - - %if rss_link: - ${rss_link} - %else: - %for language in translations: - - %endfor - %endif + ${html_head()} <%block name="extra_head"> @@ -47,13 +16,7 @@ ${blog_title}
        - %for url, text in sidebar_links[lang]: - % if rel_link(permalink, url) == "#": -
      • ${text} - %else: -
      • ${text} - %endif - %endfor + ${html_sidebar_links()}
      %if search_form: ${search_form} @@ -61,13 +24,7 @@
        <%block name="belowtitle"> %if len(translations) > 1: -
      • - %for langname in translations.keys(): - %if langname != lang: - ${messages[langname]["LANGUAGE"]} - %endif - %endfor -
        • +
      • ${html_translations()}
        • %endif <%block name="sourcelink"> @@ -76,7 +33,6 @@
      • -
      <%block name="content"> @@ -85,20 +41,7 @@ ${content_footer}
      - %if add_this_buttons: - -
      -
      - - - - - -
      -
      - - - %endif +${html_social()} ${analytics} diff --git a/nikola/data/themes/site/templates/post.tmpl b/nikola/data/themes/site/templates/post.tmpl index f777366..06ca10f 100644 --- a/nikola/data/themes/site/templates/post.tmpl +++ b/nikola/data/themes/site/templates/post.tmpl @@ -1,50 +1,19 @@ ## -*- coding: utf-8 -*- +<%namespace name="helper" file="post_helper.tmpl"/> <%inherit file="base.tmpl"/> <%block name="content">
      -

      ${title}

      - % if link: -

      ${messages[lang]["Original site"]}

      - % endif + ${helper.html_title()}
      - ${messages[lang]["Posted"]}: ${post.date} - - %if len(translations) > 1: - %for langname in translations.keys(): - %if langname != lang: -   |   - ${messages[langname][u"Read in English"]} - %endif - %endfor - %endif - %if post.tags: -   |  ${messages[lang]["More posts about"]} - %for tag in post.tags: - ${tag} - %endfor - %endif + ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)} + ${helper.html_translations(post)} + ${helper.html_tags(post)}
      ${post.text(lang)} - - %if disqus_forum: -
      - - - comments powered by Disqus - %endif + ${helper.html_pager(post)} + ${helper.html_disqus(post)}
      -- cgit v1.2.3