diff --git a/.tx/config b/.tx/config index 1bc3e023721..3cdbd5afb28 100644 --- a/.tx/config +++ b/.tx/config @@ -1,5 +1,5 @@ [main] -host = http://www.transifex.net +host = https://www.transifex.com [ckan.2-0] file_filter = ckan/i18n//LC_MESSAGES/ckan.po diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 342c8c0ef8b..5bfbc1701a7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,15 @@ Changelog --------- +v2.2 +==== + +API changes and deprecations: + +* The edit() and after_update() methods of IPackageController plugins are now + called when updating a resource using the web frontend or the + resource_update API action [#1052] + v2.0.1 2013-06-11 ================= diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 11ee2e4c150..50cbfb1d0d5 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -161,11 +161,10 @@ This section will walk you through the steps for making a pull request. its own branch forked from the master branch. The name of the branch should include the issue number (if this work has an - issue in the `CKAN issue tracker`_), the branch type (e.g. "feature" or - "bug"), and a brief one-line synopsis of the work, for example:: + issue in the `CKAN issue tracker`_), and a brief one-line synopsis of the work, + for example:: - 2298-feature-add-sort-by-controls-to-search-page - 1518-bug-upload-file-with-spaces + 2298-add-sort-by-controls-to-search-page #. Fork CKAN on GitHub diff --git a/bin/ckan_spam.py b/bin/ckan_spam.py index 29fd9df62eb..b0fd81ace31 100644 --- a/bin/ckan_spam.py +++ b/bin/ckan_spam.py @@ -14,7 +14,7 @@ import os -from sqlobject import * +import sqlobject import loadconfig path = os.path.abspath(cfg_path) @@ -36,7 +36,7 @@ def purge_packages_by_name(): pkg = model.Package.byName(pkg_name) # for efficiency reasons best to have revisions in descending order sel = model.PackageRevision.select( - AND(model.PackageRevision.q.baseID==pkg.id, + sqlobject.AND(model.PackageRevision.q.baseID==pkg.id, model.PackageRevision.q.revisionID>=start_at_id), orderBy=-model.PackageRevision.q.revisionID, ) diff --git a/bin/travis-build b/bin/travis-build index df7c398d1b6..612cefb937c 100755 --- a/bin/travis-build +++ b/bin/travis-build @@ -27,6 +27,9 @@ pip install -r requirements.txt -r dev-requirements.txt --use-mirrors python setup.py develop +# Install npm dpes for mocha +npm install -g mocha-phantomjs phantomjs + # Configure Solr echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty # FIXME the solr schema cannot be hardcoded as it is dependent on the ckan version @@ -47,5 +50,23 @@ fi cat test-core.ini -# And finally, run the tests +# Run mocha front-end tests +# We need ckan to be running for some tests +paster serve test-core.ini & +sleep 5 # Make sure the server has fully started +mocha-phantomjs http://localhost:5000/base/test/index.html +# Did an error occur? +MOCHA_ERROR=$? +# We are done so kill ckan +killall paster + +# And finally, run the nosetests nosetests --ckan --with-pylons=test-core.ini --nologcapture ckan ckanext +# Did an error occur? +NOSE_ERROR=$? + +[ "0" -ne "$MOCHA_ERROR" ] && echo MOCKA tests have failed +[ "0" -ne "$NOSE_ERROR" ] && echo NOSE tests have failed + +# If an error occured in our tests make sure travis knows +exit `expr $MOCHA_ERROR + $NOSE_ERROR` diff --git a/build.sh b/build.sh deleted file mode 100755 index 51da5ded36a..00000000000 --- a/build.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -# This is a script which uses BuildKit 0.2.0 to automatically package CKAN and -# its dependencies for use as Debian packages on Ubuntu 10.04. -# -# See the BuildKit documentation or look at the help to see what these commands -# do. eg: -# -# buildkit --help -# -# The licenses and solrpy packages have to be built separately from the others -# because they are slighlty non-standard. All other CKAN dependencies are -# automatically handled by the --deps option to the CKAN build command. -# -# Over time, as CKAN and its dependencies follow conventions more closely the -# edge cases handled by this script should go away and the build should become -# simpler. -# -# Install: -# -# sudo apt-get update -# sudo apt-get install -y wget -# echo "deb http://apt.3aims.com/buildkit-0.2.2 lucid universe" | sudo tee /etc/apt/sources.list.d/3aims.list -# wget -qO- "http://apt.3aims.com/packages_public.key" | sudo apt-key add - -# sudo apt-get update -# sudo apt-get install buildkit-deb buildkit-apt-repo - - -CKAN_PACKAGE_VERSION=$1 -DEPS_PACKAGE_VERSION=$2 -# If you don't run this command from the CKAN source directory, specify the -# path to CKAN here -CKAN_PATH=$PWD -# You'll need to create the repo if it doesn't exist: -# sudo -u buildkit buildkit repo clone base_lucid ckan-1.5.1 -REPO_NAME="ckan-1.5.1" -PIP_DOWNLOAD_CACHE=${CKAN_PATH}/build/env/cache -EMAIL=packaging@okfn.org -NAME="James Gardner" - -# Clean the build environment -echo "Cleaning the environment ..." -rm -r ${CKAN_PATH}/dist/ -rm -rf ${CKAN_PATH}/build/env/src -mkdir -p ${CKAN_PATH}/dist/buildkit -echo "done." - -echo "Buildling the packages ..." -# Create the python-ckan debian package -buildkit pkg python -p $CKAN_PACKAGE_VERSION --delete "solrpy" --distro-dep "python-solr" --delete "licenses" --distro-dep "python-licenses" --delete "repoze.who-friendlyform" --rename "repoze.who.plugins.openid -> repoze.who-plugins" --rename "babel -> pybabel" --author-email="$EMAIL" --author-name="$NAME" --packager-email="$EMAIL" --packager-name="$NAME" --deps --exclude=test/generate_package --conflict-module "sqlalchemy-migrate -> migrate" --conflict-module "sqlalchemy -> lib/sqlalchemy" --debian-dir --url http://ckan.org ${CKAN_PATH} - -# Creates the ckan debian package (of which python-ckan is a dependency) -buildkit pkg nonpython -p $CKAN_PACKAGE_VERSION --deb --output-dir ${CKAN_PATH}/dist/buildkit ${CKAN_PATH}/ckan_deb - -# Build python-solr -${CKAN_PATH}/build/buildkit/env/bin/pip install --download-cache ${CKAN_PATH}/build/buildkit/env/cache --no-install --upgrade "solrpy==0.9.4" -mv ${CKAN_PATH}/build/buildkit/env/build/solrpy ${CKAN_PATH}/build/buildkit/env/build/solr -# We need to rename the package here -sed -e "s,solrpy,solr," -i ${CKAN_PATH}/build/buildkit/env/build/solr/setup.py -# We need to specify an author explicitly since it is missing we'll use the CKAN one -buildkit pkg python -p $DEPS_PACKAGE_VERSION --author-email="$EMAIL" --author-name="$NAME" --packager-email="$EMAIL" --packager-name="$NAME" --debian-dir ${CKAN_PATH}/build/buildkit/env/build/solr/ -cp ${CKAN_PATH}/build/buildkit/env/build/solr/dist/buildkit/*.deb ${CKAN_PATH}/dist/buildkit/ - -# Build python-licenses -${CKAN_PATH}/build/buildkit/env/bin/pip install --download-cache ${CKAN_PATH}/build/buildkit/env/cache --no-install --upgrade "licenses==0.6.1" -buildkit pkg python --deb -p $DEPS_PACKAGE_VERSION --author-email="$EMAIL" --author-name="$NAME" --packager-email="$EMAIL" --packager-name="$NAME" ${CKAN_PATH}/build/buildkit/env/build/licenses -cp ${CKAN_PATH}/build/buildkit/env/build/licenses/dist/buildkit/*.deb ${CKAN_PATH}/dist/buildkit/ -echo "done." - -# Add the .debs to the repository and the export the latest files for upload -# echo "Adding the packages to the $REPO_NAME repo using files in ${CKAN_PATH}/dist/buildkit/*.deb ..." -# sudo -u buildkit buildkit repo remove -a $REPO_NAME dummy_arg -# sudo -u buildkit buildkit repo add $REPO_NAME ${CKAN_PATH}/dist/buildkit/*.deb -# echo "done." diff --git a/ckan/__init__.py b/ckan/__init__.py index bcc319eb7d8..c008dc65ba7 100644 --- a/ckan/__init__.py +++ b/ckan/__init__.py @@ -1,4 +1,4 @@ -__version__ = '2.1a' +__version__ = '2.2a' __description__ = 'Comprehensive Knowledge Archive Network (CKAN) Software' __long_description__ = \ diff --git a/ckan/config/routing.py b/ckan/config/routing.py index 0d3c00c5838..aba76212bad 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -279,7 +279,6 @@ def make_map(): requirements=dict(action='|'.join([ 'edit', 'delete', - 'members', 'member_new', 'member_delete', 'history', @@ -291,6 +290,10 @@ def make_map(): ]))) m.connect('group_about', '/group/about/{id}', action='about', ckan_icon='info-sign'), + m.connect('group_edit', '/group/edit/{id}', action='edit', + ckan_icon='edit') + m.connect('group_members', '/group/members/{id}', action='members', + ckan_icon='group'), m.connect('group_activity', '/group/activity/{id}/{offset}', action='activity', ckan_icon='time'), m.connect('group_read', '/group/{id}', action='read', @@ -343,9 +346,15 @@ def make_map(): m.connect('/user/activity/{id}/{offset}', action='activity') m.connect('user_activity_stream', '/user/activity/{id}', action='activity', ckan_icon='time') - m.connect('/dashboard/{offset}', action='dashboard') m.connect('user_dashboard', '/dashboard', action='dashboard', ckan_icon='list') + m.connect('user_dashboard_datasets', '/dashboard/datasets', + action='dashboard_datasets', ckan_icon='sitemap') + m.connect('user_dashboard_groups', '/dashboard/groups', + action='dashboard_groups', ckan_icon='group') + m.connect('user_dashboard_organizations', '/dashboard/organizations', + action='dashboard_organizations', ckan_icon='building') + m.connect('/dashboard/{offset}', action='dashboard') m.connect('user_follow', '/user/follow/{id}', action='follow') m.connect('/user/unfollow/{id}', action='unfollow') m.connect('user_followers', '/user/followers/{id:.*}', diff --git a/ckan/controllers/admin.py b/ckan/controllers/admin.py index 128aae67afe..cb5e84b069b 100644 --- a/ckan/controllers/admin.py +++ b/ckan/controllers/admin.py @@ -32,10 +32,10 @@ def _get_config_form_items(self): {'text': 'Maroon', 'value': '/base/css/maroon.css'}, {'text': 'Fuchsia', 'value': '/base/css/fuchsia.css'}] items = [ - {'name': 'ckan.site_title', 'control': 'input', 'label': _('Site Title'), 'placeholder': _('')}, - {'name': 'ckan.main_css', 'control': 'select', 'options': styles, 'label': _('Style'), 'placeholder': _('')}, - {'name': 'ckan.site_description', 'control': 'input', 'label': _('Site Tag Line'), 'placeholder': _('')}, - {'name': 'ckan.site_logo', 'control': 'input', 'label': _('Site Tag Logo'), 'placeholder': _('')}, + {'name': 'ckan.site_title', 'control': 'input', 'label': _('Site Title'), 'placeholder': ''}, + {'name': 'ckan.main_css', 'control': 'select', 'options': styles, 'label': _('Style'), 'placeholder': ''}, + {'name': 'ckan.site_description', 'control': 'input', 'label': _('Site Tag Line'), 'placeholder': ''}, + {'name': 'ckan.site_logo', 'control': 'input', 'label': _('Site Tag Logo'), 'placeholder': ''}, {'name': 'ckan.site_about', 'control': 'markdown', 'label': _('About'), 'placeholder': _('About page text')}, {'name': 'ckan.site_intro_text', 'control': 'markdown', 'label': _('Intro Text'), 'placeholder': _('Text on home page')}, {'name': 'ckan.site_custom_css', 'control': 'textarea', 'label': _('Custom CSS'), 'placeholder': _('Customisable css inserted into the page header')}, diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py index 310be042f1b..ccef46bfe78 100644 --- a/ckan/controllers/group.py +++ b/ckan/controllers/group.py @@ -281,7 +281,7 @@ def pager_url(q=None, page=None): default_facet_titles = {'groups': _('Groups'), 'tags': _('Tags'), 'res_format': _('Formats'), - 'license': _('License')} + 'license_id': _('License')} for facet in g.facets: if facet in default_facet_titles: diff --git a/ckan/controllers/organization.py b/ckan/controllers/organization.py index b411f8e2b31..b44d95e057f 100644 --- a/ckan/controllers/organization.py +++ b/ckan/controllers/organization.py @@ -19,7 +19,7 @@ def _group_form(self, group_type=None): return 'organization/new_organization_form.html' def _form_to_db_schema(self, group_type=None): - return lookup_group_plugin(group_type).form_to_db_schema() + return group.lookup_group_plugin(group_type).form_to_db_schema() def _db_to_form_schema(self, group_type=None): '''This is an interface to manipulate data from the database @@ -48,7 +48,7 @@ def _read_template(self, group_type): return 'organization/read.html' def _history_template(self, group_type): - return lookup_group_plugin(group_type).history_template() + return group.lookup_group_plugin(group_type).history_template() def _edit_template(self, group_type): return 'organization/edit.html' diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index 65541ee33bf..834b3ba38b0 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -344,6 +344,11 @@ def read(self, id, format='html'): c.current_package_id = c.pkg.id c.related_count = c.pkg.related_count + # can the resources be previewed? + for resource in c.pkg_dict['resources']: + resource['can_be_previewed'] = self._resource_preview( + {'resource': resource, 'package': c.pkg_dict}) + self._setup_template_variables(context, {'id': id}, package_type=package_type) @@ -1142,8 +1147,17 @@ def resource_read(self, id, resource_id): c.datastore_api = '%s/api/action' % config.get('ckan.site_url', '').rstrip('/') c.related_count = c.pkg.related_count + + c.resource['can_be_previewed'] = self._resource_preview( + {'resource': c.resource, 'package': c.package}) return render('package/resource_read.html') + def _resource_preview(self, data_dict): + return bool(datapreview.res_format(data_dict['resource']) + in datapreview.direct() + datapreview.loadable() + or datapreview.get_preview_plugin( + data_dict, return_first=True)) + def resource_download(self, id, resource_id): """ Provides a direct download by redirecting the user to the url stored @@ -1319,9 +1333,9 @@ def resource_datapreview(self, id, resource_id): ''' Embeded page for a resource data-preview. - Depending on the type, different previews are loaded. - This could be an img tag where the image is loaded directly or an iframe that - embeds a webpage, recline or a pdf preview. + Depending on the type, different previews are loaded. This could be an + img tag where the image is loaded directly or an iframe that embeds a + webpage, recline or a pdf preview. ''' context = { 'model': model, @@ -1335,30 +1349,17 @@ def resource_datapreview(self, id, resource_id): c.package = get_action('package_show')(context, {'id': id}) data_dict = {'resource': c.resource, 'package': c.package} - on_same_domain = datapreview.resource_is_on_same_domain(data_dict) - data_dict['resource']['on_same_domain'] = on_same_domain - - # FIXME this wants to not use plugins as it is an imported name - # and we already import it an p should really only be in - # extensu=ions in my opinion also just make it look nice and be - # readable grrrrrr - plugins = p.PluginImplementations(p.IResourcePreview) - plugins_that_can_preview = [plugin for plugin in plugins - if plugin.can_preview(data_dict)] - if len(plugins_that_can_preview) == 0: - abort(409, _('No preview has been defined.')) - if len(plugins_that_can_preview) > 1: - log.warn('Multiple previews are possible. {0}'.format( - plugins_that_can_preview)) - plugin = plugins_that_can_preview[0] - plugin.setup_template_variables(context, data_dict) + preview_plugin = datapreview.get_preview_plugin(data_dict) - c.resource_json = json.dumps(c.resource) + if preview_plugin is None: + abort(409, _('No preview has been defined.')) + preview_plugin.setup_template_variables(context, data_dict) + c.resource_json = json.dumps(c.resource) except NotFound: abort(404, _('Resource not found')) except NotAuthorized: abort(401, _('Unauthorized to read resource %s') % id) else: - return render(plugin.preview_template(context, data_dict)) + return render(preview_plugin.preview_template(context, data_dict)) diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py index 7fdd6534605..ab162ef0659 100644 --- a/ckan/controllers/user.py +++ b/ckan/controllers/user.py @@ -1,9 +1,9 @@ import logging from urllib import quote +from urlparse import urlparse from pylons import config -import ckan.lib.i18n as i18n import ckan.lib.base as base import ckan.model as model import ckan.lib.helpers as h @@ -15,7 +15,7 @@ import ckan.lib.navl.dictization_functions as dictization_functions import ckan.plugins as p -from ckan.common import _, session, c, g, request +from ckan.common import _, c, g, request log = logging.getLogger(__name__) @@ -301,12 +301,6 @@ def _save_edit(self, id, context): return self.edit(id, data_dict, errors, error_summary) def login(self, error=None): - lang = session.pop('lang', None) - if lang: - session.save() - return h.redirect_to(locale=str(lang), controller='user', - action='login') - # Do any plugin login stuff for item in p.PluginImplementations(p.IAuthenticator): item.login() @@ -320,7 +314,10 @@ def login(self, error=None): g.openid_enabled = False if not c.user: - came_from = request.params.get('came_from', '') + came_from = request.params.get('came_from') + if not came_from: + came_from = h.url_for(controller='user', action='logged_in', + __ckan_no_root=True) c.login_handler = h.url_for( self._get_repoze_handler('login_handler_path'), came_from=came_from) @@ -333,14 +330,10 @@ def login(self, error=None): return render('user/logout_first.html') def logged_in(self): - # we need to set the language via a redirect - lang = session.pop('lang', None) - session.save() + # redirect if needed came_from = request.params.get('came_from', '') - - # we need to set the language explicitly here or the flash - # messages will not be translated. - i18n.set_lang(lang) + if self._sane_came_from(came_from): + return h.redirect_to(str(came_from)) if c.user: context = None @@ -350,8 +343,6 @@ def logged_in(self): h.flash_success(_("%s is now logged in") % user_dict['display_name']) - if came_from: - return h.redirect_to(str(came_from)) return self.me() else: err = _('Login failed. Bad username or password.') @@ -360,34 +351,26 @@ def logged_in(self): 'with a user account.)') if h.asbool(config.get('ckan.legacy_templates', 'false')): h.flash_error(err) - h.redirect_to(locale=lang, controller='user', + h.redirect_to(controller='user', action='login', came_from=came_from) else: return self.login(error=err) def logout(self): - # save our language in the session so we don't lose it - session['lang'] = request.environ.get('CKAN_LANG') - session.save() - # Do any plugin logout stuff for item in p.PluginImplementations(p.IAuthenticator): item.logout() - - h.redirect_to(self._get_repoze_handler('logout_handler_path')) - - def set_lang(self, lang): - # this allows us to set the lang in session. Used for logging - # in/out to prevent being lost when repoze.who redirects things - session['lang'] = str(lang) - session.save() + url = h.url_for(controller='user', action='logged_out_page', + __ckan_no_root=True) + h.redirect_to(self._get_repoze_handler('logout_handler_path') + + '?came_from=' + url) def logged_out(self): - # we need to get our language info back and the show the correct page - lang = session.get('lang') - c.user = None - session.delete() - h.redirect_to(locale=lang, controller='user', action='logged_out_page') + # redirect if needed + came_from = request.params.get('came_from', '') + if self._sane_came_from(came_from): + return h.redirect_to(str(came_from)) + h.redirect_to(controller='user', action='logged_out_page') def logged_out_page(self): return render('user/logout.html') @@ -619,6 +602,24 @@ def dashboard(self, id=None, offset=0): return render('user/dashboard.html') + def dashboard_datasets(self): + context = {'for_view': True} + data_dict = {'user_obj': c.userobj} + self._setup_template_variables(context, data_dict) + return render('user/dashboard_datasets.html') + + def dashboard_organizations(self): + context = {'for_view': True} + data_dict = {'user_obj': c.userobj} + self._setup_template_variables(context, data_dict) + return render('user/dashboard_organizations.html') + + def dashboard_groups(self): + context = {'for_view': True} + data_dict = {'user_obj': c.userobj} + self._setup_template_variables(context, data_dict) + return render('user/dashboard_groups.html') + def follow(self, id): '''Start following this user.''' context = {'model': model, @@ -657,3 +658,14 @@ def unfollow(self, id): or e.error_dict) h.flash_error(error_message) h.redirect_to(controller='user', action='read', id=id) + + def _sane_came_from(self, url): + '''Returns True if came_from is local''' + if not url or (len(url) >= 2 and url.startswith('//')): + return False + parsed = urlparse(url) + if parsed.scheme: + domain = urlparse(h.url_for('/', qualified=True)).netloc + if domain != parsed.netloc: + return False + return True diff --git a/ckan/lib/base.py b/ckan/lib/base.py index 5c755650c21..7640b3dc7e8 100644 --- a/ckan/lib/base.py +++ b/ckan/lib/base.py @@ -25,6 +25,7 @@ import ckan.lib.app_globals as app_globals from ckan.plugins import PluginImplementations, IGenshiStreamFilter, IAuthenticator import ckan.model as model +import ckan.lib.maintain as maintain # These imports are for legacy usages and will be removed soon these should # be imported directly from ckan.common for internal ckan code and via the @@ -224,15 +225,9 @@ def __before__(self, action, **params): i18n.handle_request(request, c) - # If the user is logged in add their number of new activities to the - # template context. - if c.userobj: - from ckan.logic import get_action - new_activities_count = get_action( - 'dashboard_new_activities_count') - context = {'model': model, 'session': model.Session, - 'user': c.user or c.author} - c.new_activities = new_activities_count(context, {}) + maintain.deprecate_context_item( + 'new_activities', + 'Use `h.new_activities` instead.') def _identify_user(self): '''Try to identify the user diff --git a/ckan/lib/celery_app.py b/ckan/lib/celery_app.py index 95f15937f18..f95fcae3447 100644 --- a/ckan/lib/celery_app.py +++ b/ckan/lib/celery_app.py @@ -4,7 +4,6 @@ from pylons import config as pylons_config from pkg_resources import iter_entry_points, VersionConflict -#from celery.loaders.base import BaseLoader log = logging.getLogger(__name__) @@ -49,16 +48,16 @@ log.critical(error) pass -celery.conf.update(default_config) -celery.loader.conf.update(default_config) - try: for key, value in config.items('app:celery'): if key in LIST_PARAMS: - celery.conf[key.upper()] = value.split() - celery.loader.conf[key.upper()] = value.split() + default_config[key.upper()] = value.split() else: - celery.conf[key.upper()] = value - celery.loader.conf[key.upper()] = value.split() + default_config[key.upper()] = value except ConfigParser.NoSectionError: pass + +# Thes update of configuration means it is only possible to set each +# key once so this is done once all of the options have been decided. +celery.conf.update(default_config) +celery.loader.conf.update(default_config) diff --git a/ckan/lib/datapreview.py b/ckan/lib/datapreview.py index 27e7804bc83..9dc5f48f08f 100644 --- a/ckan/lib/datapreview.py +++ b/ckan/lib/datapreview.py @@ -6,6 +6,7 @@ """ import urlparse +import logging import pylons.config as config @@ -16,9 +17,30 @@ 'n3', 'n-triples', 'turtle', 'plain', 'atom', 'rss', 'txt'] +log = logging.getLogger(__name__) + + +def direct(): + ''' Directly embeddable formats.''' + direct_embed = config.get('ckan.preview.direct', '').split() + return direct_embed or DEFAULT_DIRECT_EMBED + + +def loadable(): + ''' Iframe loadable formats. ''' + loadable_in_iframe = config.get('ckan.preview.loadable', '').split() + return loadable_in_iframe or DEFAULT_LOADABLE_IFRAME + + +def res_format(resource): + ''' The assumed resource format in lower case. ''' + if not resource['url']: + return None + return (resource['format'] or resource['url'].split('.')[-1]).lower() + def compare_domains(urls): - ''' Return True if the domains of the provided are the same. + ''' Return True if the domains of the provided urls are the same. ''' first_domain = None for url in urls: @@ -41,7 +63,7 @@ def compare_domains(urls): return True -def resource_is_on_same_domain(data_dict): +def _on_same_domain(data_dict): # compare CKAN domain and resource URL ckan_url = config.get('ckan.site_url', '//localhost:5000') resource_url = data_dict['resource']['url'] @@ -49,14 +71,53 @@ def resource_is_on_same_domain(data_dict): return compare_domains([ckan_url, resource_url]) -def can_be_previewed(data_dict): - ''' - Determines whether there is an extension that can preview the resource. +def get_preview_plugin(data_dict, return_first=False): + '''Determines whether there is an extension that can preview the resource. :param data_dict: contains a resource and package dict. The resource dict has to have a value for ``on_same_domain`` :type data_dict: dictionary - ''' - data_dict['resource']['on_same_domain'] = resource_is_on_same_domain(data_dict) - plugins = p.PluginImplementations(p.IResourcePreview) - return any(plugin.can_preview(data_dict) for plugin in plugins) + + :param return_first: If True return the first plugin that can preview + :type return_first: bool + + Returns a dict of plugins that can preview or ones that are fixable''' + + data_dict['resource']['on_same_domain'] = _on_same_domain(data_dict) + + plugins_that_can_preview = [] + plugins_fixable = [] + for plugin in p.PluginImplementations(p.IResourcePreview): + p_info = {'plugin': plugin, 'quality': 1} + data = plugin.can_preview(data_dict) + # old school plugins return true/False + if isinstance(data, bool): + p_info['can_preview'] = data + else: + # new school provide a dict + p_info.update(data) + # if we can preview + if p_info['can_preview']: + if return_first: + plugin + plugins_that_can_preview.append(p_info) + elif p_info.get('fixable'): + plugins_fixable.append(p_info) + + num_plugins = len(plugins_that_can_preview) + if num_plugins == 0: + # we didn't find any. see if any could be made to work + for plug in plugins_fixable: + log.info('%s would allow previews to fix: %s' % ( + plug['plugin'], plug['fixable'])) + preview_plugin = None + elif num_plugins == 1: + # just one available + preview_plugin = plugins_that_can_preview[0]['plugin'] + else: + # multiple plugins so get the best one + plugs = [pl['plugin'] for pl in plugins_that_can_preview] + log.warn('Multiple previews are possible. {0}'.format(plugs)) + preview_plugin = max(plugins_that_can_preview, + key=lambda x: x['quality'])['plugin'] + return preview_plugin diff --git a/ckan/lib/dictization/model_save.py b/ckan/lib/dictization/model_save.py index 8afed9bdbc5..a60fb4dec68 100644 --- a/ckan/lib/dictization/model_save.py +++ b/ckan/lib/dictization/model_save.py @@ -87,9 +87,6 @@ def package_resource_list_save(res_dicts, package, context): else: resource.state = 'deleted' resource_list.append(resource) - tag_package_tag = dict((package_tag.tag, package_tag) - for package_tag in - package.package_tag_all) def package_extras_save(extra_dicts, obj, context): diff --git a/ckan/lib/formatters.py b/ckan/lib/formatters.py index 5e3d51f7c6d..193580aa28f 100644 --- a/ckan/lib/formatters.py +++ b/ckan/lib/formatters.py @@ -68,35 +68,55 @@ def _month_dec(): _month_sept, _month_oct, _month_nov, _month_dec] -def localised_nice_date(datetime_): - ''' Returns a friendly localised unicode representation of a datetime. ''' - now = datetime.datetime.now() - date_diff = now - datetime_ - days = date_diff.days - if days < 1 and now > datetime_: - # less than one day - seconds = date_diff.seconds - if seconds < 3600: - # less than one hour - if seconds < 60: - return _('Just now') +def localised_nice_date(datetime_, show_date=False, with_hours=False): + ''' Returns a friendly localised unicode representation of a datetime. + + :param datetime_: The date to format + :type datetime_: datetime + :param show_date: Show date not 2 days ago etc + :type show_date: bool + :param with_hours: should the `hours:mins` be shown for dates + :type with_hours: bool + + :rtype: sting + ''' + if not show_date: + now = datetime.datetime.now() + date_diff = now - datetime_ + days = date_diff.days + if days < 1 and now > datetime_: + # less than one day + seconds = date_diff.seconds + if seconds < 3600: + # less than one hour + if seconds < 60: + return _('Just now') + else: + return ungettext('{mins} minute ago', '{mins} minutes ago', + seconds / 60).format(mins=seconds / 60) else: - return ungettext('{mins} minute ago', '{mins} minutes ago', - seconds / 60).format(mins=seconds / 60) - else: - return ungettext('{hours} hour ago', '{hours} hours ago', - seconds / 3600).format(hours=seconds / 3600) - # more than one day - if days < 31: - return ungettext('{days} day ago', '{days} days ago', - days).format(days=days) + return ungettext('{hours} hour ago', '{hours} hours ago', + seconds / 3600).format(hours=seconds / 3600) + # more than one day + if days < 31: + return ungettext('{days} day ago', '{days} days ago', + days).format(days=days) # actual date - month = datetime_.month - day = datetime_.day - year = datetime_.year - month_name = _MONTH_FUNCTIONS[month - 1]() - return _('{month} {day}, {year}').format(month=month_name, day=day, - year=year) + details = { + 'min': datetime_.minute, + 'hour': datetime_.hour, + 'day': datetime_.day, + 'year': datetime_.year, + 'month': _MONTH_FUNCTIONS[datetime_.month - 1](), + } + if with_hours: + return ( + # NOTE: This is for translating dates like `April 24, 2013, 10:45` + _('{month} {day}, {year}, {hour:02}:{min:02}').format(**details)) + else: + return ( + # NOTE: This is for translating dates like `April 24, 2013` + _('{month} {day}, {year}').format(**details)) def localised_number(number): diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index aa57456fb7b..250fbf67e73 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -780,26 +780,35 @@ def _range(self, regexp_match): def render_datetime(datetime_, date_format=None, with_hours=False): - '''Render a datetime object or timestamp string as a pretty string - (Y-m-d H:m). + '''Render a datetime object or timestamp string as a localised date or + in the requested format. If timestamp is badly formatted, then a blank string is returned. + + :param datetime_: the date + :type datetime_: datetime or ISO string format + :param date_format: a date format + :type date_format: string + :param with_hours: should the `hours:mins` be shown + :type with_hours: bool + + :rtype: string ''' - if not date_format: - date_format = '%b %d, %Y' - if with_hours: - date_format += ', %H:%M' - if isinstance(datetime_, datetime.datetime): - return datetime_.strftime(date_format) - elif isinstance(datetime_, basestring): + if isinstance(datetime_, basestring): try: datetime_ = date_str_to_datetime(datetime_) except TypeError: return '' except ValueError: return '' - return datetime_.strftime(date_format) - else: + # check we are now a datetime + if not isinstance(datetime_, datetime.datetime): return '' + # if date_format was supplied we use it + if date_format: + return datetime_.strftime(date_format) + # the localised date + return formatters.localised_nice_date(datetime_, show_date=True, + with_hours=with_hours) def date_str_to_datetime(date_str): @@ -1269,18 +1278,24 @@ def popular(type_, number, min=1, title=None): return snippet('snippets/popular.html', title=title, number=number, min=min) -def groups_available(): - ''' return a list of available groups ''' - context = {'model': model, 'session': model.Session, - 'user': c.user or c.author} - data_dict = {'available_only': True} +def groups_available(am_member=False): + '''Return a list of the groups that the user is authorized to edit. + + :param am_member: if True return only the groups the logged-in user is a + member of, otherwise return all groups that the user is authorized to + edit (for example, sysadmin users are authorized to edit all groups) + (optional, default: False) + :type am-member: boolean + + ''' + context = {} + data_dict = {'available_only': True, 'am_member': am_member} return logic.get_action('group_list_authz')(context, data_dict) def organizations_available(permission='edit_group'): ''' return a list of available organizations ''' - context = {'model': model, 'session': model.Session, - 'user': c.user} + context = {'user': c.user} data_dict = {'permission': permission} return logic.get_action('organization_list_for_user')(context, data_dict) @@ -1486,7 +1501,7 @@ def format_resource_items(items): return sorted(output, key=lambda x: x[0]) -def resource_preview(resource, pkg_id): +def resource_preview(resource, package): ''' Returns a rendered snippet for a embedded resource preview. @@ -1495,30 +1510,22 @@ def resource_preview(resource, pkg_id): that embeds a web page, recline or a pdf preview. ''' - format_lower = resource['format'].lower() - directly = False - url = '' - - data_dict = {'resource': resource, 'package': c.package} - if not resource['url']: return snippet("dataviewer/snippets/no_preview.html", resource_type=format_lower, reason=_(u'The resource url is not specified.')) - direct_embed = config.get('ckan.preview.direct', '').split() - if not direct_embed: - direct_embed = datapreview.DEFAULT_DIRECT_EMBED - loadable_in_iframe = config.get('ckan.preview.loadable', '').split() - if not loadable_in_iframe: - loadable_in_iframe = datapreview.DEFAULT_LOADABLE_IFRAME - - if datapreview.can_be_previewed(data_dict): + + format_lower = datapreview.res_format(resource) + directly = False + data_dict = {'resource': resource, 'package': package} + + if datapreview.get_preview_plugin(data_dict, return_first=True): url = url_for(controller='package', action='resource_datapreview', - resource_id=resource['id'], id=pkg_id, qualified=True) - elif format_lower in direct_embed: + resource_id=resource['id'], id=package['id'], qualified=True) + elif format_lower in datapreview.direct(): directly = True url = resource['url'] - elif format_lower in loadable_in_iframe: + elif format_lower in datapreview.loadable(): url = resource['url'] else: reason = None @@ -1576,6 +1583,19 @@ def SI_number_span(number): localised_nice_date = formatters.localised_nice_date localised_filesize = formatters.localised_filesize +def new_activities(): + '''Return the number of activities for the current user. + + See :func:`logic.action.get.dashboard_new_activities_count` for more + details. + + ''' + if not c.userobj: + return None + action = logic.get_action('dashboard_new_activities_count') + return action({}, {}) + + # these are the functions that will end up in `h` template helpers __allowed_functions__ = [ # functions defined in ckan.lib.helpers @@ -1660,6 +1680,7 @@ def SI_number_span(number): 'localised_nice_date', 'localised_filesize', 'list_dict_filter', + 'new_activities', # imported into ckan.lib.helpers 'literal', 'link_to', diff --git a/ckan/lib/navl/__init__.py b/ckan/lib/navl/__init__.py index 373068d954a..f72a536ed7d 100644 --- a/ckan/lib/navl/__init__.py +++ b/ckan/lib/navl/__init__.py @@ -1 +1 @@ -__licence__ = 'MIT' +__license__ = 'MIT' diff --git a/ckan/lib/package_saver.py b/ckan/lib/package_saver.py index 5b3f876151f..d93653c77da 100644 --- a/ckan/lib/package_saver.py +++ b/ckan/lib/package_saver.py @@ -1,9 +1,9 @@ -from sqlalchemy import orm import ckan.lib.helpers as h -from ckan.lib.base import * +import ckan.lib.base as base +import ckan.model as model import ckan.rating -from pylons import g -from ckan.lib.dictization import table_dictize + +from ckan.common import g, c, _ # Todo: Factor out unused original_name argument. @@ -72,14 +72,14 @@ def _update(cls, fs, log_message, author, client=None): fs.validate() validates = not (errors or fs.errors) if not validates: - raise ValidationException(fs) + raise base.ValidationException(fs) # sync try: rev = model.repo.new_revision() rev.author = author rev.message = log_message fs.sync() - except Exception, inst: + except Exception: model.Session.rollback() raise else: diff --git a/ckan/lib/repoze_patch.py b/ckan/lib/repoze_patch.py index 5344ff93ba0..eb6b32ccc86 100644 --- a/ckan/lib/repoze_patch.py +++ b/ckan/lib/repoze_patch.py @@ -2,12 +2,10 @@ from openid.consumer import consumer from openid.extensions import sreg, ax -import ckan.lib.helpers as h - # #1659 fix - logged_out_url prefixed with mount point def get_full_path(path, environ): if path.startswith('/'): - path = h._add_i18n_to_url(path) + path = environ.get('SCRIPT_NAME', '') + path return path def identify(self, environ): @@ -31,8 +29,8 @@ def identify(self, environ): for a,v in self.forget(environ,{}): res.headers.add(a,v) res.status = 302 - - res.location = get_full_path(self.logged_out_url, environ) + url = self.logged_out_url + '?came_from=' + environ.get('came_from') + res.location = get_full_path(url, environ) environ['repoze.who.application'] = res return {} diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py index b96a3fcc5b6..73bdaedb8cd 100644 --- a/ckan/logic/action/create.py +++ b/ckan/logic/action/create.py @@ -3,7 +3,7 @@ import logging from pylons import config -from paste.deploy.converters import asbool +import paste.deploy.converters import ckan.lib.plugins as lib_plugins import ckan.logic as logic @@ -325,10 +325,12 @@ def related_create(context, data_dict): activity_create_context = { 'model': model, 'user': user, - 'defer_commit':True, + 'defer_commit': True, + 'ignore_auth': True, 'session': session } - activity_create(activity_create_context, activity_dict, ignore_auth=True) + logic.get_action('activity_create')(activity_create_context, + activity_dict) session.commit() context["related"] = related @@ -548,11 +550,12 @@ def _group_or_org_create(context, data_dict, is_org=False): activity_create_context = { 'model': model, 'user': user, - 'defer_commit':True, + 'defer_commit': True, + 'ignore_auth': True, 'session': session } logic.get_action('activity_create')(activity_create_context, - activity_dict, ignore_auth=True) + activity_dict) if not context.get('defer_commit'): model.repo.commit() @@ -798,6 +801,7 @@ def user_create(context, data_dict): 'model': model, 'user': context['user'], 'defer_commit': True, + 'ignore_auth': True, 'session': session } activity_dict = { @@ -806,7 +810,7 @@ def user_create(context, data_dict): 'activity_type': 'new user', } logic.get_action('activity_create')(activity_create_context, - activity_dict, ignore_auth=True) + activity_dict) if not context.get('defer_commit'): model.repo.commit() @@ -822,7 +826,10 @@ def user_create(context, data_dict): context['user_obj'] = user context['id'] = user.id - log.debug('Created user %s' % user.name) + + model.Dashboard.get(user.id) # Create dashboard for user. + + log.debug('Created user {name}'.format(name=user.name)) return user_dict ## Modifications for rest api @@ -892,7 +899,7 @@ def vocabulary_create(context, data_dict): return model_dictize.vocabulary_dictize(vocabulary, context) -def activity_create(context, activity_dict, ignore_auth=False): +def activity_create(context, activity_dict, **kw): '''Create a new activity stream activity. You must be a sysadmin to create new activities. @@ -914,7 +921,16 @@ def activity_create(context, activity_dict, ignore_auth=False): :rtype: dictionary ''' - if not asbool(config.get('ckan.activity_streams_enabled', 'true')): + + # this action had a ignore_auth param which has been removed + # removed in 2.2 + if 'ignore_auth' in kw: + raise Exception('Activity Stream calling parameters have changed ' + 'ignore_auth must be passed in the context not as ' + 'a param') + + if not paste.deploy.converters.asbool( + config.get('ckan.activity_streams_enabled', 'true')): return model = context['model'] @@ -926,8 +942,7 @@ def activity_create(context, activity_dict, ignore_auth=False): else: activity_dict['revision_id'] = None - if not ignore_auth: - _check_access('activity_create', context, activity_dict) + _check_access('activity_create', context, activity_dict) schema = context.get('schema') or ckan.logic.schema.default_create_activity_schema() data, errors = _validate(activity_dict, schema, context) @@ -954,7 +969,7 @@ def package_relationship_create_rest(context, data_dict): relationship_dict = _get_action('package_relationship_create')(context, data_dict) return relationship_dict -def tag_create(context, tag_dict): +def tag_create(context, data_dict): '''Create a new vocabulary tag. You must be a sysadmin to create vocabulary tags. @@ -977,14 +992,14 @@ def tag_create(context, tag_dict): ''' model = context['model'] - _check_access('tag_create', context, tag_dict) + _check_access('tag_create', context, data_dict) schema = context.get('schema') or ckan.logic.schema.default_create_tag_schema() - data, errors = _validate(tag_dict, schema, context) + data, errors = _validate(data_dict, schema, context) if errors: raise ValidationError(errors) - tag = model_save.tag_dict_save(tag_dict, context) + tag = model_save.tag_dict_save(data_dict, context) if not context.get('defer_commit'): model.repo.commit() @@ -1141,10 +1156,41 @@ def _group_or_org_member_create(context, data_dict, is_org=False): logic.get_action('member_create')(member_create_context, member_dict) def group_member_create(context, data_dict): + '''Make a user a member of a group. + + You must be authorized to edit the group. + + :param id: the id or name of the group + :type id: string + :param username: name or id of the user to be made member of the group + :type username: string + :param role: role of the user in the group. One of ``member``, ``editor``, + or ``admin`` + :type role: string + + :returns: the newly created (or updated) membership + :rtype: dictionary + ''' _check_access('group_member_create', context, data_dict) return _group_or_org_member_create(context, data_dict) def organization_member_create(context, data_dict): + '''Make a user a member of an organization. + + You must be authorized to edit the organization. + + :param id: the id or name of the organization + :type id: string + :param username: name or id of the user to be made member of the + organization + :type username: string + :param role: role of the user in the organization. One of ``member``, + ``editor``, or ``admin`` + :type role: string + + :returns: the newly created (or updated) membership + :rtype: dictionary + ''' _check_access('organization_member_create', context, data_dict) return _group_or_org_member_create(context, data_dict, is_org=True) diff --git a/ckan/logic/action/delete.py b/ckan/logic/action/delete.py index fd113498839..933e7624b43 100644 --- a/ckan/logic/action/delete.py +++ b/ckan/logic/action/delete.py @@ -69,9 +69,21 @@ def resource_delete(context, data_dict): _check_access('resource_delete',context, data_dict) - entity.delete() + package_id = entity.get_package_id() + + pkg_dict = _get_action('package_show')(context, {'id': package_id}) + + if 'resources' in pkg_dict and id in pkg_dict['resources']: + pkg_dict['resources'].remove(id) + try: + pkg_dict = _get_action('package_update')(context, pkg_dict) + except ValidationError, e: + errors = e.error_dict['resources'][-1] + raise ValidationError(errors) + model.repo.commit() + def package_relationship_delete(context, data_dict): '''Delete a dataset (package) relationship. @@ -151,11 +163,12 @@ def related_delete(context, data_dict): activity_create_context = { 'model': model, 'user': user, - 'defer_commit':True, + 'defer_commit': True, + 'ignore_auth': True, 'session': session } - _get_action('activity_create')(activity_create_context, activity_dict, ignore_auth=True) + _get_action('activity_create')(activity_create_context, activity_dict) session.commit() entity.delete() @@ -263,7 +276,7 @@ def group_delete(context, data_dict): return _group_or_org_delete(context, data_dict) def organization_delete(context, data_dict): - '''Delete a organization. + '''Delete an organization. You must be authorized to delete the organization. @@ -273,6 +286,86 @@ def organization_delete(context, data_dict): ''' return _group_or_org_delete(context, data_dict, is_org=True) +def _group_or_org_purge(context, data_dict, is_org=False): + '''Purge a group or organization. + + The group or organization will be completely removed from the database. + This cannot be undone! + + Only sysadmins can purge groups or organizations. + + :param id: the name or id of the group or organization to be purged + :type id: string + + :param is_org: you should pass is_org=True if purging an organization, + otherwise False (optional, default: False) + :type is_org: boolean + + ''' + model = context['model'] + id = _get_or_bust(data_dict, 'id') + + group = model.Group.get(id) + context['group'] = group + if group is None: + if is_org: + raise NotFound('Organization was not found') + else: + raise NotFound('Group was not found') + + if is_org: + _check_access('organization_purge', context, data_dict) + else: + _check_access('group_purge', context, data_dict) + + members = model.Session.query(model.Member) + members = members.filter(model.Member.group_id == group.id) + if members.count() > 0: + model.repo.new_revision() + for m in members.all(): + m.delete() + model.repo.commit_and_remove() + + group = model.Group.get(id) + model.repo.new_revision() + group.purge() + model.repo.commit_and_remove() + +def group_purge(context, data_dict): + '''Purge a group. + + .. warning:: Purging a group cannot be undone! + + Purging a group completely removes the group from the CKAN database, + whereas deleting a group simply marks the group as deleted (it will no + longer show up in the frontend, but is still in the db). + + You must be authorized to purge the group. + + :param id: the name or id of the group to be purged + :type id: string + + ''' + return _group_or_org_purge(context, data_dict, is_org=False) + +def organization_purge(context, data_dict): + '''Purge an organization. + + .. warning:: Purging an organization cannot be undone! + + Purging an organization completely removes the organization from the CKAN + database, whereas deleting an organization simply marks the organization as + deleted (it will no longer show up in the frontend, but is still in the + db). + + You must be authorized to purge the organization. + + :param id: the name or id of the organization to be purged + :type id: string + + ''' + return _group_or_org_purge(context, data_dict, is_org=True) + def task_status_delete(context, data_dict): '''Delete a task status. @@ -419,7 +512,8 @@ def _group_or_org_member_delete(context, data_dict=None): group_id = data_dict.get('id') group = model.Group.get(group_id) - user_id = data_dict.get('user_id') + user_id = data_dict.get('username') + user_id = data_dict.get('user_id') if user_id is None else user_id member_dict = { 'id': group.id, 'object': user_id, @@ -434,9 +528,29 @@ def _group_or_org_member_delete(context, data_dict=None): def group_member_delete(context, data_dict=None): + '''Remove a user from a group. + + You must be authorized to edit the group. + + :param id: the id or name of the group + :type id: string + :param username: name or id of the user to be removed + :type username: string + + ''' return _group_or_org_member_delete(context, data_dict) def organization_member_delete(context, data_dict=None): + '''Remove a user from an organization. + + You must be authorized to edit the organization. + + :param id: the id or name of the organization + :type id: string + :param username: name or id of the user to be removed + :type username: string + + ''' return _group_or_org_member_delete(context, data_dict) diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index f43601082ec..829b6cc5f65 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -69,16 +69,17 @@ def package_list(context, data_dict): ''' model = context["model"] api = context.get("api_version", 1) - ref_package_by = 'id' if api == 2 else 'name' _check_access('package_list', context, data_dict) - query = model.Session.query(model.PackageRevision) - query = query.filter(model.PackageRevision.state=='active') - query = query.filter(model.PackageRevision.current==True) - - packages = query.all() - return [getattr(p, ref_package_by) for p in packages] + package_revision_table = model.package_revision_table + col = (package_revision_table.c.id + if api == 2 else package_revision_table.c.name) + query = _select([col]) + query = query.where(_and_(package_revision_table.c.state=='active', + package_revision_table.c.current==True)) + query = query.order_by(col) + return list(zip(*query.execute())[0]) def current_package_list_with_resources(context, data_dict): '''Return a list of the site's datasets (packages) and their resources. @@ -417,13 +418,20 @@ def group_list_authz(context, data_dict): (optional, default: ``False``) :type available_only: boolean + :param am_member: if True return only the groups the logged-in user is a + member of, otherwise return all groups that the user is authorized to + edit (for example, sysadmin users are authorized to edit all groups) + (optional, default: False) + :type am-member: boolean + :returns: the names of groups that the user is authorized to edit :rtype: list of strings ''' model = context['model'] user = context['user'] - available_only = data_dict.get('available_only',False) + available_only = data_dict.get('available_only', False) + am_member = data_dict.get('am_member', False) _check_access('group_list_authz',context, data_dict) @@ -435,7 +443,7 @@ def group_list_authz(context, data_dict): if not user_id: return [] - if not sysadmin: + if not sysadmin or am_member: q = model.Session.query(model.Member) \ .filter(model.Member.table_name == 'user') \ .filter(model.Member.capacity.in_(roles)) \ @@ -451,7 +459,7 @@ def group_list_authz(context, data_dict): .filter(model.Group.is_organization == False) \ .filter(model.Group.state == 'active') - if not sysadmin: + if not sysadmin or am_member: q = q.filter(model.Group.id.in_(group_ids)) groups = q.all() @@ -461,7 +469,10 @@ def group_list_authz(context, data_dict): if package: groups = set(groups) - set(package.get_groups()) - return [{'id':group.id,'name':group.name} for group in groups] + return [{'id': group.id, + 'name': group.name, + 'display_name': group.display_name, + 'type': group.type} for group in groups] def organization_list_for_user(context, data_dict): '''Return the list of organizations that the user is a member of. @@ -484,35 +495,38 @@ def organization_list_for_user(context, data_dict): .filter(model.Group.is_organization == True) \ .filter(model.Group.state == 'active') - if sysadmin: - # Sysadmins can see all organizations - return [{'id':org.id,'name':org.name,'title':org.title} for org in orgs_q.all()] + if not sysadmin: + # for non-Sysadmins check they have the required permission - permission = data_dict.get('permission', 'edit_group') + permission = data_dict.get('permission', 'edit_group') - roles = ckan.new_authz.get_roles_with_permission(permission) + roles = ckan.new_authz.get_roles_with_permission(permission) - if not roles: - return [] - user_id = new_authz.get_user_id_for_username(user, allow_none=True) - if not user_id: - return [] + if not roles: + return [] + user_id = new_authz.get_user_id_for_username(user, allow_none=True) + if not user_id: + return [] - q = model.Session.query(model.Member) \ - .filter(model.Member.table_name == 'user') \ - .filter(model.Member.capacity.in_(roles)) \ - .filter(model.Member.table_id == user_id) + q = model.Session.query(model.Member) \ + .filter(model.Member.table_name == 'user') \ + .filter(model.Member.capacity.in_(roles)) \ + .filter(model.Member.table_id == user_id) - group_ids = [] - for row in q.all(): - group_ids.append(row.group_id) + group_ids = [] + for row in q.all(): + group_ids.append(row.group_id) - if not group_ids: - return [] + if not group_ids: + return [] - q = orgs_q.filter(model.Group.id.in_(group_ids)) + orgs_q = orgs_q.filter(model.Group.id.in_(group_ids)) - return [{'id':org.id,'name':org.name,'title':org.title} for org in q.all()] + return [{'id': org.id, + 'name': org.name, + 'title': org.title, + 'display_name': org.display_name, + 'type': org.type} for org in orgs_q.all()] def group_revision_list(context, data_dict): '''Return a group's revisions. @@ -670,12 +684,13 @@ def user_list(context, data_dict): def package_relationships_list(context, data_dict): '''Return a dataset (package)'s relationships. - :param id: the id or name of the package + :param id: the id or name of the first package + :type id: string + :param id2: the id or name of the second package :type id: string - :param id2: - :type id2: - :param rel: - :type rel: + :param rel: relationship as string see + :func:`ckan.logic.action.create.package_relationship_create()` for the + relationship types (optional) :rtype: list of dictionaries @@ -2799,4 +2814,12 @@ def _unpick_search(sort, allowed_fields=None, total=None): def member_roles_list(context, data_dict): + '''Return the possible roles for members of groups and organizations. + + :returns: a list of dictionaries each with two keys: "text" (the display + name of the role, e.g. "Admin") and "value" (the internal name of the + role, e.g. "admin") + :rtype: list of dictionaries + + ''' return new_authz.roles_list() diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py index 9917e6893f4..be9515265f9 100644 --- a/ckan/logic/action/update.py +++ b/ckan/logic/action/update.py @@ -167,12 +167,12 @@ def related_update(context, data_dict): activity_create_context = { 'model': model, 'user': context['user'], - 'defer_commit':True, + 'defer_commit': True, + 'ignore_auth': True, 'session': session } - _get_action('activity_create')(activity_create_context, activity_dict, - ignore_auth=True) + _get_action('activity_create')(activity_create_context, activity_dict) if not context.get('defer_commit'): model.repo.commit() @@ -207,31 +207,26 @@ def resource_update(context, data_dict): raise NotFound(_('Resource was not found.')) _check_access('resource_update', context, data_dict) + del context["resource"] - if 'schema' in context: - schema = context['schema'] - else: - package_plugin = lib_plugins.lookup_package_plugin( - resource.resource_group.package.type) - schema = package_plugin.update_package_schema()['resources'] + package_id = resource.resource_group.package.id + pkg_dict = _get_action('package_show')(context, {'id': package_id}) - data, errors = _validate(data_dict, schema, context) - if errors: - model.Session.rollback() - raise ValidationError(errors) - - rev = model.repo.new_revision() - rev.author = user - if 'message' in context: - rev.message = context['message'] + for n, p in enumerate(pkg_dict['resources']): + if p['id'] == id: + break else: - rev.message = _(u'REST API: Update object %s') % data.get("name", "") + logging.error('Could not find resource ' + id) + raise NotFound(_('Resource was not found.')) + pkg_dict['resources'][n] = data_dict - resource = model_save.resource_dict_save(data, context) - if not context.get('defer_commit'): - model.repo.commit() - return model_dictize.resource_dictize(resource, context) + try: + pkg_dict = _get_action('package_update')(context, pkg_dict) + except ValidationError, e: + errors = e.error_dict['resources'][n] + raise ValidationError(errors) + return pkg_dict['resources'][n] def package_update(context, data_dict): @@ -520,11 +515,11 @@ def _group_or_org_update(context, data_dict, is_org=False): activity_create_context = { 'model': model, 'user': user, - 'defer_commit':True, + 'defer_commit': True, + 'ignore_auth': True, 'session': session } - _get_action('activity_create')(activity_create_context, activity_dict, - ignore_auth=True) + _get_action('activity_create')(activity_create_context, activity_dict) # TODO: Also create an activity detail recording what exactly changed # in the group. @@ -611,10 +606,11 @@ def user_update(context, data_dict): activity_create_context = { 'model': model, 'user': user, - 'defer_commit':True, + 'defer_commit': True, + 'ignore_auth': True, 'session': session } - _get_action('activity_create')(activity_create_context, activity_dict, ignore_auth=True) + _get_action('activity_create')(activity_create_context, activity_dict) # TODO: Also create an activity detail recording what exactly changed in # the user. diff --git a/ckan/logic/auth/create.py b/ckan/logic/auth/create.py index f3a2ee227ca..bf9c3d17ea3 100644 --- a/ckan/logic/auth/create.py +++ b/ckan/logic/auth/create.py @@ -4,24 +4,32 @@ from ckan.common import _ +@logic.auth_sysadmins_check def package_create(context, data_dict=None): user = context['user'] if not new_authz.auth_is_registered_user(): check1 = new_authz.check_config_permission('anon_create_dataset') else: check1 = new_authz.check_config_permission('create_dataset_if_not_in_organization') \ + or new_authz.check_config_permission('create_unowned_dataset') \ or new_authz.has_user_permission_for_some_org(user, 'create_dataset') if not check1: return {'success': False, 'msg': _('User %s not authorized to create packages') % user} - else: - check2 = _check_group_auth(context,data_dict) - if not check2: - return {'success': False, 'msg': _('User %s not authorized to edit these groups') % user} + check2 = _check_group_auth(context,data_dict) + if not check2: + return {'success': False, 'msg': _('User %s not authorized to edit these groups') % user} + # If an organization is given are we able to add a dataset to it? + data_dict = data_dict or {} + org_id = data_dict.get('organization_id') + if org_id and not new_authz.has_user_permission_for_group_or_org( + org_id, user, 'create_dataset'): + return {'success': False, 'msg': _('User %s not authorized to add dataset to this organization') % user} return {'success': True} + def file_upload(context, data_dict=None): user = context['user'] if not new_authz.auth_is_registered_user(): diff --git a/ckan/logic/auth/delete.py b/ckan/logic/auth/delete.py index 6fbda65e28e..61b44697407 100644 --- a/ckan/logic/auth/delete.py +++ b/ckan/logic/auth/delete.py @@ -84,6 +84,14 @@ def group_delete(context, data_dict): else: return {'success': True} +def group_purge(context, data_dict): + # Only sysadmins are authorized to purge groups. + return {'success': False} + +def organization_purge(context, data_dict): + # Only sysadmins are authorized to purge organizations. + return {'success': False} + def organization_delete(context, data_dict): group = get_group_object(context, data_dict) user = context['user'] diff --git a/ckan/logic/auth/get.py b/ckan/logic/auth/get.py index cc310ff3296..f0f27d74764 100644 --- a/ckan/logic/auth/get.py +++ b/ckan/logic/auth/get.py @@ -100,6 +100,8 @@ def package_show(context, data_dict): auth = new_authz.is_authorized('package_update', context, data_dict) authorized = auth.get('success') + elif package.owner_org is None and package.state == 'active': + return {'success': True} else: # anyone can see a public package if not package.private and package.state == 'active': diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py index c153eee84a2..a6fb7eaca79 100644 --- a/ckan/logic/schema.py +++ b/ckan/logic/schema.py @@ -48,7 +48,9 @@ user_name_exists, role_exists, url_validator, - list_of_strings) + datasets_with_no_organization_cannot_be_private, + list_of_strings, + ) from ckan.logic.converters import (convert_user_name_or_id_to_id, convert_package_name_or_id_to_id, convert_group_name_or_id_to_id,) @@ -137,7 +139,8 @@ def default_create_package_schema(): 'type': [ignore_missing, unicode], 'owner_org': [owner_org_validator, unicode], 'log_message': [ignore_missing, unicode, no_http], - 'private': [ignore_missing, boolean_validator], + 'private': [ignore_missing, boolean_validator, + datasets_with_no_organization_cannot_be_private], '__extras': [ignore], '__junk': [empty], 'resources': default_resource_schema(), diff --git a/ckan/logic/validators.py b/ckan/logic/validators.py index da96335fec8..f9de157795c 100644 --- a/ckan/logic/validators.py +++ b/ckan/logic/validators.py @@ -632,6 +632,13 @@ def role_exists(role, context): return role +def datasets_with_no_organization_cannot_be_private(key, data, errors, + context): + if data[key] is True and data.get(('owner_org',)) is None: + errors[key].append( + _("Datasets with no organization can't be private.")) + + def list_of_strings(key, data, errors, context): value = data.get(key) if not isinstance(value, list): @@ -639,3 +646,4 @@ def list_of_strings(key, data, errors, context): for x in value: if not isinstance(x, basestring): raise Invalid('%s: %s' % (_('Not a string'), x)) + diff --git a/ckan/migration/versions/066_default_package_type.py b/ckan/migration/versions/066_default_package_type.py index c91eb18e122..9190b941d90 100644 --- a/ckan/migration/versions/066_default_package_type.py +++ b/ckan/migration/versions/066_default_package_type.py @@ -1,4 +1,3 @@ - def upgrade(migrate_engine): update_statement = ''' diff --git a/ckan/model/package_relationship.py b/ckan/model/package_relationship.py index 3ee5cd49a7f..9e2ce53e873 100644 --- a/ckan/model/package_relationship.py +++ b/ckan/model/package_relationship.py @@ -11,7 +11,7 @@ # which isn't the case for paster commands. try: from ckan.common import _ - _('') + _() except: def _(txt): return txt diff --git a/ckan/model/resource.py b/ckan/model/resource.py index 2a1f1bfade8..e372660b3c9 100644 --- a/ckan/model/resource.py +++ b/ckan/model/resource.py @@ -30,12 +30,13 @@ 'cache_last_updated', 'webstore_url', 'webstore_last_updated'] - ##formally package_resource resource_table = Table( 'resource', meta.metadata, - Column('id', types.UnicodeText, primary_key=True, default=_types.make_uuid), - Column('resource_group_id', types.UnicodeText, ForeignKey('resource_group.id')), + Column('id', types.UnicodeText, primary_key=True, + default=_types.make_uuid), + Column('resource_group_id', types.UnicodeText, + ForeignKey('resource_group.id')), Column('url', types.UnicodeText, nullable=False), Column('format', types.UnicodeText), Column('description', types.UnicodeText), @@ -53,30 +54,34 @@ Column('cache_last_updated', types.DateTime), Column('webstore_url', types.UnicodeText), Column('webstore_last_updated', types.DateTime), - + Column('extras', _types.JsonDictType), - ) +) resource_group_table = Table( 'resource_group', meta.metadata, - Column('id', types.UnicodeText, primary_key=True, default=_types.make_uuid), + Column('id', types.UnicodeText, primary_key=True, + default=_types.make_uuid), Column('package_id', types.UnicodeText, ForeignKey('package.id')), Column('label', types.UnicodeText), Column('sort_order', types.UnicodeText), Column('extras', _types.JsonDictType), - ) +) vdm.sqlalchemy.make_table_stateful(resource_table) resource_revision_table = core.make_revisioned_table(resource_table) vdm.sqlalchemy.make_table_stateful(resource_group_table) -resource_group_revision_table = core.make_revisioned_table(resource_group_table) +resource_group_revision_table = core.make_revisioned_table( + resource_group_table) + class Resource(vdm.sqlalchemy.RevisionedObjectMixin, vdm.sqlalchemy.StatefulObjectMixin, domain_object.DomainObject): extra_columns = None - def __init__(self, resource_group_id=None, url=u'', + + def __init__(self, resource_group_id=None, url=u'', format=u'', description=u'', hash=u'', extras=None, **kwargs): @@ -122,18 +127,26 @@ def as_dict(self, core_columns_only=False): _dict[u'format'] = model_dictize._unified_resource_format(self.format) return _dict + def get_package_id(self): + '''Returns the package id for a resource. ''' + query = meta.Session.query(ResourceGroupRevision) \ + .filter(and_(ResourceGroupRevision.id == self.resource_group_id, + ResourceGroupRevision.state == u'active', + ResourceGroupRevision.current == True)) + resource_group = query.first() + if resource_group is None: + return None + return resource_group.package_id + @classmethod def get(cls, reference): '''Returns a resource object referenced by its name or id.''' - query = meta.Session.query(ResourceRevision).filter(ResourceRevision.id==reference) - query = query.filter(and_( - ResourceRevision.state == u'active', ResourceRevision.current == True - )) + query = meta.Session.query(Resource).filter(Resource.id == reference) resource = query.first() - if resource == None: - resource = cls.by_name(reference) + if resource is None: + resource = cls.by_name(reference) return resource - + @classmethod def get_columns(cls, extra_columns=True): '''Returns the core editable columns of the resource.''' @@ -145,7 +158,8 @@ def get_columns(cls, extra_columns=True): @classmethod def get_extra_columns(cls): if cls.extra_columns is None: - cls.extra_columns = config.get('ckan.extra_resource_fields', '').split() + cls.extra_columns = config.get( + 'ckan.extra_resource_fields', '').split() for field in cls.extra_columns: setattr(cls, field, DictProxy(field, 'extras')) return cls.extra_columns @@ -164,14 +178,17 @@ def activity_stream_detail(self, activity_id, activity_type): activity_type = 'deleted' res_dict = ckan.lib.dictization.table_dictize(self, - context={'model':model}) - return activity.ActivityDetail(activity_id, self.id, u"Resource", activity_type, - {'resource': res_dict}) + context={'model': model}) + return activity.ActivityDetail(activity_id, self.id, u"Resource", + activity_type, + {'resource': res_dict}) + class ResourceGroup(vdm.sqlalchemy.RevisionedObjectMixin, - vdm.sqlalchemy.StatefulObjectMixin, - domain_object.DomainObject): + vdm.sqlalchemy.StatefulObjectMixin, + domain_object.DomainObject): extra_columns = None + def __init__(self, package_id=None, sort_order=u'', label=u'', extras=None, **kwargs): if package_id: @@ -198,7 +215,7 @@ def as_dict(self, core_columns_only=False): for k, v in self.extras.items() if self.extras else []: _dict[k] = v return _dict - + @classmethod def get_columns(cls, extra_columns=True): '''Returns the core editable columns of the resource.''' @@ -210,16 +227,17 @@ def get_columns(cls, extra_columns=True): @classmethod def get_extra_columns(cls): if cls.extra_columns is None: - cls.extra_columns = config.get('ckan.extra_resource_group_fields', '').split() + cls.extra_columns = config.get( + 'ckan.extra_resource_group_fields', '').split() for field in cls.extra_columns: setattr(cls, field, DictProxy(field, 'extras')) return cls.extra_columns - -## Mappers + ## Mappers meta.mapper(Resource, resource_table, properties={ - 'resource_group':orm.relation(ResourceGroup, + 'resource_group': orm.relation( + ResourceGroup, # all resources including deleted # formally package_resources_all backref=orm.backref('resources_all', @@ -227,28 +245,28 @@ def get_extra_columns(cls): cascade='all, delete', order_by=resource_table.c.position, ), - ) - }, - order_by=[resource_table.c.resource_group_id], - extension=[vdm.sqlalchemy.Revisioner(resource_revision_table), - extension.PluginMapperExtension(), - ], + ) +}, +order_by=[resource_table.c.resource_group_id], +extension=[vdm.sqlalchemy.Revisioner(resource_revision_table), + extension.PluginMapperExtension(), + ], ) - meta.mapper(ResourceGroup, resource_group_table, properties={ - 'package':orm.relation(_package.Package, + 'package': orm.relation( + _package.Package, # all resources including deleted backref=orm.backref('resource_groups_all', cascade='all, delete, delete-orphan', order_by=resource_group_table.c.sort_order, ), - ) - }, - order_by=[resource_group_table.c.package_id], - extension=[vdm.sqlalchemy.Revisioner(resource_group_revision_table), - extension.PluginMapperExtension(), - ], + ) +}, +order_by=[resource_group_table.c.package_id], +extension=[vdm.sqlalchemy.Revisioner(resource_group_revision_table), + extension.PluginMapperExtension(), + ], ) ## VDM @@ -256,17 +274,24 @@ def get_extra_columns(cls): vdm.sqlalchemy.modify_base_object_mapper(Resource, core.Revision, core.State) ResourceRevision = vdm.sqlalchemy.create_object_version( meta.mapper, Resource, resource_revision_table) - -vdm.sqlalchemy.modify_base_object_mapper(ResourceGroup, core.Revision, core.State) + +vdm.sqlalchemy.modify_base_object_mapper(ResourceGroup, core.Revision, + core.State) ResourceGroupRevision = vdm.sqlalchemy.create_object_version( meta.mapper, ResourceGroup, resource_group_revision_table) -ResourceGroupRevision.related_packages = lambda self: [self.continuity.package] -ResourceRevision.related_packages = lambda self: [self.continuity.resouce_group.package] +ResourceGroupRevision.related_packages = lambda self: [ + self.continuity.package +] +ResourceRevision.related_packages = lambda self: [ + self.continuity.resouce_group.package +] + def resource_identifier(obj): return obj.id + class DictProxy(object): def __init__(self, target_key, target_dict, data_type=unicode): @@ -296,5 +321,3 @@ def __delete__(self, obj): proxied_dict = getattr(obj, self.target_dict) proxied_dict.pop(self.target_key) - - diff --git a/ckan/plugins/interfaces.py b/ckan/plugins/interfaces.py index a37d3c96ae8..8acfc34aad6 100644 --- a/ckan/plugins/interfaces.py +++ b/ckan/plugins/interfaces.py @@ -202,8 +202,20 @@ class IResourcePreview(Interface): def can_preview(self, data_dict): ''' - Return True if the extension can preview the resource. The ``data_dict`` - contains the resource and the package. + Returns info on whether the plugin can preview the resource. + + This can be done in two ways. + The old way is to just return True or False. + The new way is to return a dict with the following + { + 'can_preview': bool - if the extension can preview the resource + 'fixable': string - if the extension cannot preview but could for + example if the resource_proxy was enabled. + 'quality': int - how good the preview is 1-poor, 2-average, 3-good + used if multiple extensions can preview + } + + The ``data_dict`` contains the resource and the package. Make sure to ckeck the ``on_same_domain`` value of the resource or the url if your preview requires the resource to be on diff --git a/ckan/public/base/css/fuchsia.css b/ckan/public/base/css/fuchsia.css index 54db663e9d3..300d2981817 100644 --- a/ckan/public/base/css/fuchsia.css +++ b/ckan/public/base/css/fuchsia.css @@ -48,11 +48,25 @@ sub { bottom: -0.25em; } img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; + /* Part 1: Set a maxium relative to the parent */ + + width: auto\9; + /* IE7-8 need help adjusting responsive images */ + + height: auto; + /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img, +.google-maps img { + max-width: none; +} button, input, select, @@ -72,11 +86,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +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; @@ -92,6 +116,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !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; } @@ -99,6 +174,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -113,28 +189,47 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } body { margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #4d4d4d; - background-color: #efefef; + font-size: 14px; + line-height: 20px; + color: #444444; + background-color: #eeeeee; } a { - color: #b509b5; + color: #e73892; text-decoration: none; } -a:hover { - color: #6c056c; +a:hover, +a:focus { + color: #bc176c; text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} .row { margin-left: -20px; *zoom: 1; @@ -143,15 +238,18 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -236,6 +334,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -243,65 +342,171 @@ a:hover { .row-fluid [class*="span"] { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; +} +.row-fluid .offset12 { + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; +} +.row-fluid .offset12:first-child { + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; +} +.row-fluid .offset11 { + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; +} +.row-fluid .offset11:first-child { + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; +} +.row-fluid .offset10 { + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; +} +.row-fluid .offset10:first-child { + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; +} +.row-fluid .offset9 { + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; +} +.row-fluid .offset9:first-child { + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; +} +.row-fluid .offset8 { + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; +} +.row-fluid .offset8:first-child { + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; +} +.row-fluid .offset7 { + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; +} +.row-fluid .offset7:first-child { + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; +} +.row-fluid .offset6 { + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; +} +.row-fluid .offset6:first-child { + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; +} +.row-fluid .offset5 { + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; +} +.row-fluid .offset5:first-child { + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; +} +.row-fluid .offset4 { + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; +} +.row-fluid .offset4:first-child { + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; +} +.row-fluid .offset3 { + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; +} +.row-fluid .offset3:first-child { + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; +} +.row-fluid .offset2 { + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; +} +.row-fluid .offset2:first-child { + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; +} +.row-fluid .offset1 { + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; +} +.row-fluid .offset1:first-child { + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; +} +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; } .container { margin-right: auto; @@ -312,6 +517,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -325,25 +531,75 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; - font-size: 20px; + margin-bottom: 20px; + font-size: 21px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; +} +a.muted:hover, +a.muted:focus { + color: #808080; +} +.text-warning { + color: #c09853; +} +a.text-warning:hover, +a.text-warning:focus { + color: #a47e3c; +} +.text-error { + color: #b55457; +} +a.text-error:hover, +a.text-error:focus { + color: #954143; +} +.text-info { + color: #3a87ad; +} +a.text-info:hover, +a.text-info:focus { + color: #2d6987; +} +.text-success { + color: #468847; +} +a.text-success:hover, +a.text-success:focus { + color: #356635; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; } h1, h2, @@ -351,9 +607,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -364,60 +621,53 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } -h1 { - font-size: 30px; - line-height: 36px; +h1, +h2, +h3 { + line-height: 40px; } -h1 small { - font-size: 18px; +h1 { + font-size: 38.5px; } h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; + font-size: 31.5px; } h3 { - font-size: 18px; - line-height: 27px; + font-size: 24.5px; } -h3 small { +h4 { + font-size: 17.5px; +} +h5 { font-size: 14px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 11.9px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24.5px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 17.5px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -425,37 +675,57 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding-left: 5px; + padding-right: 5px; +} dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; } dd { - margin-left: 9px; + margin-left: 10px; +} +.dl-horizontal { + *zoom: 1; +} +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: ""; + line-height: 0; +} +.dl-horizontal:after { + clear: both; } .dl-horizontal dt { float: left; - width: 120px; + width: 160px; clear: left; text-align: right; overflow: hidden; @@ -463,26 +733,18 @@ dd { white-space: nowrap; } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -490,18 +752,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 22.5px; + line-height: 1.25; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -518,6 +780,12 @@ blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} q:before, q:after, blockquote:before, @@ -526,20 +794,14 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} -small { - font-size: 100%; -} -cite { + margin-bottom: 20px; font-style: normal; + line-height: 20px; } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; @@ -551,13 +813,14 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -570,11 +833,13 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -583,7 +848,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -594,15 +859,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -610,9 +875,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -623,116 +888,181 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + vertical-align: middle; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +input, +textarea, +.uneditable-input { + width: 206px; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; +textarea { height: auto; - padding: 0; - margin: 3px 0; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: #ffffff; + border: 1px solid #cccccc; + -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); + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ + margin-top: 1px \9; + /* IE8-9 */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + line-height: normal; } -input[type="button"], +input[type="file"], +input[type="image"], +input[type="submit"], input[type="reset"], -input[type="submit"] { +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - height: auto; } select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; + line-height: 30px; } select { width: 220px; + border: 1px solid #cccccc; background-color: #ffffff; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -textarea { +.uneditable-input, +.uneditable-textarea { + color: #999999; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} +.uneditable-textarea { + width: auto; height: auto; } -input[type="hidden"] { - display: none; +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; } .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, .controls > .checkbox:first-child { @@ -749,39 +1079,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -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); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -811,46 +1108,105 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { margin-left: 0; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 926px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 846px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 766px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 686px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 606px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 526px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 446px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 366px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 286px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 206px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 126px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 46px; +} +.controls-row { + *zoom: 1; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +.controls-row:before, +.controls-row:after { + display: table; + content: ""; + line-height: 0; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +.controls-row:after { + clear: both; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { + float: left; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } input[disabled], select[disabled], @@ -860,7 +1216,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -868,24 +1223,33 @@ input[type="radio"][readonly], 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; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .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 input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -893,24 +1257,33 @@ input[type="checkbox"][readonly] { background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b55457; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b55457; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b55457; + -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 input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #954143; - -webkit-box-shadow: 0 0 6px #d49b9d; - -moz-box-shadow: 0 0 6px #d49b9d; - box-shadow: 0 0 6px #d49b9d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -918,24 +1291,33 @@ input[type="checkbox"][readonly] { background-color: #f8f0f0; border-color: #b55457; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .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 input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -943,59 +1325,78 @@ input[type="checkbox"][readonly] { background-color: #dff0d8; 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; box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} .help-block, .help-inline { - color: #555555; + color: #6a6a6a; } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1006,62 +1407,76 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { - margin-bottom: 5px; +.input-append, +.input-prepend { + display: inline-block; + margin-bottom: 10px; + vertical-align: middle; + font-size: 0; + white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-append .dropdown-menu, +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, +.input-prepend .add-on, +.input-append .btn, .input-prepend .btn, -.input-append .btn { - margin-left: -1px; +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,12 +1497,21 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; +.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 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 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 { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1099,6 +1523,13 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; 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 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; @@ -1113,7 +1544,10 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; +} +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1121,9 +1555,36 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, .form-inline input, @@ -1152,6 +1613,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1159,7 +1621,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1185,45 +1649,53 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; } .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } .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: 9px; 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 { max-width: 100%; @@ -1233,12 +1705,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1260,6 +1732,9 @@ table { .table tbody + tbody { border-top: 2px solid #dddddd; } +.table .table { + background-color: #eeeeee; +} .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1267,7 +1742,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1288,160 +1763,175 @@ table { .table-bordered tbody:first-child tr:first-child td { 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, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 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, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody: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 tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 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 thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; +} +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 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, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; +} +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; +} +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } -table .span1 { +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 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 tbody tr.success > td { + background-color: #dff0d8; } -table .span18 { - float: none; - width: 1404px; - margin-left: 0; +.table tbody tr.error > td { + background-color: #f8f0f0; } -table .span19 { - float: none; - width: 1484px; - margin-left: 0; +.table tbody tr.warning > td { + background-color: #fcf8e3; } -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.info > td { + background-color: #d9edf7; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table-hover tbody tr.error:hover > td { + background-color: #f0dfe0; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } .dropup, .dropdown { @@ -1463,18 +1953,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1483,17 +1966,17 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; + padding: 5px 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1508,35 +1991,71 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu > li > a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + text-decoration: none; + color: #ffffff; + background-color: #e62f8d; + background-image: -moz-linear-gradient(top, #e73892, #e42186); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e73892), to(#e42186)); + background-image: -webkit-linear-gradient(top, #e73892, #e42186); + background-image: -o-linear-gradient(top, #e73892, #e42186); + background-image: linear-gradient(to bottom, #e73892, #e42186); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe73892', endColorstr='#ffe42186', GradientType=0); +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #b509b5; + outline: 0; + background-color: #e62f8d; + background-image: -moz-linear-gradient(top, #e73892, #e42186); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e73892), to(#e42186)); + background-image: -webkit-linear-gradient(top, #e73892, #e42186); + background-image: -o-linear-gradient(top, #e73892, #e42186); + background-image: linear-gradient(to bottom, #e73892, #e42186); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe73892', endColorstr='#ffe42186', GradientType=0); +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: default; } .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -1544,7 +2063,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -1552,7 +2071,62 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.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; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + 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-left: 20px; + padding-right: 20px; +} .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1563,8 +2137,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1590,16 +2163,13 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -1607,7 +2177,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -1618,13 +2187,14 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } -.close:hover { +.close:hover, +.close:focus { color: #000000; text-decoration: none; cursor: pointer; @@ -1644,25 +2214,23 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 12px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; + font-size: 14px; + line-height: 20px; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); border-color: #eaeaea #eaeaea #c4c4c4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; @@ -1681,10 +2249,12 @@ button.close { box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, +.btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #eaeaea; *background-color: #dddddd; } @@ -1695,17 +2265,13 @@ button.close { .btn:first-child { *margin-left: 0; } -.btn:hover { +.btn:hover, +.btn:focus { 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; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -1716,8 +2282,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,.15), 0 1px 2px rgba(0,0,0,.05); @@ -1727,7 +2291,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -1736,43 +2299,54 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 15px; - 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: 1px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; } .btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.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: 14px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + 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, @@ -1782,49 +2356,49 @@ button.close { .btn-inverse.active { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn-primary { - background-color: #f654f6; - background-image: -moz-linear-gradient(top, #f544f5, #f76bf7); - background-image: -ms-linear-gradient(top, #f544f5, #f76bf7); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f544f5), to(#f76bf7)); - background-image: -webkit-linear-gradient(top, #f544f5, #f76bf7); - background-image: -o-linear-gradient(top, #f544f5, #f76bf7); - background-image: linear-gradient(top, #f544f5, #f76bf7); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ea53a1; + background-image: -moz-linear-gradient(top, #ec66ab, #e73892); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ec66ab), to(#e73892)); + background-image: -webkit-linear-gradient(top, #ec66ab, #e73892); + background-image: -o-linear-gradient(top, #ec66ab, #e73892); + background-image: linear-gradient(to bottom, #ec66ab, #e73892); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f544f5', endColorstr='#f76bf7', GradientType=0); - border-color: #f76bf7 #f76bf7 #f322f3; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffec66ab', endColorstr='#ffe73892', GradientType=0); + border-color: #e73892 #e73892 #bc176c; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76bf7; + *background-color: #e73892; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, +.btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #f76bf7; - *background-color: #f653f6; + color: #ffffff; + background-color: #e73892; + *background-color: #e42186; } .btn-primary:active, .btn-primary.active { - background-color: #f43bf4 \9; + background-color: #d31979 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); 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); *background-color: #f89406; @@ -1833,10 +2407,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, +.btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -1845,15 +2421,16 @@ button.close { background-color: #c67605 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); 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); *background-color: #bd362f; @@ -1862,10 +2439,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, +.btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -1874,15 +2453,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); 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); *background-color: #51a351; @@ -1891,10 +2471,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, +.btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -1903,15 +2485,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); 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); *background-color: #2f96b4; @@ -1920,10 +2503,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, +.btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -1932,15 +2517,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + 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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); 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); *background-color: #222222; @@ -1949,10 +2535,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, +.btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -1962,8 +2550,8 @@ button.close { } button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { @@ -1985,19 +2573,46 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #e73892; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover, +.btn-link:focus { + color: #bc176c; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { + color: #333333; + text-decoration: none; +} .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + *zoom: 1; + font-size: 0; + vertical-align: middle; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2005,24 +2620,38 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } -.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 { + margin-left: 5px; } .btn-group > .btn { position: relative; - float: left; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu, +.btn-group > .popover { + font-size: 14px; +} +.btn-group > .btn-mini { + font-size: 10.5px; +} +.btn-group > .btn-small { + font-size: 11.9px; +} +.btn-group > .btn-large { + font-size: 17.5px; +} .btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; @@ -2069,26 +2698,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2100,7 +2733,7 @@ input[type="submit"].btn.btn-mini { background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #f76bf7; + background-color: #e73892; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #f89406; @@ -2118,29 +2751,23 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -2150,45 +2777,95 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +} +.btn-group-vertical { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group-vertical > .btn { + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group-vertical > .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.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 { + -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 { + -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 { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.alert, +.alert h4 { color: #c09853; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #468847; } +.alert-success h4 { + color: #468847; +} .alert-danger, .alert-error { background-color: #f8f0f0; border-color: #c6898b; color: #b55457; } +.alert-danger h4, +.alert-error h4 { + color: #b55457; +} .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #3a87ad; } +.alert-info h4 { + color: #3a87ad; +} .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -2202,25 +2879,29 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} .nav > .pull-right { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2243,18 +2924,20 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #b509b5; + background-color: #e73892; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2270,6 +2953,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2295,19 +2979,21 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-tabs > li > a:hover { +.nav-tabs > li > a:hover, +.nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: #555555; - background-color: #ffffff; + background-color: #eeeeee; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -2322,9 +3008,10 @@ input[type="submit"].btn.btn-mini { border-radius: 5px; } .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: #ffffff; - background-color: #b509b5; + background-color: #e73892; } .nav-stacked > li { float: none; @@ -2342,16 +3029,23 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -2362,51 +3056,60 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #b509b5; - border-bottom-color: #b509b5; +.nav .dropdown-toggle .caret { + border-top-color: #e73892; + border-bottom-color: #e73892; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #6c056c; - border-bottom-color: #6c056c; +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { + border-top-color: #bc176c; + border-bottom-color: #bc176c; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; } -.nav > .dropdown.active > a:hover { - color: #000000; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: #ffffff; background-color: #999999; border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: #999999; } .tabbable { @@ -2416,6 +3119,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2448,12 +3152,14 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below > .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover, +.tabs-below > .nav-tabs > li > a:focus { border-bottom-color: transparent; border-top-color: #ddd; } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, @@ -2477,11 +3183,13 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2496,78 +3204,110 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.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); + *zoom: 1; +} +.navbar-inner:before, +.navbar-inner:after { + display: table; + content: ""; + line-height: 0; +} +.navbar-inner:after { + clear: both; } .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; + overflow: visible; } .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #777777; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .brand:hover, +.navbar .brand:focus { + text-decoration: none; } -.navbar .navbar-text { +.navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #777777; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover, +.navbar-link:focus { + color: #333333; +} +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #f2f2f2; + border-right: 1px solid #ffffff; } .navbar .btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { + margin-top: 0; } .navbar-form { margin-bottom: 0; @@ -2577,6 +3317,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -2588,7 +3329,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -2599,7 +3341,7 @@ input[type="submit"].btn.btn-mini { } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } .navbar-form .input-append input, @@ -2609,44 +3351,28 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; +.navbar-static-top { + position: static; + margin-bottom: 0; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -2657,6 +3383,13 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -2664,6 +3397,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -2671,9 +3405,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); +} .navbar-fixed-bottom { bottom: 0; } +.navbar-fixed-bottom .navbar-inner { + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -2683,51 +3428,36 @@ input[type="submit"].btn.btn-mini { } .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #777777; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; + text-shadow: 0 1px 0 #ffffff; } -.navbar .btn-group { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #ffffff; + color: #333333; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #555555; text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { display: none; @@ -2735,18 +3465,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + 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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + 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); - *background-color: #222222; + *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2755,16 +3486,18 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -2781,7 +3514,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -2792,7 +3525,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -2802,142 +3535,293 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + background-color: #e5e5e5; + color: #555555; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + border-color: #252525; } -.breadcrumb .divider { - padding: 0 5px; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover, +.navbar-inverse .brand:focus, +.navbar-inverse .nav > li > a:focus { + color: #ffffff; } -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); +.navbar-inverse .brand { + color: #999999; } -.pagination li { - display: inline; +.navbar-inverse .navbar-text { + color: #999999; } -.pagination a { +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + background-color: transparent; + color: #ffffff; +} +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover, +.navbar-inverse .navbar-link:focus { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #111111; + border-right-color: #222222; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111111; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > a:hover .caret, +.navbar-inverse .nav li.dropdown > a:focus .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; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + 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-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + 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); + *background-color: #040404; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:focus, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} +.breadcrumb { + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb > li > .divider { + padding: 0 5px; + color: #ccc; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + margin: 20px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -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 ul > li { + display: inline; +} +.pagination ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 34px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination ul > li > a:hover, +.pagination ul > li > a:focus, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a { +.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, +.pagination ul > .disabled > a:focus { color: #999999; background-color: transparent; cursor: default; } -.pagination li:first-child a { +.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-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.pagination li:last-child a { - -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; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -2945,9 +3829,63 @@ input[type="submit"].btn.btn-mini { .pagination-right { 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-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 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-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 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; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 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-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -2956,6 +3894,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -2963,7 +3902,8 @@ input[type="submit"].btn.btn-mini { .pager li { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -2972,34 +3912,27 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 15px; border-radius: 15px; } -.pager a:hover { +.pager li > a:hover, +.pager li > a:focus { 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 > a:focus, +.pager .disabled > span { color: #999999; background-color: #fff; cursor: default; } -.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: 2070; -} .modal-backdrop { position: fixed; top: 0; @@ -3019,12 +3952,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -3040,17 +3972,17 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -3059,7 +3991,12 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { + position: relative; overflow-y: auto; max-height: 400px; padding: 15px; @@ -3085,6 +4022,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3096,13 +4034,16 @@ input[type="submit"].btn.btn-mini { .modal-footer .btn-group .btn + .btn { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -3111,52 +4052,24 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .tooltip.top { - margin-top: -2px; + margin-top: -3px; + padding: 5px 0; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; + padding: 5px 0; } .tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: #ffffff; text-align: center; text-decoration: none; @@ -3169,100 +4082,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; } -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + border-width: 5px 5px 0; + border-top-color: #000000; } -.popover.right .arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + border-width: 5px 5px 5px 0; + border-right-color: #000000; } -.popover.left .arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -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); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + border-width: 5px 0 5px 5px; + border-left-color: #000000; } -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .thumbnails { margin-left: -20px; @@ -3273,6 +4122,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3282,23 +4132,28 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #b509b5; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #e73892; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -3311,10 +4166,13 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3324,19 +4182,25 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, -a.badge:hover { +a.label:focus, +a.badge:hover, +a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; @@ -3381,9 +4245,18 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; } to { background-position: 0 0; @@ -3423,17 +4296,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', 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); @@ -3443,41 +4315,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', 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); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3490,88 +4364,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -3596,7 +4470,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -3604,47 +4478,47 @@ a.badge:hover { width: 100%; position: relative; } -.carousel .item { +.carousel-inner > .item { display: none; position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > 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%; } .carousel-control { @@ -3671,28 +4545,62 @@ a.badge:hover { left: auto; right: 15px; } -.carousel-control:hover { +.carousel-control:hover, +.carousel-control:focus { color: #ffffff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} +.carousel-indicators .active { + background-color: #fff; +} .carousel-caption { position: absolute; left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .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; @@ -3705,1500 +4613,2030 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; +.hero-unit li { + line-height: 30px; } -.hide { +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; } -.show { - display: block; +.popover.top { + margin-top: -10px; } -.invisible { - visibility: hidden; +.popover.right { + margin-left: 10px; } -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot'); - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; +.popover.bottom { + margin-top: 10px; } -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: FontAwesome; +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; +.popover-title:empty { + display: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: middle; - font-size: 1.3333333333333333em; +.popover-content { + padding: 9px 14px; } -.btn [class^="icon-"], -.nav-tabs [class^="icon-"], -.btn [class*=" icon-"], -.nav-tabs [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -li [class^="icon-"], -li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.popover .arrow { + border-width: 11px; } -li .icon-large:before, -li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; +.popover .arrow:after { + border-width: 10px; + content: ""; } -ul.icons { - list-style-type: none; - margin-left: 2em; - text-indent: -0.8em; +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .8em; +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); } -ul.icons li .icon-large:before, -ul.icons li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - vertical-align: initial; +.popover.right .arrow:after { + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } -.icon-music:before { - content: "\f001"; +.popover.bottom .arrow:after { + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; } -.icon-search:before { - content: "\f002"; +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); } -.icon-envelope:before { - content: "\f003"; +.popover.left .arrow:after { + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; } -.icon-heart:before { - content: "\f004"; +.pull-right { + float: right; } -.icon-star:before { - content: "\f005"; +.pull-left { + float: left; } -.icon-star-empty:before { - content: "\f006"; +.hide { + display: none; } -.icon-user:before { - content: "\f007"; +.show { + display: block; } -.icon-film:before { - content: "\f008"; +.invisible { + visibility: hidden; } -.icon-th-large:before { - content: "\f009"; +.affix { + position: fixed; } -.icon-th:before { - content: "\f00a"; +.tag { + display: inline-block; + margin-bottom: 4px; + color: #111111; + background-color: #f6f6f6; + padding: 1px 10px; + border: 1px solid #dddddd; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.icon-th-list:before { - content: "\f00b"; +a.tag:hover { + text-decoration: none; + color: #fff; + background-color: #ec66ab; + border: 1px solid #e73892; + -webkit-box-shadow: inset 0 1px 0 #f293c4; + -moz-box-shadow: inset 0 1px 0 #f293c4; + box-shadow: inset 0 1px 0 #f293c4; } -.icon-ok:before { - content: "\f00c"; +.pill { + display: inline-block; + background-color: #6f8890; + color: #ffffff; + padding: 2px 10px 1px 10px; + margin-right: 5px; + font-weight: normal; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-remove:before { - content: "\f00d"; +.pill a { + color: #ffffff; } -.icon-zoom-in:before { - content: "\f00e"; +.pill a.remove { + font-size: 11px; } -.icon-zoom-out:before { - content: "\f010"; +.unstyled { + margin: 0; + list-style: none; } -.icon-off:before { - content: "\f011"; +.simple-item { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-signal:before { - content: "\f012"; +.simple-item:last-of-type { + border-bottom: 0; } -.icon-cog:before { - content: "\f013"; +.simple-list { + *zoom: 1; + margin: 0; + list-style: none; } -.icon-trash:before { - content: "\f014"; +.simple-list:before, +.simple-list:after { + display: table; + content: ""; + line-height: 0; } -.icon-home:before { - content: "\f015"; +.simple-list:after { + clear: both; } -.icon-file:before { - content: "\f016"; +.simple-list > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-time:before { - content: "\f017"; +.simple-list > li:last-of-type { + border-bottom: 0; } -.icon-road:before { - content: "\f018"; +.simple-list .ckan-icon { + position: relative; + top: 0px; } -.icon-download-alt:before { - content: "\f019"; +.module-narrow .simple-list > li { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-download:before { - content: "\f01a"; +.listing li { + text-align: right; + margin-bottom: 5px; } -.icon-upload:before { - content: "\f01b"; +.listing .key { + clear: right; + font-weight: bold; } -.icon-inbox:before { - content: "\f01c"; +.js .tab-content { + display: none; } -.icon-play-circle:before { - content: "\f01d"; +.js .tab-content.active { + display: block; } -.icon-repeat:before { - content: "\f01e"; +.box { + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); } -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; +.module { + margin: 20px 0; } -.icon-list-alt:before { - content: "\f022"; +.module-heading { + *zoom: 1; + margin: 0; + padding: 7px 25px; + font-size: 14px; + line-height: 1.3; + background-color: #f6f6f6; + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } -.icon-lock:before { - content: "\f023"; +.module-heading:before, +.module-heading:after { + display: table; + content: ""; + line-height: 0; } -.icon-flag:before { - content: "\f024"; +.module-heading:after { + clear: both; } -.icon-headphones:before { - content: "\f025"; +.module-heading .action { + float: right; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; } -.icon-volume-off:before { - content: "\f026"; +.module-heading .action:hover { + color: #444444; } -.icon-volume-down:before { - content: "\f027"; +.module-content { + padding: 0 25px; + margin: 20px 0; } -.icon-volume-up:before { - content: "\f028"; +.module-content:first-child { + margin-top: 0; + padding-top: 20px; } -.icon-qrcode:before { - content: "\f029"; +.module-content:last-child { + margin-bottom: 0; + padding-bottom: 20px; } -.icon-barcode:before { - content: "\f02a"; +.module-content > :last-child { + margin-bottom: 0; } -.icon-tag:before { - content: "\f02b"; +.module:first-child .module-heading { + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; + border-top-width: 0; } -.icon-tags:before { - content: "\f02c"; +.module:last-child { + margin-bottom: 20px; } -.icon-book:before { - content: "\f02d"; +.module-footer { + padding: 7px 25px 7px; + margin: 0; + border-top: 1px dotted #dddddd; } -.icon-bookmark:before { - content: "\f02e"; +.module .read-more { + font-weight: bold; + color: #000000; } -.icon-print:before { - content: "\f02f"; +.module .pagination { + height: 34px; + margin-bottom: 0; + border-top: 1px solid #dddddd; } -.icon-camera:before { - content: "\f030"; +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; } -.icon-font:before { - content: "\f031"; +.module .pagination > ul { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: 0; } -.icon-bold:before { - content: "\f032"; +.module .pagination li a { + border-top: none; + border-bottom: none; + padding-top: 7px; + padding-bottom: 7px; } -.icon-italic:before { - content: "\f033"; +.module .pagination li:first-child a, +.module .pagination li:last-child a { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.icon-text-height:before { - content: "\f034"; +.module .pagination li:first-child a { + border-left-width: 0; } -.icon-text-width:before { - content: "\f035"; +.module .pagination li:last-child a { + border-right-width: 0; } -.icon-align-left:before { - content: "\f036"; +.module .pagination li.active a { + border-left-width: 1px; + border-right-width: 1px; } -.icon-align-center:before { - content: "\f037"; +.module-content-shallow { + padding: 0; + margin-top: 10px; + padding-bottom: 10px; } -.icon-align-right:before { - content: "\f038"; +.module h1 { + margin-bottom: 20px; } -.icon-align-justify:before { - content: "\f039"; +.module-shallow .module-content { + padding: 10px; + margin: 0; } -.icon-list:before { - content: "\f03a"; +.module-shallow .module-tags { + margin-top: 0; + margin-bottom: 0; } -.icon-indent-left:before { - content: "\f03b"; +.module-shallow .module-content:first-child { + padding-top: 10px; } -.icon-indent-right:before { - content: "\f03c"; +.module-shallow .module-content:last-child { + padding-bottom: 10px; } -.icon-facetime-video:before { - content: "\f03d"; +.module-narrow .module-heading, +.module-narrow .module-content, +.module-narrow .module-footer { + padding-left: 15px; + padding-right: 15px; } -.icon-picture:before { - content: "\f03e"; +.module-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-pencil:before { - content: "\f040"; +.module-grid:before, +.module-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-map-marker:before { - content: "\f041"; +.module-grid:after { + clear: both; } -.icon-adjust:before { - content: "\f042"; +.module-item { + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + float: left; + margin-left: 20px; + width: 460px; + padding-top: 10px; + padding-bottom: 10px; + padding-right: 50px; + overflow: hidden; + position: relative; } -.icon-tint:before { - content: "\f043"; +.module-item span.count { + color: #999; } -.icon-edit:before { - content: "\f044"; +.module-item .media-image { + margin-bottom: 5px; } -.icon-share:before { - content: "\f045"; +.module-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-check:before { - content: "\f046"; +.module-item:hover { + z-index: 1; } -.icon-move:before { - content: "\f047"; +.module-item:hover .media-edit { + opacity: 1; } -.icon-step-backward:before { - content: "\f048"; +.module-item.first { + clear: left; } -.icon-fast-backward:before { - content: "\f049"; +.group .content img { + margin: 0 -5px 5px; + max-width: initial; } -.icon-backward:before { - content: "\f04a"; +.group .content h3 { + font-size: 14px; + line-height: 1.3; } -.icon-play:before { - content: "\f04b"; +.group-listing { + margin-left: -20px; } -.icon-pause:before { - content: "\f04c"; +.ckanext-datapreview { + position: relative; } -.icon-stop:before { - content: "\f04d"; +.ckanext-datapreview > iframe { + min-height: 400px; } -.icon-forward:before { - content: "\f04e"; +.ckanext-datapreview > img { + max-height: 500px; + max-width: 100%; + overflow: hidden; } -.icon-fast-forward:before { - content: "\f050"; +.package-info h4 { + margin-bottom: 10px; } -.icon-step-forward:before { - content: "\f051"; +.module-resource { + background-color: #ffffff; + border-bottom: 1px solid #dddddd; + margin-top: 0; + margin-bottom: 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.icon-eject:before { - content: "\f052"; +.module-resource .actions { + position: relative; + float: right; + top: -10px; + right: -15px; } -.icon-chevron-left:before { - content: "\f053"; +.module .module-tags { + padding-bottom: 8px; } -.icon-chevron-right:before { - content: "\f054"; +.secondary .module:first-child, +.primary .module:first-child { + margin-top: 0; } -.icon-plus-sign:before { - content: "\f055"; +.no-nav .module:last-child { + margin-top: 0; } -.icon-minus-sign:before { - content: "\f056"; +.module-image { + float: left; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + margin-right: 15px; } -.icon-remove-sign:before { - content: "\f057"; +.module-image img { + max-width: 50px; + max-height: 50px; + vertical-align: middle; } -.icon-ok-sign:before { - content: "\f058"; +.banner { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center; + position: absolute; + top: 15px; + right: -35px; + width: 80px; + color: #ffffff; + background-color: #e73892; + padding: 1px 20px; + font-size: 11px; + text-align: center; + text-transform: uppercase; } -.icon-question-sign:before { - content: "\f059"; +.media-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-info-sign:before { - content: "\f05a"; +.media-grid:before, +.media-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-screenshot:before { - content: "\f05b"; +.media-grid:after { + clear: both; } -.icon-remove-circle:before { - content: "\f05c"; +.media-item { + position: relative; + float: left; + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-ok-circle:before { - content: "\f05d"; +.media-item span.count { + color: #999; } -.icon-ban-circle:before { - content: "\f05e"; +.media-item .media-image { + margin-bottom: 5px; } -.icon-arrow-left:before { - content: "\f060"; +.media-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-arrow-right:before { - content: "\f061"; +.media-item:hover { + z-index: 1; } -.icon-arrow-up:before { - content: "\f062"; +.media-item:hover .media-edit { + opacity: 1; } -.icon-arrow-down:before { - content: "\f063"; +.media-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 1px solid #dddddd; + overflow: hidden; + -webkit-transition: all 0.2s ease-in; + -moz-transition: all 0.2s ease-in; + -o-transition: all 0.2s ease-in; + transition: all 0.2s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-share-alt:before { - content: "\f064"; +.media-view:hover, +.media-view.hovered { + border-color: #e73892; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); } -.icon-resize-full:before { - content: "\f065"; +.media-view:hover .banner, +.media-view.hovered .banner { + background-color: #e73892; } -.icon-resize-small:before { - content: "\f066"; +.media-view span { + display: none; } -.icon-plus:before { - content: "\f067"; +.media-view .banner { + display: block; + background-color: #b7b7b7; + -webkit-transition: background-color 0.2s ease-in; + -moz-transition: background-color 0.2s ease-in; + -o-transition: background-color 0.2s ease-in; + transition: background-color 0.2s ease-in; } -.icon-minus:before { - content: "\f068"; +.media-image { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.icon-asterisk:before { - content: "\f069"; +.media-heading { + font-size: 18px; + line-height: 1.3; + margin: 5px 0; } -.icon-exclamation-sign:before { - content: "\f06a"; +.media-overlay { + position: relative; + min-height: 35px; } -.icon-gift:before { - content: "\f06b"; +.media-overlay .media-heading { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 12px 10px; + margin: 0; + background-color: #000; + background-color: rgba(0, 0, 0, 0.8); + font-size: 13px; + color: #fff; + z-index: 1; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -.icon-leaf:before { - content: "\f06c"; +.media-overlay .media-image { + float: none; + display: block; + margin-right: 0; } -.icon-fire:before { - content: "\f06d"; +.media-item.is-expander .truncator-link { + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; + position: absolute; + z-index: 10; + left: 15px; + bottom: 15px; + opacity: 0; } -.icon-eye-open:before { - content: "\f06e"; +.media-item.is-expander:hover { + padding-bottom: 35px; } -.icon-eye-close:before { - content: "\f070"; +.media-item.is-expander:hover .truncator-link { + opacity: 1; } -.icon-warning-sign:before { - content: "\f071"; +.wide .media-item { + width: 186px; } -.icon-plane:before { - content: "\f072"; +.nav-simple, +.nav-aside { + *zoom: 1; + margin: 0; + list-style: none; + padding-bottom: 0; } -.icon-calendar:before { - content: "\f073"; +.nav-simple:before, +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { + display: table; + content: ""; + line-height: 0; } -.icon-random:before { - content: "\f074"; +.nav-simple:after, +.nav-aside:after { + clear: both; } -.icon-comment:before { - content: "\f075"; +.nav-simple > li, +.nav-aside > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-magnet:before { - content: "\f076"; +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { + border-bottom: 0; } -.icon-chevron-up:before { - content: "\f077"; +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { + position: relative; + top: 0px; } -.icon-chevron-down:before { - content: "\f078"; +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; } -.icon-retweet:before { - content: "\f079"; +.nav-item > a, +.nav-aside li a { + color: #333333; + font-size: 14px; + line-height: 20px; + margin: -7px -25px; + padding: 7px 25px; } -.icon-shopping-cart:before { - content: "\f07a"; +.nav-item.active, +.nav-aside li.active { + background-color: #f6f6f6; } -.icon-folder-close:before { - content: "\f07b"; +.nav-item.active > a, +.nav-aside li.active a { + position: relative; + color: #ffffff; + background-color: #8ca0a6; } -.icon-folder-open:before { - content: "\f07c"; +.nav-item.active > a:hover, +.nav-aside li.active a:hover { + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-vertical:before { - content: "\f07d"; +.nav-item.active > a:before, +.nav-aside li.active a:before { + content: ' '; + position: absolute; + top: 0; + right: -6px; + width: 6px; + height: 34px; + background-image: url("../../../base/images/nav-active.png?1"); } -.icon-resize-horizontal:before { - content: "\f07e"; +.nav-item.active > a span, +.nav-aside li.active a span { + white-space: nowrap; + overflow: hidden; + display: block; } -.icon-bar-chart:before { - content: "\f080"; +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-twitter-sign:before { - content: "\f081"; +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { + position: relative; } -.icon-facebook-sign:before { - content: "\f082"; +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { + padding-left: 42px; + padding-right: 42px; } -.icon-camera-retro:before { - content: "\f083"; +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { + position: absolute; + top: 50%; + left: 15px; + width: 20px; + height: 20px; + margin-top: -10px; + z-index: 2; } -.icon-key:before { - content: "\f084"; +.nav-facet .nav-item > a:hover:after, +.nav-facet .nav-item.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-cogs:before { - content: "\f085"; +.nav-facet .nav-item > a:hover:after { + width: 17px; + height: 17px; + background-position: -17px -16px; } -.icon-comments:before { - content: "\f086"; +.nav-facet .nav-item.active > a:after { + width: 17px; + height: 17px; + background-position: 0px -16px; + right: 3px; } -.icon-thumbs-up:before { - content: "\f087"; +.user-list { + margin: 0; + list-style: none; } -.icon-thumbs-down:before { - content: "\f088"; +.user-list li { + margin: 0 0 10px 0; } -.icon-star-half:before { - content: "\f089"; +.user-list .gravatar { + vertical-align: -4px; + margin-right: 3px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-heart-empty:before { - content: "\f08a"; +.nav-facet-tertiary { + margin: 10px 0; } -.icon-signout:before { - content: "\f08b"; +.nav-facet-tertiary .module-heading { + margin-bottom: 5px; + padding: 8px 12px; + border-bottom-width: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.icon-linkedin-sign:before { - content: "\f08c"; +.nav-facet-tertiary .module-heading i { + display: none; } -.icon-pushpin:before { - content: "\f08d"; +.nav-facet-tertiary .module-footer { + padding: 8px 12px; + border-top-width: 0; } -.icon-external-link:before { - content: "\f08e"; +.nav-facet-tertiary .module-footer a { + font-weight: normal; + color: #8C8C8C; } -.icon-signin:before { - content: "\f090"; +.nav-facet-tertiary .nav { + margin-bottom: 0; } -.icon-trophy:before { - content: "\f091"; +.nav-facet-tertiary .module-content.empty { + padding: 8px 12px; + margin-top: 0; } -.icon-github-sign:before { - content: "\f092"; +.nav-facet-tertiary .nav li.active { + position: relative; } -.icon-upload-alt:before { - content: "\f093"; +.nav-facet-tertiary .nav li.active > a:hover:after, +.nav-facet-tertiary .nav li.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 17px; + height: 17px; + background-position: 0px -16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-lemon:before { - content: "\f094"; +.nav-simple > .nav-btn { + padding-left: 0; + padding-right: 0; + text-align: center; } -.icon-phone:before { - content: "\f095"; +.nav-simple > .nav-btn .btn { + display: inline-block; } -.icon-check-empty:before { - content: "\f096"; +.js .js-hide { + display: none; } -.icon-bookmark-empty:before { - content: "\f097"; +.js .js-hide.active { + display: block; } -.icon-phone-sign:before { - content: "\f098"; +.btn, +label { + font-weight: bold; } -.icon-twitter:before { - content: "\f099"; +.btn-rounded { + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + padding-left: 15px; + padding-right: 15px; } -.icon-facebook:before { - content: "\f09a"; +label { + cursor: pointer; + font-size: 14px; } -.icon-github:before { - content: "\f09b"; +label:after { + content: ":"; } -.icon-unlock:before { - content: "\f09c"; +label.radio:after, +label.checkbox:after { + content: ""; } -.icon-credit-card:before { - content: "\f09d"; +input[type=radio], +input[type=checkbox] { + position: relative; + top: 7px; + padding: 0; + margin: 0; } -.icon-rss:before { - content: "\f09e"; +input[type=radio].checkbox-onown, +input[type=checkbox].checkbox-onown { + top: 0; } -.icon-hdd:before { - content: "\f0a0"; +select { + padding: 4px; } -.icon-bullhorn:before { - content: "\f0a1"; +textarea { + max-width: 100%; } -.icon-bell:before { - content: "\f0a2"; +.control-group .btn { + position: relative; + top: -2px; } -.icon-certificate:before { - content: "\f0a3"; +.control-full input, +.control-full select, +.control-full textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: auto; + width: 100%; } -.icon-hand-right:before { - content: "\f0a4"; +.control-medium input, +.control-medium select, +.control-medium textarea { + width: 320px; } -.icon-hand-left:before { - content: "\f0a5"; +.control-large input, +.control-large .control-label { + font-size: 17.5px; + line-height: 30px; } -.icon-hand-up:before { - content: "\f0a6"; +.control-large input { + height: 41px; } -.icon-hand-down:before { - content: "\f0a7"; +.form-actions { + background: none; + margin-left: -25px; + margin-right: -25px; + margin-bottom: 0; + padding-bottom: 0; + text-align: right; } -.icon-circle-arrow-left:before { - content: "\f0a8"; +.form-actions .action-info { + float: left; + width: 50%; + line-height: 2; + text-align: left; + color: #707070; + margin: 0; } -.icon-circle-arrow-right:before { - content: "\f0a9"; +.form-actions .action-info.small { + font-size: 11px; + line-height: 1.2; } -.icon-circle-arrow-up:before { - content: "\f0aa"; +.form-horizontal .control-label { + width: 120px; } -.icon-circle-arrow-down:before { - content: "\f0ab"; +.form-horizontal .controls { + margin-left: 130px; } -.icon-globe:before { - content: "\f0ac"; +.form-horizontal .info-block { + position: relative; + display: block; + font-size: 11px; + color: #aaaaaa; + line-height: 1.3; + padding: 6px 0 6px 25px; + margin-top: 6px; } -.icon-wrench:before { - content: "\f0ad"; +.form-horizontal .info-help { + padding: 6px 0; } -.icon-tasks:before { - content: "\f0ae"; +.form-horizontal .info-help:before { + display: none; } -.icon-filter:before { - content: "\f0b0"; +.form-horizontal .info-help-tight { + margin-top: -10px; } -.icon-briefcase:before { - content: "\f0b1"; +.form-horizontal .info-inline { + float: right; + width: 265px; + margin-top: 0; + padding-bottom: 0; } -.icon-fullscreen:before { - content: "\f0b2"; +.form-horizontal .control-medium .info-block.info-inline { + width: 165px; } -.icon-group:before { - content: "\f0c0"; +.form-horizontal .info-block:before { + font-size: 2.2em; + position: absolute; + left: 0; + top: 2px; } -.icon-link:before { - content: "\f0c1"; +.form-horizontal .info-inline:before { + top: 8px; } -.icon-cloud:before { - content: "\f0c2"; +.info-block .icon-large, +.info-inline .icon-large { + float: left; + font-size: 22px; + margin-right: 15px; } -.icon-beaker:before { - content: "\f0c3"; +.form-horizontal .info-block a { + color: #aaaaaa; + text-decoration: underline; } -.icon-cut:before { - content: "\f0c4"; +.form-horizontal .form-actions { + padding-left: 25px; + padding-right: 25px; } -.icon-copy:before { - content: "\f0c5"; +.form-inline input { + padding-bottom: 9px; } -.icon-paper-clip:before { - content: "\f0c6"; -} -.icon-save:before { - content: "\f0c7"; +.form-inline select { + margin-top: 0; } -.icon-sign-blank:before { - content: "\f0c8"; +.form-inline .btn { + margin-left: 5px; } -.icon-reorder:before { - content: "\f0c9"; +.form-narrow label { + margin-bottom: 0; } -.icon-list-ul:before { - content: "\f0ca"; +.form-narrow select { + width: 100%; } -.icon-list-ol:before { - content: "\f0cb"; +.form-narrow .form-actions { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px 0; } -.icon-strikethrough:before { - content: "\f0cc"; +.form-select label { + margin-right: 5px; } -.icon-underline:before { - content: "\f0cd"; +.simple-input label, +.simple-input button { + display: none; } -.icon-table:before { - content: "\f0ce"; +.simple-input .field { + position: relative; } -.icon-magic:before { - content: "\f0d0"; +.simple-input .field-bordered { + border-bottom: 1px dotted #dddddd; } -.icon-truck:before { - content: "\f0d1"; +.simple-input .field input { + width: 100%; + height: auto; + margin: 0 -7px; + padding: 7px 5px; } -.icon-pinterest:before { - content: "\f0d2"; +.simple-input .field .btn-search { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + background-position: -51px -16px; + position: absolute; + display: block; + height: 17px; + width: 17px; + top: 50%; + right: 0; + margin-top: -8px; + background-color: transparent; + border: none; + text-indent: -999em; } -.icon-pinterest-sign:before { - content: "\f0d3"; +.editor textarea { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: none; } -.icon-google-plus-sign:before { - content: "\f0d4"; +.editor .editor-info-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + float: none; + padding: 4px 10px; + background: #ebebeb; + width: auto; + border: 1px solid #cccccc; + border-top: none; + font-size: 11px; + color: #282828; } -.icon-google-plus:before { - content: "\f0d5"; +.editor .editor-info-block a { + color: #e73892; + text-decoration: none; } -.icon-money:before { - content: "\f0d6"; +.control-custom { + font-size: 0; } -.icon-caret-down:before { - content: "\f0d7"; +.control-custom label { + margin-bottom: 0; } -.icon-caret-up:before { - content: "\f0d8"; +.control-custom input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + width: 140px; } -.icon-caret-left:before { - content: "\f0d9"; +.control-custom input:last-of-type { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } -.icon-caret-right:before { - content: "\f0da"; +.control-custom .checkbox { + display: inline-block; + margin-left: 5px; } -.icon-columns:before { - content: "\f0db"; +.control-custom .checkbox input { + width: auto; } -.icon-sort:before { - content: "\f0dc"; +.control-custom.disabled label, +.control-custom.disabled input { + color: #aaaaaa; + text-decoration: line-through; + text-shadow: none; } -.icon-sort-down:before { - content: "\f0dd"; +.control-custom.disabled input { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f3f3f3; } -.icon-sort-up:before { - content: "\f0de"; +.control-custom.disabled .checkbox { + color: #444444; + text-decoration: none; } -.icon-envelope-alt:before { - content: "\f0e0"; +.control-custom .checkbox.btn { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + position: relative; + top: 0; + left: 5px; + height: 1px; + width: 9px; + padding: 3px 8px; + line-height: 18px; } -.icon-linkedin:before { - content: "\f0e1"; +.control-custom .checkbox.btn span { + display: none; + width: 30px; } -.icon-undo:before { - content: "\f0e2"; +.control-custom .checkbox.btn:before { + position: relative; + top: 1px; + left: -1px; + color: #fff; } -.icon-legal:before { - content: "\f0e3"; +.control-custom .checkbox.btn input { + display: none; } -.icon-dashboard:before { - content: "\f0e4"; +.control-custom.disabled .checkbox.btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ea53a1; + background-image: -moz-linear-gradient(top, #ec66ab, #e73892); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ec66ab), to(#e73892)); + background-image: -webkit-linear-gradient(top, #ec66ab, #e73892); + background-image: -o-linear-gradient(top, #ec66ab, #e73892); + background-image: linear-gradient(to bottom, #ec66ab, #e73892); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffec66ab', endColorstr='#ffe73892', GradientType=0); + border-color: #e73892 #e73892 #bc176c; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #e73892; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.icon-comment-alt:before { - content: "\f0e5"; +.control-custom.disabled .checkbox.btn:hover, +.control-custom.disabled .checkbox.btn:focus, +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active, +.control-custom.disabled .checkbox.btn.disabled, +.control-custom.disabled .checkbox.btn[disabled] { + color: #ffffff; + background-color: #e73892; + *background-color: #e42186; } -.icon-comments-alt:before { - content: "\f0e6"; +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active { + background-color: #d31979 \9; } -.icon-bolt:before { - content: "\f0e7"; +.control-custom.disabled .checkbox.btn .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.icon-sitemap:before { - content: "\f0e8"; +.alert-danger a, +.alert-error a { + color: #b55457; } -.icon-umbrella:before { - content: "\f0e9"; +.control-group.error input, +.control-group.error select, +.control-group.error textarea, +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { + border-color: #c6898b; } -.icon-paste:before { - content: "\f0ea"; +.error-inline { + color: #b55457; } -.icon-user-md:before { - content: "\f200"; +.error-block, +.error-inline { + font-size: 12px; } -.pill { - background-color: #cccccc; +.error-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + padding: 6px 8px 3px; + background: #c6898b; + margin: -3px 0 0; color: #ffffff; - padding: 1px 5px 1px 8px; - margin-right: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + width: 208px; } -.pill a { - color: #ffffff; +.control-medium .error-block { + width: 318px; } -.pill a.remove { - font-size: 11px; +.control-full .error-block { + width: auto; } -.tag { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; - position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #b509b5; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; +.control-group.error .input-prepend .error-block, +.control-custom.error .error-block { + width: auto; } -.tag:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; +.control-custom.error .error-block { + width: 401px; } -.unstyled { - margin: 0; - list-style: none; -} -.simple-item { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; -} -.simple-item:last-of-type { - border-bottom: 0; +.control-select.error .error-block { + width: 196px; } -.simple-list { - *zoom: 1; +.stages { margin: 0; list-style: none; + *zoom: 1; + color: #aeaeae; + counter-reset: stage; + margin: -20px -25px 20px; + overflow: hidden; } -.simple-list:before, -.simple-list:after { +.stages:before, +.stages:after { display: table; content: ""; + line-height: 0; } -.simple-list:after { +.stages:after { clear: both; } -.simple-list > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.stages li { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 27px; + counter-increment: stage; + width: 33.33%; + background-color: #ededed; + float: left; + padding: 10px 20px; + position: relative; + z-index: 0; } -.simple-list > li:last-of-type { - border-bottom: 0; +.stages li:before { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + content: counter(stage); + display: inline-block; + width: 27px; + height: 27px; + margin-right: 5px; + font-weight: bold; + text-align: center; + color: #ffffff; + background-color: #aeaeae; + z-index: 1; } -.simple-list .ckan-icon { - position: relative; - top: 0px; +.stages li:after { + left: 0; + border: solid rgba(237, 237, 237, 0); + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: #ededed; + border-bottom-color: #ededed; + border-width: 29px; + top: 50%; + margin-top: -29px; + margin-left: -30px; } -.module-narrow .simple-list > li { - padding-left: 15px; - padding-right: 15px; +.stages li.last { position: relative; + right: -1px; } -.listing li { - text-align: right; - margin-bottom: 5px; -} -.listing .key { - clear: right; - font-weight: bold; +.stages li.last, +.stages li.last .highlight { + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; } -.js .tab-content { - display: none; +.stages li.first:after { + content: none; + border: none; } -.js .tab-content.active { - display: block; +.stages li.active:after { + border-color: rgba(140, 198, 138, 0); + border-top-color: #8cc68a; + border-bottom-color: #8cc68a; } -.module { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - background-color: #ffffff; - margin-bottom: 20px; +.stages li.complete:after { + border-color: rgba(197, 226, 196, 0); + border-top-color: #c5e2c4; + border-bottom-color: #c5e2c4; } -.module-heading { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - font-size: 14px; - line-height: 1.3; - padding: 7px 25px; - border-bottom: 1px solid #d0d0d0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.stages.stage-3 li.complete:first-child:after { + content: none; } -.module-heading-secondary { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border-top: 1px solid #d0d0d0; +.stages li.active, +.stages li.complete { + background: none; } -.module-heading [class^=icon]:before { - font-size: 1.2em; - line-height: 1; - position: relative; - top: 1px; - margin-right: 0.1em; +.stages li.active:before { + color: #8cc68a; + background: #ffffff; } -.module-heading .action { - float: right; - color: #8c8c8c; - font-size: 11px; - text-decoration: underline; +.stages li.complete:before { + color: #c5e2c4; + background: #eef6ed; } -.module-content { - padding: 0 25px; - margin: 20px 0; +.stages li .highlight { + display: block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + padding: 10px 52px; + border: none; + text-align: left; + text-decoration: none; + line-height: 27px; + z-index: -1; } -.module-content:first-child { - margin-top: 0; - padding-top: 20px; +.stages li.active .highlight { + color: #ffffff; + background: #8cc68a; } -.module-content:last-child { - margin-bottom: 0; - padding-bottom: 20px; +.stages li.complete .highlight { + color: #eef6ed; + background: #c5e2c4; } -.module-content > :last-child { +.alert > :last-child { margin-bottom: 0; } -.module-border-top { - border-top: 1px dotted #cccccc; +.slug-preview { + font-size: 14px; + line-height: 1.5; + margin-top: 5px; + margin-left: 10px; } -.module-border-bottom { - border-bottom: 1px dotted #cccccc; +.slug-preview-value { + background-color: #faedcf; + margin-right: 3px; } -.module-footer { - padding: 7px 25px 7px; - border-top: 1px dotted #cccccc; +.resource-upload-field { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: bottom; } -.module .read-more { - font-weight: bold; - color: #000000; +.resource-upload-field label { + z-index: 0; } -.module .pagination { - height: 34px; - margin-bottom: 0; - border-top: 1px solid #d0d0d0; +.resource-upload-field input { + opacity: 0; + filter: alpha(opacity=0); + position: absolute; + top: 0; + right: 0; + z-index: 1; + margin: 0; + border: solid transparent; + border-width: 100px 0 0 200px; + cursor: pointer; + direction: ltr; + -moz-transform: translate(-300px, 0) scale(4); } -.module .pagination > ul { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0; +.resource-upload-field.loading { + display: inline-block; + background: url("../../../base/images/loading-spinner.gif") no-repeat center right; + padding-right: 5px; } -.module .pagination li a { - border-top: none; - border-bottom: none; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + font-size: 14px; } -.module .pagination li:first-child a, -.module .pagination li:last-child a { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.select2-container-multi .select2-choices .select2-search-field input { + height: 29px; } -.module .pagination li:first-child a { - border-left-width: 0; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + padding-left: 10px; } -.module .pagination li:last-child a { - border-right-width: 0; +.select2-container { + margin-top: 1px; } -.module .pagination li.active a { - border-left-width: 1px; - border-right-width: 1px; +.select2-container-multi { + margin-top: 0; } -.module .action { - text-align: center; +.select2-container-multi .select2-choices .select2-search-choice { + padding: 5px 8px 5px 22px; } -.module-shallow .module-content { - padding: 10px; - margin: 0; +.select2-container-multi.select2-container .select2-choices { + padding-top: 3px; + padding-bottom: 3px; } -.module-shallow .module-content:first-child { - padding-top: 10px; -} -.module-shallow .module-content:last-child { - padding-bottom: 10px; +.select2-search-choice-close, +.select2-container-multi .select2-search-choice-close { + top: 6px; + left: 5px; } -.module-shallow small { - font-size: 11px; - display: block; +.select2-container-multi .select2-choices { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -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); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; } -.module-narrow .module-heading, -.module-narrow .module-content, -.module-narrow .module-footer { - padding-left: 15px; - padding-right: 15px; +.select2-container-active .select2-choices, +.select2-container-multi.select2-container-active .select2-choices { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -.module-grid { - margin: 0; - list-style: none; - margin: 0; - list-style: none; - *zoom: 1; - margin-left: -20px; - padding: 0; +.select2-container-multi .select2-drop { + margin-top: -2px; } -.module-grid:before, -.module-grid:after { - display: table; - content: ""; +.select2-container .select2-results li { + line-height: 18px; + padding-top: 4px; + padding-bottom: 4px; } -.module-grid:after { - clear: both; +.control-full .select2-container { + width: 520px !important; } -.module-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; - float: left; - margin-left: 20px; - width: 460px; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 50px; - overflow: hidden; - position: relative; +.control-group.error .select2-container input:focus, +.control-group.error .select2-container select:focus, +.control-group.error .select2-container textarea:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.module-item.first { - clear: left; +.dataset-item { + border-bottom: 1px dotted #dddddd; + padding-bottom: 20px; + margin-bottom: 20px; } -.group .content img { - margin: 0 -5px 5px; - max-width: initial; +.dataset-item:last-of-type { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } -.group .content h3 { - font-size: 14px; +.dataset-heading { + font-size: 16px; + margin-top: 0; + margin-bottom: 8px; line-height: 1.3; } -.group-listing { - margin-left: -20px; +.dataset-heading a { + color: #333333; } -.ckanext-datapreview { +.dataset-heading .label { position: relative; + top: -1px; } -.ckanext-datapreview > iframe { - min-height: 400px; -} -.ckanext-datapreview > img { - max-height: 500px; - max-width: 100%; - overflow: hidden; +.dataset-private { + margin-right: 10px; + text-transform: uppercase; } -.package-info h4 { - margin-bottom: 10px; +.dataset-private .icon-lock { + width: 9px; } -.media { - position: relative; - overflow: hidden; +.dataset-private.pull-right { + margin-right: 0; } -.media-content > :last-child { - margin-bottom: 0; +.dataset-resources { + margin-top: 8px; } -.media-heading { - font-size: 14px; - line-height: 1.3em; - margin: 5px 0; +.dataset-resources li { + display: inline; } -.media-image, -.media .gravatar { - position: relative; - float: left; - margin-right: 10px; - overflow: hidden; +.dataset-resources li a { + background-color: #aaaaaa; } -.media-image:after { - -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - content: ""; - position: absolute; +.dataset-heading .popular { top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1; } -.media-image img { - display: block; - margin: 0 auto; -} -.media-vertical .media-image, -.media-vertical .media-content { - float: none; - display: block; -} -.media-vertical .media-image { - margin-right: 0; - max-height: 125px; -} -.media-grid, -ul.media-grid, -ol.media-grid { +.resource-list { margin: 0; list-style: none; - *zoom: 1; - margin-left: -20px; + margin: -10px -10px 10px -10px; } -.media-grid:before, -ul.media-grid:before, -ol.media-grid:before, -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - display: table; - content: ""; +.resource-item { + position: relative; + padding: 10px 10px 10px 60px; + margin-bottom: 0px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - clear: both; +.resource-item:hover { + background-color: #eeeeee; } -.media-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; +.resource-item .heading { + color: #000000; + font-size: 14px; + font-weight: bold; } -.media-item.first { - clear: left; +.resource-item .format-label { + position: absolute; + top: 10px; + left: 10px; } -.media-item .media-content { - min-height: 63px; +.resource-item .description { + font-size: 12px; + margin-bottom: 0; } -.related-item.expanded { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #ffffff; - background-color: rgba(255, 255, 255, 0.9); - z-index: 2; +.resource-item .btn-group { + position: absolute; + top: 14px; + right: 10px; } -.media-wide { - padding: 0; +.dataset-resource-form .dataset-form-resource-types { + margin-bottom: 5px; } -.media-wide .media { - float: left; - margin-left: 20px; - width: 460px; +.dataset-form-resource-types .ckan-icon { + position: relative; + top: 3px; } -.media-overlay { +.dataset-form-resource-types .radio { + font-weight: normal; + padding-left: 0; + padding-right: 18px; +} +.dataset-form-resource-types label { position: relative; - min-height: 35px; } -.media-overlay .media-heading { +.dataset-form-resource-types input[type=radio]:checked + label { + font-weight: bold; +} +.dataset-form-resource-types input[type=radio]:checked + label:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 16px; + height: 16px; + background-position: -192px 0; + display: block; + content: ""; position: absolute; + top: auto; left: 0; - right: 0; - bottom: 0; - padding: 12px 10px; + bottom: -12px; +} +.dataset-form-resource-types input[type=radio] { + display: none; +} +.tag-list { margin: 0; - background-color: #000; - background-color: rgba(0, 0, 0, 0.8); - font-size: 13px; - color: #fff; - z-index: 1; + list-style: none; + padding: 10px 10px 5px 10px; } -.media-overlay .media-image { - float: none; - display: block; +.tag-list li { + display: inline-block; + margin-right: 5px; +} +.tag-list li:last-child { margin-right: 0; } -.banner { - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-transform-origin: center center; - -moz-transform-origin: center center; - -ms-transform-origin: center center; - -o-transform-origin: center center; - transform-origin: center center; - position: absolute; - top: 15px; - right: -35px; - width: 80px; - color: #ffffff; - background: #707070; - padding: 1px 20px; - font-size: 11px; - text-align: center; - text-transform: uppercase; +.additional-info td, +.additional-info th { + width: 50%; } -.nav-simple { - *zoom: 1; - margin: 0; - list-style: none; - padding-bottom: 0; +.label[data-format=html], +.label[data-format*=html] { + background-color: #55a1ce; } -.nav-simple:before, -.nav-simple:after { - display: table; - content: ""; +.label[data-format=json], +.label[data-format*=json] { + background-color: #ef7100; } -.nav-simple:after { - clear: both; +.label[data-format=xml], +.label[data-format*=xml] { + background-color: #ef7100; } -.nav-simple > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.label[data-format=text], +.label[data-format*=text] { + background-color: #74cbec; } -.nav-simple > li:last-of-type { - border-bottom: 0; +.label[data-format=csv], +.label[data-format*=csv] { + background-color: #dfb100; } -.nav-simple .ckan-icon { - position: relative; - top: 0px; +.label[data-format=xls], +.label[data-format*=xls] { + background-color: #2db55d; } -.nav-item > a { - color: #333333; - margin: -7px -25px; - padding: 7px 25px; +.label[data-format=zip], +.label[data-format*=zip] { + background-color: #686868; } -.nav-item.active { - background-color: #f2f2f2; +.label[data-format=api], +.label[data-format*=api] { + background-color: #ec96be; } -.nav-item.active > a span { - white-space: nowrap; - overflow: hidden; - display: block; +.label[data-format=pdf], +.label[data-format*=pdf] { + background-color: #e0051e; +} +.label[data-format=rdf], +.label[data-format*=rdf], +.label[data-format*=nquad], +.label[data-format*=ntriples], +.label[data-format*=turtle] { + background-color: #0b4498; } -.nav-item.active > a { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #b509b5; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; + margin-bottom: 20px; +} +.search-form .search-input input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; - font-size: 12px; - font-weight: bold; - position: relative; - left: 4px; - margin-left: -25px; - margin-right: -20px; - padding-left: 10px; - padding-right: 0px; - padding: 1px 22px; + margin: 0; + width: 100%; + height: auto; } -.nav-item.active > a:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; +.search-form .search-input button { + cursor: pointer; display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; } -.nav-item [class^=icon] { - font-size: 1.2em; - margin: -1px 0 -1px -1px; +.search-form .search-input button span { + display: none; } -.module-narrow .nav-item > a { - padding-left: 15px; - padding-right: 15px; - position: relative; +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; } -.module-narrow .nav-item.active > a { - padding-left: 12px; - padding-right: 12px; +.search-form .search-input button:hover i { + color: #000000; } -.module-narrow .nav-item.image { - position: relative; +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; } -.module-narrow .nav-item.image > a { - padding-left: 42px; - padding-right: 42px; +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; } -.module-narrow .nav-item.image > img { - position: absolute; - top: 50%; - left: 15px; - width: 20px; - height: 20px; - margin-top: -10px; - z-index: 2; +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; } -.nav-facet .nav-item > a:hover:after, -.nav-facet .nav-item.active > a:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - content: ""; - position: absolute; - top: 50%; - right: 5px; - margin-top: -8px; +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; } -.nav-facet .nav-item > a:hover:after:last-child, -.nav-facet .nav-item.active > a:after:last-child { - *margin-left: 0; +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; } -.nav-facet .nav-item > a:hover:after { - width: 17px; - height: 17px; - background-position: -17px -16px; +.search-form .control-order-by select { + width: 160px; + margin: 0; } -.nav-facet .nav-item.active > a:after { - width: 17px; - height: 17px; - background-position: 0px -16px; - right: 3px; +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; } -.js .js-hide { - display: none; +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; } -.js .js-hide.active { +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { display: block; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; } -.btn, -label { - font-weight: bold; +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; } -label { - cursor: pointer; - font-size: 14px; - line-height: 2; +.tertiary .search-input { + margin-bottom: 10px; } -label:after { - content: ":"; +.group .media-vertical .image { + margin: 0 -5px 5px; } -label.radio:after, -label.checkbox:after { - content: ""; +.group-list:nth-child(odd) { + clear: left; } -input, -textarea, -select, -.uneditable-input { - font-size: 14px; - padding: 8px 10px; +.group-list .module-heading { + padding-top: 15px; + padding-bottom: 15px; } -input[type=radio], -input[type=checkbox] { - position: relative; - top: 7px; - padding: 0; - margin: 0; +.group-list .dataset-content { + min-height: 54px; } -input[type=radio].checkbox-onown, -input[type=checkbox].checkbox-onown { - top: 0; +.group-list .module-heading h3 { + margin-bottom: 2px; } -select { - margin-top: 6px; - padding: 4px; +.group-list .module-heading h3 a { + color: #333333; } -textarea { - max-width: 100%; +.group-list .module-heading .media-image { + overflow: hidden; + max-height: 60px; } -.input-prepend .add-on { - padding: 8px 8px; - font-size: 14px; +.group-list .module-heading .media-image img { + max-width: 85px; } -.control-group .btn { +.toolbar { + *zoom: 1; position: relative; - top: -2px; + margin-bottom: 10px; + padding: 5px 0; } -.control-full input, -.control-full select, -.control-full textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - height: auto; - width: 100%; +.toolbar:before, +.toolbar:after { + display: table; + content: ""; + line-height: 0; } -.control-medium input, -.control-medium select, -.control-medium textarea { - width: 320px; +.toolbar:after { + clear: both; } -.control-large input, -.control-large .control-label { - font-size: 18px; +.page_primary_action { + margin-bottom: 20px; } -.form-actions { - background: none; - margin-left: -25px; - margin-right: -25px; - margin-bottom: 0; - padding-bottom: 0; - text-align: right; -} -.form-actions .action-info { +.toolbar .breadcrumb { + *zoom: 1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + position: relative; float: left; - width: 50%; - line-height: 2; - text-align: left; - color: #707070; margin: 0; + padding: 0; + border: none; + background: none; + font-size: 20px; + line-height: 1.3; } -.form-actions .action-info.small { - font-size: 11px; - line-height: 1.2; +.toolbar .breadcrumb:before, +.toolbar .breadcrumb:after { + display: table; + content: ""; + line-height: 0; } -.form-horizontal .control-label { - width: 120px; - line-height: 1.3; - padding-top: 9px; +.toolbar .breadcrumb:after { + clear: both; } -.form-horizontal .control-large input, -.form-horizontal .control-large .control-label { - font-size: 18px; - line-height: 2; +.toolbar .breadcrumb li:after { + content: " / "; } -.form-horizontal .control-large .control-label { - padding-top: 10px; +.toolbar .breadcrumb li.active:after { + content: ""; } -.form-horizontal .controls { - margin-left: 130px; +.toolbar .breadcrumb li:last-of-type:after { + content: ""; } -.form-horizontal .info-block { - position: relative; - display: block; - font-size: 11px; - color: #aeaeae; - line-height: 1.3; - padding: 6px 0 6px 25px; - margin-top: 6px; +.toolbar .home a { + text-decoration: none; } -.form-horizontal .info-inline { - float: right; - width: 265px; - margin-top: 0; +.toolbar .home span { + display: none; } -.form-horizontal .control-medium .info-block.info-inline { - width: 165px; +.toolbar .breadcrumb a { + color: #505050; } -.form-horizontal .info-block:before { - font-size: 2.2em; +.toolbar .breadcrumb .active a, +.toolbar .breadcrumb a.active { + font-weight: bold; +} +.actions { + margin: 0; + list-style: none; position: absolute; - left: 0; - top: 2px; + top: 10px; + right: 10px; + z-index: 1; } -.form-horizontal .info-inline:before { - top: 8px; +.actions li { + display: inline-block; + margin-right: 5px; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } -.info-block .icon-large, -.info-inline .icon-large { +.actions li:last-of-type { + margin-right: 0; +} +.hide-heading { + display: none; +} +.page-header { + *zoom: 1; + border-bottom: 1px solid #dddddd; + background-color: #f6f6f6; + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; +} +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} +.page-header .nav-tabs { float: left; - font-size: 22px; - margin-right: 15px; + margin-bottom: -1px; } -.form-horizontal .info-block a { - color: #aeaeae; - text-decoration: underline; +.page-header .nav-tabs li.active a, +.page-header .nav-tabs a:hover { + background-color: #ffffff; } -.form-horizontal .form-actions { - padding-left: 25px; - padding-right: 25px; +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; } -.form-inline input { - padding-bottom: 9px; +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.form-inline select { - margin-top: 0; +h1 { + font-size: 28px; } -.form-inline .btn { - margin-left: 5px; +h2 { + font-size: 21px; } -.form-narrow label { - margin-bottom: 0; +h3 { + font-size: 18px; } -.form-narrow select { - width: 100%; +h4 { + font-size: 14px; } -.form-narrow .form-actions { - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px 0; +h1, +h2, +h3, +h4 { + line-height: 1.5; } -.form-select label { - margin-right: 5px; +h1 small, +h2 small, +h3 small, +h4 small { + font-size: 14px; } -.simple-input label, -.simple-input button { - display: none; +.prose h1, +.prose heading-1 h2, +.prose heading-2 { + margin-bottom: 15px; } -.simple-input .field { - position: relative; +.prose h3, +.prose heading-3 { + margin-bottom: 10px; } -.simple-input .field-bordered { - border-bottom: 1px dotted #cccccc; +.table-chunky td, +.table-chunky th { + padding: 12px 15px; + font-size: 12px; } -.simple-input .field input { - width: 100%; - height: auto; - margin: 0 -7px; - padding: 7px 5px; +.table-chunky thead th, +.table-chunky thead td { + color: #ffffff; + background-color: #aaaaaa; + padding-top: 10px; + padding-bottom: 10px; } -.simple-input .field .btn-search { +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { + background-color: transparent; +} +.table-striped tbody tr:nth-child(even) td, +.table-striped tbody tr:nth-child(even) th { + background-color: #f2f2f2; +} +.table-chunky.table-bordered { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topleft: 2px; + border-top-left-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topright: 2px; + border-top-right-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 2px; + -moz-border-radius: 0 0 0 2px; + border-radius: 0 0 0 2px; + -webkit-border-bottom-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + border-bottom-left-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + border-bottom-right-radius: 2px; +} +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.ckan-icon { *margin-right: .3em; display: inline-block; vertical-align: text-bottom; @@ -5209,1524 +6647,1336 @@ textarea { background-image: url("../../../base/images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; - width: 17px; - height: 17px; - background-position: -51px -16px; - position: absolute; - display: block; - height: 17px; - width: 17px; - top: 50%; - right: 0; - margin-top: -8px; - background-color: transparent; - border: none; - text-indent: -999em; } -.simple-input .field .btn-search:last-child { - *margin-left: 0; +.ckan-icon-fb { + width: 16px; + height: 16px; + background-position: 0px 0; } -.editor textarea { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: none; +.ckan-icon-gplus { + width: 16px; + height: 16px; + background-position: -16px 0; } -.editor .editor-info-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - float: none; - padding: 4px 10px; - background: #ebebeb; +.ckan-icon-twitter { + width: 16px; + height: 16px; + background-position: -32px 0; +} +.ckan-icon-email { + width: 16px; + height: 16px; + background-position: -48px 0; +} +.ckan-icon-share { + width: 16px; + height: 16px; + background-position: -64px 0; +} +.ckan-icon-feed { + width: 16px; + height: 16px; + background-position: -80px 0; +} +.ckan-icon-calendar { + width: 16px; + height: 16px; + background-position: -96px 0; +} +.ckan-icon-file { + width: 16px; + height: 16px; + background-position: -112px 0; +} +.ckan-icon-lock { + width: 16px; + height: 16px; + background-position: -128px 0; +} +.ckan-icon-link-file { + width: 16px; + height: 16px; + background-position: -144px 0; +} +.ckan-icon-link-plugin { + width: 16px; + height: 16px; + background-position: -160px 0; +} +.ckan-icon-upload-file { + width: 16px; + height: 16px; + background-position: -176px 0; +} +.ckan-icon-callout { + width: 16px; + height: 16px; + background-position: -192px 0; +} +.ckan-icon-circle-cross { + width: 17px; + height: 17px; + background-position: 0px -16px; +} +.ckan-icon-circle-add { + width: 17px; + height: 17px; + background-position: -17px -16px; +} +.ckan-icon-flame { + width: 17px; + height: 17px; + background-position: -34px -16px; +} +.ckan-icon-search { + width: 17px; + height: 17px; + background-position: -51px -16px; +} +.ckan-icon-large-lock { + width: 20px; + height: 20px; + background-position: 0px -33px; +} +.ckan-icon-photo { + width: 20px; + height: 20px; + background-position: -20px -33px; +} +.ckan-icon-add { + width: 20px; + height: 20px; + background-position: -40px -33px; +} +.ckan-icon-home { + width: 20px; + height: 20px; + background-position: -60px -33px; +} +.ckan-icon-rewind { + width: 20px; + height: 20px; + background-position: -80px -33px; +} +.ckan-icon-tools { + width: 20px; + height: 20px; + background-position: -100px -33px; +} +.ckan-icon-flag { + width: 20px; + height: 20px; + background-position: -120px -33px; +} +.ckan-icon-clipboard { + width: 20px; + height: 20px; + background-position: -140px -33px; +} +.ckan-icon-share { + width: 20px; + height: 20px; + background-position: -160px -33px; +} +.ckan-icon-info { + width: 20px; + height: 20px; + background-position: -180px -33px; +} +.ckan-icon-download { + width: 20px; + height: 20px; + background-position: -200px -33px; +} +.ckan-icon-star { + width: 20px; + height: 20px; + background-position: -220px -33px; +} +.ckan-icon-info-flat { + width: 20px; + height: 20px; + background-position: -240px -33px; +} +.ckan-icon-tag { + width: 20px; + height: 20px; + background-position: -260px -33px; +} +.ckan-icon-plus { + width: 20px; + height: 20px; + background-position: -280px -33px; + width: 16px; +} +.ckan-icon-head { + width: 20px; + height: 20px; + background-position: -300px -33px; +} +.ckan-icon-arrow-e { + width: 20px; + height: 20px; + background-position: -320px -33px; + width: 16px; +} +.ckan-icon-bookmark { + width: 25px; + height: 25px; + background-position: 0px -53px; +} +.format-label { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + text-indent: -900em; + background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +} +.format-label { + width: 32px; + height: 35px; + background-position: 0px -62px; +} +.format-label[data-format=rdf], +.format-label[data-format*=rdf] { + width: 32px; + height: 35px; + background-position: -32px -62px; +} +.format-label[data-format=pdf], +.format-label[data-format*=pdf] { + width: 32px; + height: 35px; + background-position: -64px -62px; +} +.format-label[data-format=api], +.format-label[data-format*=api] { + width: 32px; + height: 35px; + background-position: -96px -62px; +} +.format-label[data-format=zip], +.format-label[data-format*=zip] { + width: 32px; + height: 35px; + background-position: -128px -62px; +} +.format-label[data-format=xls], +.format-label[data-format*=xls] { + width: 32px; + height: 35px; + background-position: -160px -62px; +} +.format-label[data-format=csv], +.format-label[data-format*=csv] { + width: 32px; + height: 35px; + background-position: -192px -62px; +} +.format-label[data-format=txt], +.format-label[data-format*=txt] { + width: 32px; + height: 35px; + background-position: -224px -62px; +} +.format-label[data-format=xml], +.format-label[data-format*=xml] { + width: 32px; + height: 35px; + background-position: -256px -62px; +} +.format-label[data-format=json], +.format-label[data-format*=json] { + width: 32px; + height: 35px; + background-position: -288px -62px; +} +.format-label[data-format=html], +.format-label[data-format*=html] { + width: 32px; + height: 35px; + background-position: -320px -62px; +} +/* This is a modified version of the font-awesome core less document. */ +@font-face { + font-family: 'FontAwesome'; + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + font-weight: normal; + font-style: normal; +} +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + display: inline; width: auto; - border: 1px solid #cccccc; - border-top: none; - font-size: 11px; - color: #282828; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; } -.editor .editor-info-block a { - color: #b509b5; - text-decoration: none; +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } -.control-custom { - font-size: 0; +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } -.control-custom label { - margin-bottom: 0; +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } -.control-custom input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - width: 140px; +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } } -.control-custom input:last-of-type { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } } -.control-custom .checkbox { - display: inline-block; - margin-left: 5px; +@-moz-document url-prefix() { + .icon-spin { + height: .9em; + } + .btn .icon-spin { + height: auto; + } + .icon-spin.icon-large { + height: 1.25em; + } + .btn .icon-spin.icon-large { + height: .75em; + } } -.control-custom .checkbox input { - width: auto; +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; } -.control-custom.disabled label, -.control-custom.disabled input { - color: #aaaaaa; - text-decoration: line-through; - text-shadow: none; +.icon-music:before { + content: "\f001"; } -.control-custom.disabled input { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #f3f3f3; +.icon-search:before { + content: "\f002"; } -.control-custom.disabled .checkbox { - color: #4d4d4d; - text-decoration: none; +.icon-envelope:before { + content: "\f003"; } -.control-custom .checkbox.btn { - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - position: relative; - top: 0; - left: 5px; - height: 3px; - width: 8px; - padding: 3px 8px; +.icon-heart:before { + content: "\f004"; } -.control-custom .checkbox.btn span { - display: none; - width: 30px; +.icon-star:before { + content: "\f005"; } -.control-custom .checkbox.btn:before { - position: relative; - top: 1px; - left: -1px; - color: #fff; +.icon-star-empty:before { + content: "\f006"; } -.control-custom .checkbox.btn input { - display: none; +.icon-user:before { + content: "\f007"; } -.control-custom.disabled .checkbox.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f654f6; - background-image: -moz-linear-gradient(top, #f544f5, #f76bf7); - background-image: -ms-linear-gradient(top, #f544f5, #f76bf7); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f544f5), to(#f76bf7)); - background-image: -webkit-linear-gradient(top, #f544f5, #f76bf7); - background-image: -o-linear-gradient(top, #f544f5, #f76bf7); - background-image: linear-gradient(top, #f544f5, #f76bf7); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f544f5', endColorstr='#f76bf7', GradientType=0); - border-color: #f76bf7 #f76bf7 #f322f3; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76bf7; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-film:before { + content: "\f008"; } -.control-custom.disabled .checkbox.btn:hover, -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active, -.control-custom.disabled .checkbox.btn.disabled, -.control-custom.disabled .checkbox.btn[disabled] { - background-color: #f76bf7; - *background-color: #f653f6; +.icon-th-large:before { + content: "\f009"; } -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active { - background-color: #f43bf4 \9; +.icon-th:before { + content: "\f00a"; } -.control-custom.disabled .checkbox.btn .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-th-list:before { + content: "\f00b"; } -.alert-danger a, -.alert-error a { - color: #b55457; +.icon-ok:before { + content: "\f00c"; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea, -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - border-color: #c6898b; +.icon-remove:before { + content: "\f00d"; } -.error-inline { - color: #b55457; +.icon-zoom-in:before { + content: "\f00e"; } -.error-block, -.error-inline { - font-size: 12px; +.icon-zoom-out:before { + content: "\f010"; } -.error-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - padding: 6px 8px 3px; - background: #c6898b; - margin: -3px 0 0; - color: #ffffff; - width: 216px; +.icon-off:before { + content: "\f011"; } -.control-medium .error-block { - width: 326px; +.icon-signal:before { + content: "\f012"; } -.control-full .error-block { - width: auto; +.icon-cog:before { + content: "\f013"; } -.control-group.error .input-prepend .error-block, -.control-custom.error .error-block { - margin-left: -1px; - width: auto; +.icon-trash:before { + content: "\f014"; } -.control-custom.error .error-block { - width: 409px; +.icon-home:before { + content: "\f015"; } -.control-select.error .error-block { - width: 204px; +.icon-file:before { + content: "\f016"; } -.stages { - margin: 0; - list-style: none; - *zoom: 1; - color: #aeaeae; - counter-reset: stage; - margin: -20px -25px 20px; - overflow: hidden; +.icon-time:before { + content: "\f017"; } -.stages:before, -.stages:after { - display: table; - content: ""; +.icon-road:before { + content: "\f018"; } -.stages:after { - clear: both; +.icon-download-alt:before { + content: "\f019"; } -.stages li { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - line-height: 27px; - counter-increment: stage; - width: 33.33%; - background-color: #ededed; - float: left; - padding: 10px 20px; - position: relative; - z-index: 0; +.icon-download:before { + content: "\f01a"; } -.stages li:before { - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; - content: counter(stage); - display: inline-block; - width: 27px; - height: 27px; - margin-right: 5px; - font-weight: bold; - text-align: center; - color: #ffffff; - background-color: #aeaeae; - z-index: 1; +.icon-upload:before { + content: "\f01b"; +} +.icon-inbox:before { + content: "\f01c"; +} +.icon-play-circle:before { + content: "\f01d"; +} +.icon-repeat:before { + content: "\f01e"; +} +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; +} +.icon-list-alt:before { + content: "\f022"; +} +.icon-lock:before { + content: "\f023"; +} +.icon-flag:before { + content: "\f024"; +} +.icon-headphones:before { + content: "\f025"; +} +.icon-volume-off:before { + content: "\f026"; +} +.icon-volume-down:before { + content: "\f027"; +} +.icon-volume-up:before { + content: "\f028"; +} +.icon-qrcode:before { + content: "\f029"; +} +.icon-barcode:before { + content: "\f02a"; } -.stages li:after { - left: 0; - border: solid rgba(237, 237, 237, 0); - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #ededed; - border-bottom-color: #ededed; - border-width: 29px; - top: 50%; - margin-top: -29px; - margin-left: -30px; +.icon-tag:before { + content: "\f02b"; } -.stages li.first, -.stages li.first .highlight { - -webkit-border-radius: 3px 0 0 0; - -moz-border-radius: 3px 0 0 0; - border-radius: 3px 0 0 0; +.icon-tags:before { + content: "\f02c"; } -.stages li.last { - position: relative; - right: -1px; +.icon-book:before { + content: "\f02d"; } -.stages li.last, -.stages li.last .highlight { - -webkit-border-radius: 0 3px 0 0; - -moz-border-radius: 0 3px 0 0; - border-radius: 0 3px 0 0; +.icon-bookmark:before { + content: "\f02e"; } -.stages li.first:after { - content: none; - border: none; +.icon-print:before { + content: "\f02f"; } -.stages li.active:after { - border-color: rgba(140, 198, 138, 0); - border-top-color: #8cc68a; - border-bottom-color: #8cc68a; +.icon-camera:before { + content: "\f030"; } -.stages li.complete:after { - border-color: rgba(197, 226, 196, 0); - border-top-color: #c5e2c4; - border-bottom-color: #c5e2c4; +.icon-font:before { + content: "\f031"; } -.stages.stage-3 li.complete:first-child:after { - content: none; +.icon-bold:before { + content: "\f032"; } -.stages li.active, -.stages li.complete { - background: none; +.icon-italic:before { + content: "\f033"; } -.stages li.active:before { - color: #8cc68a; - background: #ffffff; +.icon-text-height:before { + content: "\f034"; } -.stages li.complete:before { - color: #c5e2c4; - background: #eef6ed; +.icon-text-width:before { + content: "\f035"; } -.stages li .highlight { - display: block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - padding: 10px 52px; - border: none; - text-align: left; - text-decoration: none; - line-height: 27px; - z-index: -1; +.icon-align-left:before { + content: "\f036"; } -.stages li.active .highlight { - color: #ffffff; - background: #8cc68a; +.icon-align-center:before { + content: "\f037"; } -.stages li.complete .highlight { - color: #eef6ed; - background: #c5e2c4; +.icon-align-right:before { + content: "\f038"; } -.alert > :last-child { - margin-bottom: 0; +.icon-align-justify:before { + content: "\f039"; } -.slug-preview { - font-size: 14px; - line-height: 1.5; - margin-top: 5px; - margin-left: 10px; +.icon-list:before { + content: "\f03a"; } -.slug-preview-value { - background-color: #faedcf; - margin-right: 3px; +.icon-indent-left:before { + content: "\f03b"; } -.slug-preview .btn { - padding-top: 3px; - padding-bottom: 3px; +.icon-indent-right:before { + content: "\f03c"; } -.resource-upload-field { - position: relative; - overflow: hidden; - display: inline-block; - vertical-align: bottom; +.icon-facetime-video:before { + content: "\f03d"; } -.resource-upload-field label { - z-index: 0; +.icon-picture:before { + content: "\f03e"; } -.resource-upload-field input { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - right: 0; - z-index: 1; - margin: 0; - border: solid transparent; - border-width: 100px 0 0 200px; - cursor: pointer; - direction: ltr; - -moz-transform: translate(-300px, 0) scale(4); +.icon-pencil:before { + content: "\f040"; } -.resource-upload-field.loading { - display: inline-block; - background: url("../../../base/images/loading-spinner.gif") no-repeat center right; - padding-right: 5px; +.icon-map-marker:before { + content: "\f041"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - font-size: 14px; +.icon-adjust:before { + content: "\f042"; } -.select2-container-multi .select2-choices .select2-search-field input { - height: 29px; +.icon-tint:before { + content: "\f043"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - padding-left: 10px; +.icon-edit:before { + content: "\f044"; } -.select2-container { - margin-top: 5px; +.icon-share:before { + content: "\f045"; } -.select2-container-multi { - margin-top: 0; +.icon-check:before { + content: "\f046"; } -.select2-container-multi .select2-choices .select2-search-choice { - padding: 5px 8px 5px 22px; +.icon-move:before { + content: "\f047"; } -.select2-container-multi.select2-container .select2-choices { - padding-top: 3px; - padding-bottom: 3px; +.icon-step-backward:before { + content: "\f048"; } -.select2-search-choice-close, -.select2-container-multi .select2-search-choice-close { - top: 6px; - left: 5px; +.icon-fast-backward:before { + content: "\f049"; } -.select2-container-multi .select2-choices { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - background-color: #ffffff; - border: 1px solid #cccccc; +.icon-backward:before { + content: "\f04a"; } -.select2-container-active .select2-choices, -.select2-container-multi.select2-container-active .select2-choices { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +.icon-play:before { + content: "\f04b"; } -.select2-container-multi .select2-drop { - margin-top: -2px; +.icon-pause:before { + content: "\f04c"; } -.select2-container .select2-results li { - line-height: 18px; - padding-top: 4px; - padding-bottom: 4px; +.icon-stop:before { + content: "\f04d"; } -.control-full .select2-container { - width: 520px !important; +.icon-forward:before { + content: "\f04e"; } -.dataset-item { - border-bottom: 1px dotted #cccccc; - padding-bottom: 20px; - margin-bottom: 20px; +.icon-fast-forward:before { + content: "\f050"; } -.dataset-item:last-of-type { - border-bottom: none; - margin-bottom: 0; - padding-bottom: 0; +.icon-step-forward:before { + content: "\f051"; } -.dataset-heading { - font-size: 14px; - line-height: 1.3; +.icon-eject:before { + content: "\f052"; } -.dataset-heading a { - color: #333333; +.icon-chevron-left:before { + content: "\f053"; +} +.icon-chevron-right:before { + content: "\f054"; +} +.icon-plus-sign:before { + content: "\f055"; +} +.icon-minus-sign:before { + content: "\f056"; +} +.icon-remove-sign:before { + content: "\f057"; } -.dataset-heading .label { - position: relative; - top: -1px; +.icon-ok-sign:before { + content: "\f058"; } -.dataset-content { - font-size: 12px; +.icon-question-sign:before { + content: "\f059"; } -.dataset-resources { - font-size: 10px; - line-height: 14px; - margin-top: 5px; +.icon-info-sign:before { + content: "\f05a"; } -.dataset-resources li { - display: inline; +.icon-screenshot:before { + content: "\f05b"; } -.dataset-resources li a { - background-color: #aaaaaa; +.icon-remove-circle:before { + content: "\f05c"; } -.dataset-heading .popular { - top: 0; +.icon-ok-circle:before { + content: "\f05d"; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #cccccc; +.icon-ban-circle:before { + content: "\f05e"; } -.results strong { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; +.icon-arrow-left:before { + content: "\f060"; } -.results strong:before { - float: right; - content: " "; - width: 280px; - white-space: pre; +.icon-arrow-right:before { + content: "\f061"; } -.filter-list { - color: #4d4d4d; - font-weight: bold; +.icon-arrow-up:before { + content: "\f062"; } -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; +.icon-arrow-down:before { + content: "\f063"; } -.dataset-search { - position: relative; +.icon-share-alt:before { + content: "\f064"; } -.search-giant { - position: relative; +.icon-resize-full:before { + content: "\f065"; } -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; +.icon-resize-small:before { + content: "\f066"; } -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; +.icon-plus:before { + content: "\f067"; } -.control-order-by { - position: absolute; - bottom: -65px; - right: 0; +.icon-minus:before { + content: "\f068"; } -.control-order-by label, -.control-order-by select { - display: inline; +.icon-asterisk:before { + content: "\f069"; } -.control-order-by select { - width: 160px; +.icon-exclamation-sign:before { + content: "\f06a"; } -.resource-list { - margin: 0; - list-style: none; - margin: -10px -10px 10px -10px; +.icon-gift:before { + content: "\f06b"; } -.resource-item { - position: relative; - padding: 10px 110px 10px 60px; - margin-bottom: 0px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-leaf:before { + content: "\f06c"; } -.resource-item:hover { - background-color: #efefef; +.icon-fire:before { + content: "\f06d"; } -.resource-item .heading { - color: #000000; - font-size: 14px; - font-weight: bold; +.icon-eye-open:before { + content: "\f06e"; } -.resource-item .format-label { - position: absolute; - top: 10px; - left: 10px; +.icon-eye-close:before { + content: "\f070"; } -.resource-item .description { - font-size: 12px; - margin-bottom: 0; +.icon-warning-sign:before { + content: "\f071"; } -.resource-item .btn-group { - position: absolute; - top: 13px; - right: 10px; +.icon-plane:before { + content: "\f072"; } -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; +.icon-calendar:before { + content: "\f073"; } -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; +.icon-random:before { + content: "\f074"; } -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; +.icon-comment:before { + content: "\f075"; } -.dataset-form-resource-types label { - position: relative; +.icon-magnet:before { + content: "\f076"; } -.dataset-form-resource-types input[type=radio]:checked + label { - font-weight: bold; +.icon-chevron-up:before { + content: "\f077"; } -.dataset-form-resource-types input[type=radio]:checked + label:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 16px; - height: 16px; - background-position: -192px 0; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; +.icon-chevron-down:before { + content: "\f078"; } -.dataset-form-resource-types input[type=radio]:checked + label:after:last-child { - *margin-left: 0; +.icon-retweet:before { + content: "\f079"; } -.dataset-form-resource-types input[type=radio] { - display: none; +.icon-shopping-cart:before { + content: "\f07a"; } -.tag-list { - margin: 0; - list-style: none; - padding: 10px; +.icon-folder-close:before { + content: "\f07b"; } -.tag-list li { - display: inline-block; - margin-right: 5px; +.icon-folder-open:before { + content: "\f07c"; } -.tag-list li:last-child { - margin-right: 0; +.icon-resize-vertical:before { + content: "\f07d"; } -.additional-info td, -.additional-info th { - width: 50%; +.icon-resize-horizontal:before { + content: "\f07e"; } -.label[data-format=html], -.label[data-format*=html] { - background-color: #55a1ce; +.icon-bar-chart:before { + content: "\f080"; } -.label[data-format=json], -.label[data-format*=json] { - background-color: #ef7100; +.icon-twitter-sign:before { + content: "\f081"; } -.label[data-format=xml], -.label[data-format*=xml] { - background-color: #ef7100; +.icon-facebook-sign:before { + content: "\f082"; } -.label[data-format=text], -.label[data-format*=text] { - background-color: #74cbec; +.icon-camera-retro:before { + content: "\f083"; } -.label[data-format=csv], -.label[data-format*=csv] { - background-color: #dfb100; +.icon-key:before { + content: "\f084"; } -.label[data-format=xls], -.label[data-format*=xls] { - background-color: #2db55d; +.icon-cogs:before { + content: "\f085"; } -.label[data-format=zip], -.label[data-format*=zip] { - background-color: #686868; +.icon-comments:before { + content: "\f086"; } -.label[data-format=api], -.label[data-format*=api] { - background-color: #ec96be; +.icon-thumbs-up:before { + content: "\f087"; } -.label[data-format=pdf], -.label[data-format*=pdf] { - background-color: #e0051e; +.icon-thumbs-down:before { + content: "\f088"; } -.label[data-format=rdf], -.label[data-format*=rdf], -.label[data-format*=nquad], -.label[data-format*=ntriples], -.label[data-format*=turtle] { - background-color: #0b4498; +.icon-star-half:before { + content: "\f089"; } -.group .media-vertical .image { - margin: 0 -5px 5px; +.icon-heart-empty:before { + content: "\f08a"; } -.group-list:nth-child(odd) { - clear: left; +.icon-signout:before { + content: "\f08b"; } -.group-list .module-heading { - padding-top: 15px; - padding-bottom: 15px; +.icon-linkedin-sign:before { + content: "\f08c"; } -.group-list .dataset-content { - min-height: 54px; +.icon-pushpin:before { + content: "\f08d"; } -.group-list .module-heading h3 { - margin-bottom: 2px; +.icon-external-link:before { + content: "\f08e"; } -.group-list .module-heading h3 a { - color: #333333; +.icon-signin:before { + content: "\f090"; } -.toolbar { - *zoom: 1; - margin-top: -10px; - margin-bottom: 10px; - padding: 5px 0; +.icon-trophy:before { + content: "\f091"; } -.toolbar:before, -.toolbar:after { - display: table; - content: ""; +.icon-github-sign:before { + content: "\f092"; } -.toolbar:after { - clear: both; +.icon-upload-alt:before { + content: "\f093"; } -.toolbar .breadcrumb { - *zoom: 1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - position: relative; - float: left; - margin: 0; - padding: 0; - border: none; - background: none; - font-size: 20px; +.icon-lemon:before { + content: "\f094"; } -.toolbar .breadcrumb:before, -.toolbar .breadcrumb:after { - display: table; - content: ""; +.icon-phone:before { + content: "\f095"; } -.toolbar .breadcrumb:after { - clear: both; +.icon-check-empty:before { + content: "\f096"; } -.toolbar li [class^=icon]:before { - width: auto; +.icon-bookmark-empty:before { + content: "\f097"; } -.toolbar .breadcrumb li:after { - content: " / "; +.icon-phone-sign:before { + content: "\f098"; } -.toolbar .breadcrumb li.active:after { - content: ""; +.icon-twitter:before { + content: "\f099"; } -.toolbar .breadcrumb li:last-of-type:after { - content: ""; +.icon-facebook:before { + content: "\f09a"; } -.toolbar .home a { - text-decoration: none; +.icon-github:before { + content: "\f09b"; } -.toolbar .home span { - display: none; +.icon-unlock:before { + content: "\f09c"; } -.toolbar .breadcrumb a { - color: #505050; - line-height: 28px; +.icon-credit-card:before { + content: "\f09d"; } -.toolbar .breadcrumb .active a { - font-weight: bold; +.icon-rss:before { + content: "\f09e"; } -.toolbar .actions { - margin: 0; - list-style: none; +.icon-hdd:before { + content: "\f0a0"; } -.toolbar .actions li { - display: inline-block; - margin-right: 5px; +.icon-bullhorn:before { + content: "\f0a1"; } -.toolbar .actions li { - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.icon-bell:before { + content: "\f0a2"; } -.toolbar .actions li:last-of-type { - margin-right: 0; +.icon-certificate:before { + content: "\f0a3"; } -.toolbar .btn { - padding: 0 10px 0 8px; - border-color: #b7b7b7; - line-height: 27px; +.icon-hand-right:before { + content: "\f0a4"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - 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); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-hand-left:before { + content: "\f0a5"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-hand-up:before { + content: "\f0a6"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-hand-down:before { + content: "\f0a7"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-circle-arrow-left:before { + content: "\f0a8"; } -.toolbar .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f654f6; - background-image: -moz-linear-gradient(top, #f544f5, #f76bf7); - background-image: -ms-linear-gradient(top, #f544f5, #f76bf7); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f544f5), to(#f76bf7)); - background-image: -webkit-linear-gradient(top, #f544f5, #f76bf7); - background-image: -o-linear-gradient(top, #f544f5, #f76bf7); - background-image: linear-gradient(top, #f544f5, #f76bf7); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f544f5', endColorstr='#f76bf7', GradientType=0); - border-color: #f76bf7 #f76bf7 #f322f3; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76bf7; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-circle-arrow-right:before { + content: "\f0a9"; } -.toolbar .btn-primary:hover, -.toolbar .btn-primary:active, -.toolbar .btn-primary.active, -.toolbar .btn-primary.disabled, -.toolbar .btn-primary[disabled] { - background-color: #f76bf7; - *background-color: #f653f6; +.icon-circle-arrow-up:before { + content: "\f0aa"; } -.toolbar .btn-primary:active, -.toolbar .btn-primary.active { - background-color: #f43bf4 \9; +.icon-circle-arrow-down:before { + content: "\f0ab"; } -.toolbar .btn-primary .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-globe:before { + content: "\f0ac"; } -.toolbar .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - 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); - *background-color: #f89406; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-wrench:before { + content: "\f0ad"; } -.toolbar .btn-warning:hover, -.toolbar .btn-warning:active, -.toolbar .btn-warning.active, -.toolbar .btn-warning.disabled, -.toolbar .btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; +.icon-tasks:before { + content: "\f0ae"; } -.toolbar .btn-warning:active, -.toolbar .btn-warning.active { - background-color: #c67605 \9; +.icon-filter:before { + content: "\f0b0"; } -.toolbar .btn-warning .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-briefcase:before { + content: "\f0b1"; } -.toolbar .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - 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); - *background-color: #bd362f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-fullscreen:before { + content: "\f0b2"; } -.toolbar .btn-danger:hover, -.toolbar .btn-danger:active, -.toolbar .btn-danger.active, -.toolbar .btn-danger.disabled, -.toolbar .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; +.icon-group:before { + content: "\f0c0"; } -.toolbar .btn-danger:active, -.toolbar .btn-danger.active { - background-color: #942a25 \9; +.icon-link:before { + content: "\f0c1"; } -.toolbar .btn-danger .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-cloud:before { + content: "\f0c2"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - 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); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-beaker:before { + content: "\f0c3"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-cut:before { + content: "\f0c4"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-copy:before { + content: "\f0c5"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-paper-clip:before { + content: "\f0c6"; } -.toolbar .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - 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); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-save:before { + content: "\f0c7"; +} +.icon-sign-blank:before { + content: "\f0c8"; } -.toolbar .btn-info:hover, -.toolbar .btn-info:active, -.toolbar .btn-info.active, -.toolbar .btn-info.disabled, -.toolbar .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; +.icon-reorder:before { + content: "\f0c9"; } -.toolbar .btn-info:active, -.toolbar .btn-info.active { - background-color: #24748c \9; +.icon-list-ul:before { + content: "\f0ca"; } -.toolbar .btn-info .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-list-ol:before { + content: "\f0cb"; } -.toolbar .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - 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); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-strikethrough:before { + content: "\f0cc"; } -.toolbar .btn-inverse:hover, -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active, -.toolbar .btn-inverse.disabled, -.toolbar .btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; +.icon-underline:before { + content: "\f0cd"; } -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active { - background-color: #080808 \9; +.icon-table:before { + content: "\f0ce"; } -.toolbar .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-magic:before { + content: "\f0d0"; } -.hide-heading { - display: none; +.icon-truck:before { + content: "\f0d1"; } -.page-header { - position: relative; - border-bottom: 1px solid #d0d0d0; - height: 30px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.icon-pinterest:before { + content: "\f0d2"; } -.page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; +.icon-pinterest-sign:before { + content: "\f0d3"; } -.page-header .nav-tabs i { - margin-right: 10px; - font-size: 14px; +.icon-google-plus-sign:before { + content: "\f0d4"; } -.page-header .nav-tabs a:hover { - background-color: #ffffff; +.icon-google-plus:before { + content: "\f0d5"; } -.prose h1, -.prose heading-1 h2, -.prose heading-2 { - margin-bottom: 15px; +.icon-money:before { + content: "\f0d6"; } -.prose h3, -.prose heading-3 { - margin-bottom: 10px; +.icon-caret-down:before { + content: "\f0d7"; } -.table-chunky td, -.table-chunky th { - padding: 12px 15px; - font-size: 12px; +.icon-caret-up:before { + content: "\f0d8"; } -.table-chunky thead th, -.table-chunky thead td { - color: #ffffff; - background-color: #aaaaaa; - padding-top: 10px; - padding-bottom: 10px; +.icon-caret-left:before { + content: "\f0d9"; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: transparent; +.icon-caret-right:before { + content: "\f0da"; } -.table-striped tbody tr:nth-child(even) td, -.table-striped tbody tr:nth-child(even) th { - background-color: #f2f2f2; +.icon-columns:before { + content: "\f0db"; } -.table-chunky.table-bordered { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-sort:before { + content: "\f0dc"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; +.icon-sort-down:before { + content: "\f0dd"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +.icon-sort-up:before { + content: "\f0de"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 2px; - -moz-border-radius: 0 0 0 2px; - border-radius: 0 0 0 2px; - -webkit-border-bottom-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - border-bottom-left-radius: 2px; +.icon-envelope-alt:before { + content: "\f0e0"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - border-bottom-right-radius: 2px; +.icon-linkedin:before { + content: "\f0e1"; } -.ckan-icon { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; +.icon-undo:before { + content: "\f0e2"; } -.ckan-icon:last-child { - *margin-left: 0; +.icon-legal:before { + content: "\f0e3"; } -.ckan-icon-fb { - width: 16px; - height: 16px; - background-position: 0px 0; +.icon-dashboard:before { + content: "\f0e4"; } -.ckan-icon-gplus { - width: 16px; - height: 16px; - background-position: -16px 0; +.icon-comment-alt:before { + content: "\f0e5"; } -.ckan-icon-twitter { - width: 16px; - height: 16px; - background-position: -32px 0; +.icon-comments-alt:before { + content: "\f0e6"; } -.ckan-icon-email { - width: 16px; - height: 16px; - background-position: -48px 0; +.icon-bolt:before { + content: "\f0e7"; } -.ckan-icon-share { - width: 16px; - height: 16px; - background-position: -64px 0; +.icon-sitemap:before { + content: "\f0e8"; } -.ckan-icon-feed { - width: 16px; - height: 16px; - background-position: -80px 0; +.icon-umbrella:before { + content: "\f0e9"; } -.ckan-icon-calendar { - width: 16px; - height: 16px; - background-position: -96px 0; +.icon-paste:before { + content: "\f0ea"; } -.ckan-icon-file { - width: 16px; - height: 16px; - background-position: -112px 0; +.icon-lightbulb:before { + content: "\f0eb"; } -.ckan-icon-lock { - width: 16px; - height: 16px; - background-position: -128px 0; +.icon-exchange:before { + content: "\f0ec"; } -.ckan-icon-link-file { - width: 16px; - height: 16px; - background-position: -144px 0; +.icon-cloud-download:before { + content: "\f0ed"; } -.ckan-icon-link-plugin { - width: 16px; - height: 16px; - background-position: -160px 0; +.icon-cloud-upload:before { + content: "\f0ee"; } -.ckan-icon-upload-file { - width: 16px; - height: 16px; - background-position: -176px 0; +.icon-user-md:before { + content: "\f0f0"; } -.ckan-icon-callout { - width: 16px; - height: 16px; - background-position: -192px 0; +.icon-stethoscope:before { + content: "\f0f1"; } -.ckan-icon-circle-cross { - width: 17px; - height: 17px; - background-position: 0px -16px; +.icon-suitcase:before { + content: "\f0f2"; } -.ckan-icon-circle-add { - width: 17px; - height: 17px; - background-position: -17px -16px; +.icon-bell-alt:before { + content: "\f0f3"; } -.ckan-icon-flame { - width: 17px; - height: 17px; - background-position: -34px -16px; +.icon-coffee:before { + content: "\f0f4"; } -.ckan-icon-search { - width: 17px; - height: 17px; - background-position: -51px -16px; +.icon-food:before { + content: "\f0f5"; } -.ckan-icon-large-lock { - width: 20px; - height: 20px; - background-position: 0px -33px; +.icon-file-alt:before { + content: "\f0f6"; } -.ckan-icon-photo { - width: 20px; - height: 20px; - background-position: -20px -33px; +.icon-building:before { + content: "\f0f7"; } -.ckan-icon-add { - width: 20px; - height: 20px; - background-position: -40px -33px; +.icon-hospital:before { + content: "\f0f8"; } -.ckan-icon-home { - width: 20px; - height: 20px; - background-position: -60px -33px; +.icon-ambulance:before { + content: "\f0f9"; } -.ckan-icon-rewind { - width: 20px; - height: 20px; - background-position: -80px -33px; +.icon-medkit:before { + content: "\f0fa"; +} +.icon-fighter-jet:before { + content: "\f0fb"; +} +.icon-beer:before { + content: "\f0fc"; +} +.icon-h-sign:before { + content: "\f0fd"; +} +.icon-plus-sign-alt:before { + content: "\f0fe"; } -.ckan-icon-tools { - width: 20px; - height: 20px; - background-position: -100px -33px; +.icon-double-angle-left:before { + content: "\f100"; } -.ckan-icon-flag { - width: 20px; - height: 20px; - background-position: -120px -33px; +.icon-double-angle-right:before { + content: "\f101"; } -.ckan-icon-clipboard { - width: 20px; - height: 20px; - background-position: -140px -33px; +.icon-double-angle-up:before { + content: "\f102"; } -.ckan-icon-share { - width: 20px; - height: 20px; - background-position: -160px -33px; +.icon-double-angle-down:before { + content: "\f103"; } -.ckan-icon-info { - width: 20px; - height: 20px; - background-position: -180px -33px; +.icon-angle-left:before { + content: "\f104"; } -.ckan-icon-download { - width: 20px; - height: 20px; - background-position: -200px -33px; +.icon-angle-right:before { + content: "\f105"; } -.ckan-icon-star { - width: 20px; - height: 20px; - background-position: -220px -33px; +.icon-angle-up:before { + content: "\f106"; } -.ckan-icon-info-flat { - width: 20px; - height: 20px; - background-position: -240px -33px; +.icon-angle-down:before { + content: "\f107"; } -.ckan-icon-tag { - width: 20px; - height: 20px; - background-position: -260px -33px; +.icon-desktop:before { + content: "\f108"; } -.ckan-icon-plus { - width: 20px; - height: 20px; - background-position: -280px -33px; - width: 16px; +.icon-laptop:before { + content: "\f109"; } -.ckan-icon-head { - width: 20px; - height: 20px; - background-position: -300px -33px; +.icon-tablet:before { + content: "\f10a"; } -.ckan-icon-arrow-e { - width: 20px; - height: 20px; - background-position: -320px -33px; - width: 16px; +.icon-mobile-phone:before { + content: "\f10b"; } -.ckan-icon-bookmark { - width: 25px; - height: 25px; - background-position: 0px -53px; +.icon-circle-blank:before { + content: "\f10c"; } -.format-label { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - text-indent: -900em; - background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +.icon-quote-left:before { + content: "\f10d"; } -.format-label:last-child { - *margin-left: 0; +.icon-quote-right:before { + content: "\f10e"; } -.format-label { - width: 32px; - height: 35px; - background-position: 0px -62px; +.icon-spinner:before { + content: "\f110"; } -.format-label[data-format=rdf], -.format-label[data-format*=rdf] { - width: 32px; - height: 35px; - background-position: -32px -62px; +.icon-circle:before { + content: "\f111"; } -.format-label[data-format=pdf], -.format-label[data-format*=pdf] { - width: 32px; - height: 35px; - background-position: -64px -62px; +.icon-reply:before { + content: "\f112"; } -.format-label[data-format=api], -.format-label[data-format*=api] { - width: 32px; - height: 35px; - background-position: -96px -62px; +.icon-github-alt:before { + content: "\f113"; } -.format-label[data-format=zip], -.format-label[data-format*=zip] { - width: 32px; - height: 35px; - background-position: -128px -62px; +.icon-folder-close-alt:before { + content: "\f114"; } -.format-label[data-format=xls], -.format-label[data-format*=xls] { - width: 32px; - height: 35px; - background-position: -160px -62px; +.icon-folder-open-alt:before { + content: "\f115"; } -.format-label[data-format=csv], -.format-label[data-format*=csv] { - width: 32px; - height: 35px; - background-position: -192px -62px; +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + text-align: right; + font-size: 14px; + line-height: 1; + width: 14px; } -.format-label[data-format=txt], -.format-label[data-format*=txt] { - width: 32px; - height: 35px; - background-position: -224px -62px; +.btn [class^="icon-"], +.nav [class^="icon-"], +.module-heading [class^="icon-"], +.dropdown [class^="icon-"], +.btn [class*=" icon-"], +.nav [class*=" icon-"], +.module-heading [class*=" icon-"], +.dropdown [class*=" icon-"] { + margin-right: 4px; } -.format-label[data-format=xml], -.format-label[data-format*=xml] { - width: 32px; - height: 35px; - background-position: -256px -62px; +.info-block [class^="icon-"], +.info-block [class*=" icon-"] { + float: left; + font-size: 28px; + width: 28px; + margin-right: 5px; + margin-top: 2px; } -.format-label[data-format=json], -.format-label[data-format*=json] { - width: 32px; - height: 35px; - background-position: -288px -62px; +.breadcrumb .home .icon-home { + font-size: 24px; + width: 24px; + vertical-align: -1px; } -.format-label[data-format=html], -.format-label[data-format*=html] { - width: 32px; - height: 35px; - background-position: -320px -62px; +.info-block-small [class^="icon-"], +.info-block-small [class*=" icon-"] { + font-size: 14px; + width: 14px; + margin-top: 1px; } -li [class^="icon-"], -li [class*=" icon-"] { - width: auto; +.wrapper { + *zoom: 1; + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + position: relative; + background: #ffffff url("../../../base/images/nav.png") 0 0 repeat-y; + margin-bottom: 20px; } -li .icon-large:before, -li .icon-large:before { - width: auto; +.wrapper:before, +.wrapper:after { + display: table; + content: ""; + line-height: 0; +} +.wrapper:after { + clear: both; +} +.wrapper.no-nav { + background-image: none; } [role=main], .main { position: relative; - padding-top: 27px; - padding-bottom: 27px; - background-color: #efefef; + padding-top: 10px; + padding-bottom: 20px; + background: #eeeeee url("../../../base/images/bg.png"); } [role=main] { min-height: 350px; } .main:after, -.main:before, -[role=main]:after, -[role=main]:before { - content: ""; - position: absolute; - left: 0; - right: 0; - height: 7px; - background: #ffffff; - border-color: #c9c9c9; - border-style: solid; - border-width: 0; -} -.main:before, -[role=main]:before { - top: 0; - border-bottom-width: 1px; -} -.main:after, [role=main]:after { bottom: 0; border-top-width: 1px; } [role=main] .primary { - float: left; - margin-left: 20px; - width: 700px; + width: 717px; float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; float: left; } -.primary > :last-child, -.secondary > :last-child { - margin-bottom: 0; +.primary > :last-child, +.secondary > :last-child { + margin-bottom: 0; +} +.primary .primary { + float: left; + width: 467px; + margin-left: 0; + margin-bottom: 20px; +} +.primary .primary h1:first-child, +.primary .primary h2:first-child, +.primary .primary h3:first-child, +.primary .primary h4:first-child { + margin-top: 0; +} +.primary .tertiary { + float: left; + width: 180px; + margin-left: 20px; + margin-bottom: 20px; +} +.hero { + background: url("../../../base/images/background-tile.png"); +} +.hero:after { + background-color: rgba(0, 0, 0, 0.09); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-repeat: repeat-x; + background-color: #f6f6f6; + border-bottom: 1px solid #d0d0d0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + -moz-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); +} +.hero:after .back:hover { + text-decoration: none; +} +.hero:after .back:hover span { + text-decoration: underline; +} +.context-info .module-content { + padding: 15px; +} +.context-info .image { + margin-bottom: 10px; +} +.context-info .image img, +.context-info .image a { + display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.context-info p { + overflow: auto; +} +.context-info code { + display: block; + font-weight: normal; + padding: 0; + margin: 0; + overflow: auto; +} +.context-info h1.heading { + margin: 0 0 5px 0; + font-size: 18px; + line-height: 1.3; +} +.context-info .info { + margin-top: 15px; + padding-top: 10px; + border-top: 1px dotted #DDD; +} +.context-info .info dl dd { + margin-top: 3px; + margin-left: 0; +} +.context-info .nums { + *zoom: 1; + margin-top: 15px; + padding-top: 10px; + padding-bottom: 0; + border-top: 1px dotted #DDD; +} +.context-info .nums:before, +.context-info .nums:after { + display: table; + content: ""; + line-height: 0; +} +.context-info .nums:after { + clear: both; +} +.context-info .nums dl { + float: left; + width: 50%; + margin: 5px 0 0 0; + color: #444444; +} +.context-info .nums dl dt { + display: block; + font-size: 13px; + font-weight: 300; +} +.context-info .nums dl dd { + display: block; + font-size: 30px; + font-weight: 700; + line-height: 36px; + margin-left: 0; +} +.context-info .nums dl dd .smallest { + font-size: 13px; +} +.context-info .nums dl dd .smaller { + font-size: 16px; } -.hero { - background: url("../../../base/images/background-tile.png"); +.context-info .nums dl dd .small { + font-size: 21px; } -.hero:after { - background-color: rgba(0, 0, 0, 0.09); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-repeat: repeat-x; - background-color: transparent; - top: 7px; - bottom: auto; - height: 5px; +.context-info .follow_button { + margin-top: 15px; +} +.context-info.editing .module-content { + margin-top: 0; } .hero { - padding-bottom: 0; + background: url("../../../base/images/background-tile.png"); + padding: 20px 0; min-height: 0; } .hero > .container { position: relative; padding-bottom: 0; } -.hero-primary, -.hero-secondary { - float: left; - margin-left: 20px; - width: 460px; -} -.hero-primary { - margin-left: 0; -} -.hero-primary { - margin-left: 0; - margin-bottom: 0; -} -.hero-secondary { - position: absolute; - bottom: 0; - right: 0; -} -.hero-secondary-inner { - bottom: 0; - left: 0; - right: 0; -} -.hero .module-popup { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - margin-top: 50px; +.hero .search-giant { + margin-bottom: 10px; } -.hero .module-popup .module-content { - padding-bottom: 2px; +.hero .search-giant input { + border-color: #003f52; } .hero .page-heading { font-size: 18px; @@ -6734,290 +7984,339 @@ li .icon-large:before { } .hero .module-dark { padding: 5px; - margin-bottom: 10px; + margin-bottom: 0; color: #ffffff; background: #ffffff; } .hero .module-dark .module-content { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - background-color: #dc0bdc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + background-color: #e73892; + border-bottom: none; } .hero .module-dark .module-content .heading { + margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { - margin-bottom: 9px; -} -.hero .tags .tag, -.hero .tags .tag-list { - display: inline-block; -} -.hero .tags .tag-list { - padding: 0; -} -.hero .tags .tag { - margin-right: 15px; -} -header.masthead { *zoom: 1; - color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #e512e5; - background-image: -moz-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -ms-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc0bdc), to(#f31df3)); - background-image: -webkit-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -o-linear-gradient(top, #dc0bdc, #f31df3); - background-image: linear-gradient(top, #dc0bdc, #f31df3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dc0bdc', endColorstr='#f31df3', GradientType=0); + padding: 5px 10px 10px 10px; + background-color: #d31979; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -header.masthead:before, -header.masthead:after { +.hero .tags:before, +.hero .tags:after { display: table; content: ""; + line-height: 0; } -header.masthead:after { +.hero .tags:after { clear: both; } -header.masthead .container { - position: relative; +.hero .tags h3, +.hero .tags .tag { + display: block; + float: left; + margin: 5px 10px 0 0; } -header.masthead a { - color: #ffffff; +.hero .tags h3 { + font-size: 14px; + line-height: 20px; + padding: 2px 8px; } -header.masthead hgroup h1, -header.masthead hgroup h2 { +.hero-primary, +.hero-secondary { float: left; - font-size: 34px; - line-height: 1.5; -} -header.masthead hgroup h1 { - font-weight: 900; - letter-spacing: -1px; + margin-left: 20px; + width: 460px; } -header.masthead hgroup h2 { - position: absolute; - bottom: -3px; - left: 0; - margin: 0; - font-size: 15px; - font-weight: normal; - line-height: 1.2; - white-space: nowrap; +.hero-primary { + margin-left: 0; + margin-bottom: 0; } -header.masthead .content { +.hero-secondary { position: absolute; - top: 10px; + bottom: 0; right: 0; } -header.masthead .section { - float: left; +.hero-secondary .hero-secondary-inner { + bottom: 0; + left: 0; + right: 0; } -header.masthead .navigation { - margin-right: 20px; +.main.homepage { + padding-top: 20px; + padding-bottom: 20px; + border-top: 1px solid #cccccc; } -header.masthead .navigation ul.unstyled { - *zoom: 1; - margin: 5px 0; +.main.homepage .module-heading .media-image { + margin-right: 15px; + max-height: 53px; + -webkit-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); } -header.masthead .navigation ul.unstyled:before, -header.masthead .navigation ul.unstyled:after { - display: table; - content: ""; +.main.homepage .group-listing .box { + min-height: 275px; } -header.masthead .navigation ul.unstyled:after { - clear: both; +.main.homepage .group-list { + margin-bottom: 0; } -header.masthead .navigation ul.unstyled li { - display: block; - float: left; +.main.homepage .group-list .dataset-content { + min-height: 70px; } -header.masthead .navigation ul.unstyled li a { - display: block; - font-size: 12px; - font-weight: bold; - padding: 4px 10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.main.homepage .box .module { + margin-top: 0; } -header.masthead .navigation ul.unstyled li a.active { - background-color: #de17de; - box-shadow: 0 -1px 0 #b012b0, 0 1px 0 #e130e1; +.account-masthead { + *zoom: 1; + min-height: 30px; + color: #ffffff; + background: #d31979 url("../../../base/images/bg.png"); } -header.masthead .site-search { - margin: 3px 0; +.account-masthead:before, +.account-masthead:after { + display: table; + content: ""; + line-height: 0; } -header.masthead .site-search input { - width: 190px; - font-size: 11px; - padding: 4px; +.account-masthead:after { + clear: both; } -header.masthead .account { - background: #ea0cea; - padding: 3px 5px; - margin: 2px 0 2px 30px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 2px 4px #d20bd2; - -moz-box-shadow: inset 0 2px 4px #d20bd2; - box-shadow: inset 0 2px 4px #d20bd2; +.account-masthead .account { + float: right; } -header.masthead .account ul.unstyled { +.account-masthead .account ul { *zoom: 1; } -header.masthead .account ul.unstyled:before, -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:before, +.account-masthead .account ul:after { display: table; content: ""; + line-height: 0; } -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:after { clear: both; } -header.masthead .account ul.unstyled li { +.account-masthead .account ul li { display: block; float: left; + border-left: 1px solid #bc176c; } -header.masthead .account ul.unstyled li a { +.account-masthead .account ul li a { display: block; - font-size: 12px; + color: #f9cde4; + font-size: 13px; font-weight: bold; - padding: 4px 10px; + padding: 0 10px; + line-height: 31px; +} +.account-masthead .account ul li a span.username { + margin: 0 2px 0 4px; } -header.masthead .account ul.unstyled li a.sub { +.account-masthead .account ul li a:hover { + color: #fbe1ef; + background-color: #bc176c; + text-decoration: none; +} +.account-masthead .account ul li a.sub { font-weight: 300; - border-left: 1px solid #d20bd2; } -header.masthead .account .dropdown { - float: left; +.account-masthead .account ul li a .btn { + vertical-align: 1px; + margin-left: 3px; } -header.masthead .account .button { - display: block; - text-decoration: none; - background-color: #dc0bdc; - color: #ee85ee; - text-shadow: 0 1px 1px #ab09ab; +.account-masthead .account .notifications a span { + font-size: 12px; + margin-left: 3px; + padding: 1px 6px; + background-color: #bc176c; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 #f30ef3; - -moz-box-shadow: inset 0 1px 0 #f30ef3; - box-shadow: inset 0 1px 0 #f30ef3; } -header.masthead .account .image { - margin: 2px 0; - padding: 0 4px 0 0; - overflow: hidden; - font-size: 10px; +.account-masthead .account .notifications a:hover span { + color: #ffffff; + background-color: #a5145f; +} +.account-masthead .account .notifications.notifications-important a span { + color: #ffffff; + background-color: #c9403a; +} +.account-masthead .account.authed .image { + padding: 0 6px; +} +.account-masthead .account.authed .image img { + vertical-align: -6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -header.masthead .account .image i { - vertical-align: -1px; +.masthead { + *zoom: 1; + min-height: 55px; + color: #ffffff; + background: #e73892 url("../../../base/images/bg.png"); } -header.masthead .account .image img { - opacity: 0.7; - border-right: 1px solid #f31df3; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.masthead:before, +.masthead:after { + display: table; + content: ""; + line-height: 0; +} +.masthead:after { + clear: both; } -header.masthead .account .notifications { - padding: 4px 8px 3px 8px; - margin: 2px 5px 2px 0; +.masthead .container { + position: relative; } -header.masthead .account .notifications.notifications-important { +.masthead a { color: #ffffff; - background-color: #c9403a; - text-shadow: 0 1px 1px #a3322d; - -webkit-box-shadow: inset 0 1px 0 #ce534e; - -moz-box-shadow: inset 0 1px 0 #ce534e; - box-shadow: inset 0 1px 0 #ce534e; } -header.masthead .account .dropdown.open .image img, -header.masthead .account .dropdown .image:hover img { - opacity: 1; - border-right-color: #f64df6; +.masthead hgroup h1, +.masthead hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; } -header.masthead .account .dropdown.open .button, -header.masthead .account .dropdown .button:hover { - color: #ffffff; - background-color: #ea6dea; - -webkit-box-shadow: inset 0 1px 0 #ee85ee; - -moz-box-shadow: inset 0 1px 0 #ee85ee; - box-shadow: inset 0 1px 0 #ee85ee; - text-decoration: none; +.masthead hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.masthead hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; } -header.masthead .account .dropdown.open .notifications-important, -header.masthead .account .dropdown .notifications-important:hover { - background-color: #d46762; - text-shadow: 0 1px 1px #c9403a; - -webkit-box-shadow: inset 0 1px 0 #d97a76; - -moz-box-shadow: inset 0 1px 0 #d97a76; - box-shadow: inset 0 1px 0 #d97a76; +.masthead .content { + position: absolute; + top: 10px; + right: 0; } -header.masthead .account.authed { - margin: 0 0 0 30px; +.masthead .section { + float: left; } -header.masthead .account.not-authed { - padding-top: 2px; - padding-bottom: 2px; +.masthead input[type="text"] { + border-color: #e42186; } -header.masthead .dropdown-menu { - margin-top: -1px; +.masthead .navigation { + margin-right: 20px; } -header.masthead .user-dropdown-menu a { - color: #dc0bdc; +.masthead .navigation .nav-pills { + margin-bottom: 0; } -header.masthead .user-dropdown-menu a:hover { - color: #ffffff; +.masthead .navigation .nav-pills li a:hover, +.masthead .navigation .nav-pills li.active a { + background-color: #d31979; } -header.masthead .debug { +.masthead .site-search { + margin: 2px 8px 2px 0; +} +.masthead .site-search input { + width: 200px; + padding: 4px 10px; +} +.masthead .debug { position: absolute; - bottom: 10px; + top: 37px; left: 10px; - font-size: 11px; color: rgba(255, 255, 255, 0.5); - line-height: 1.2; } .site-footer { *zoom: 1; + min-height: 55px; color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #e512e5; - background-image: -moz-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -ms-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc0bdc), to(#f31df3)); - background-image: -webkit-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -o-linear-gradient(top, #dc0bdc, #f31df3); - background-image: linear-gradient(top, #dc0bdc, #f31df3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dc0bdc', endColorstr='#f31df3', GradientType=0); - font-size: 12px; + background: #e73892 url("../../../base/images/bg.png"); padding: 20px 0; } .site-footer:before, .site-footer:after { display: table; content: ""; + line-height: 0; } .site-footer:after { clear: both; } +.site-footer .container { + position: relative; +} +.site-footer a { + color: #ffffff; +} +.site-footer hgroup h1, +.site-footer hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; +} +.site-footer hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.site-footer hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.site-footer .content { + position: absolute; + top: 10px; + right: 0; +} +.site-footer .section { + float: left; +} +.site-footer input[type="text"] { + border-color: #e42186; +} +.site-footer .navigation { + margin-right: 20px; +} +.site-footer .navigation .nav-pills { + margin-bottom: 0; +} +.site-footer .navigation .nav-pills li a:hover, +.site-footer .navigation .nav-pills li.active a { + background-color: #d31979; +} +.site-footer .site-search { + margin: 2px 8px 2px 0; +} +.site-footer .site-search input { + width: 200px; + padding: 4px 10px; +} +.site-footer .debug { + position: absolute; + top: 37px; + left: 10px; + color: rgba(255, 255, 255, 0.5); +} .site-footer, .site-footer label, .site-footer small { - color: #ccdee3; + color: #f5afd3; } .site-footer a { - color: #ccdee3; + color: #f5afd3; } .footer-links, .attribution { @@ -7025,22 +8324,27 @@ header.masthead .debug { margin-left: 20px; width: 460px; } -.footer-links { +.footer-links { + margin-left: 0; +} +.footer-links ul { + float: left; + margin-left: 20px; + width: 220px; +} +.footer-links ul:first-child { margin-left: 0; } -.footer-links li { - display: inline-block; - width: 40%; - margin-right: 5%; +.footer-links ul li { margin-bottom: 5px; } .attribution small { - color: #ccdee3; + color: #f5afd3; font-size: 12px; } .attribution .ckan-footer-logo { display: block; - width: 65px; + width: 68px; height: 21px; margin-top: 2px; background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left; @@ -7053,6 +8357,7 @@ header.masthead .debug { .lang-select:after { display: table; content: ""; + line-height: 0; } .lang-select:after { clear: both; @@ -7069,153 +8374,66 @@ header.masthead .debug { .lang-dropdown li { width: auto; } -.lang-dropdown .select2-result-label[data-value]:before { - content: ""; - display: inline-block; - background-image: url("../../../base/images/flags.png"); - background-repeat: no-repeat; - background-position: 0 11px; - width: 17px; - height: 11px; - position: relative; - top: 1px; -} -.lang-dropdown .select2-result-label[data-value*="/en/"]:before { - background-position: 0 0; -} -.lang-dropdown .select2-result-label[data-value*="/de/"]:before { - background-position: 0 -11px; -} -.lang-dropdown .select2-result-label[data-value*="/fr/"]:before { - background-position: 0 -22px; -} -.lang-dropdown .select2-result-label[data-value*="/it/"]:before { - background-position: 0 -33px; -} -.lang-dropdown .select2-result-label[data-value*="/es/"]:before { - background-position: 0 -44px; -} -.lang-dropdown .select2-result-label[data-value*="/pl/"]:before { - background-position: 0 -55px; +.table-selected td { + background-color: #f5f5f5; } -.lang-dropdown .select2-result-label[data-value*="/ru/"]:before { - background-position: 0 -66px; +.table-selected td .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/nl/"]:before { - background-position: 0 -77px; +.table-bulk-edit th input { + top: -5px; } -.lang-dropdown .select2-result-label[data-value*="/sv/"]:before { - background-position: 0 -88px; +.table-bulk-edit .table-actions .btn-group { + float: left; + margin: 0 10px 0 0; } -.lang-dropdown .select2-result-label[data-value*="/no/"]:before { - background-position: 0 -99px; +.table-bulk-edit .context p { + margin-bottom: 0; } -.lang-dropdown .select2-result-label[data-value*="/cs/"]:before, -.lang-dropdown .select2-result-label[data-value*="/cs_CZ/"]:before { - background-position: 0 -110px; +.table-header thead th { + background-color: #f6f6f6; } -.lang-dropdown .select2-result-label[data-value*="/hu/"]:before { - background-position: 0 -121px; +.table-edit-hover .edit { + display: none; + float: right; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.table-edit-hover tr:hover .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/fi/"]:before { - background-position: 0 -143px; +.js .table-toggle-more .toggle-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/bg/"]:before { - background-position: 0 -154px; +.js .table-toggle-more .show-more { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/ca/"]:before { - background-position: 0 -165px; +.js .table-toggle-more .show-less { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/sq/"]:before { - background-position: 0 -176px; +.js .table-toggle-more .toggle-seperator { + display: table-row; } -.lang-dropdown .select2-result-label[data-value*="/sr/"]:before, -.lang-dropdown .select2-result-label[data-value*="/sr_Latn/"]:before { - background-position: 0 -187px; +.js .table-toggle-more .toggle-seperator td { + height: 11px; + padding: 0; + background-image: url("../../../base/images/table-seperator.png"); } -.lang-dropdown .select2-result-label[data-value*="/zh_TW/"]:before { - background-position: 0 -198px; +.js .table .toggle-show td { + background: none; + text-align: center; } -.lang-dropdown .select2-result-label[data-value*="/lv/"]:before { - background-position: 0 -209px; +.js .table-toggle-less .show-less { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/sk/"]:before { - background-position: 0 -220px; +.js .table-toggle-less .show-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.js .table-toggle-less .toggle-seperator { + display: none; } .profile .empty, .profile .dataset-list { margin-bottom: 20px; } -.profile-info .module-content { - padding: 15px; -} -.profile-info .avatar { - border: 1px solid #DDD; - padding: 5px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.profile-info .avatar img, -.profile-info .avatar a { - display: block; -} -.profile-info code { - font-weight: normal; - padding: 0; - margin: 0; -} -.profile-info h1.heading { - margin: 10px 0 5px 0; - font-size: 21px; -} -.profile-info .info { - margin-top: 15px; - padding-top: 10px; - border-top: 1px dotted #DDD; -} -.profile-info .info dl dd { - margin-top: 3px; - margin-left: 0; -} -.profile-info .nums { - *zoom: 1; - margin-top: 15px; - padding-top: 10px; - padding-bottom: 0; - border-top: 1px dotted #DDD; -} -.profile-info .nums:before, -.profile-info .nums:after { - display: table; - content: ""; -} -.profile-info .nums:after { - clear: both; -} -.profile-info .nums dl { - float: left; - width: 33%; - margin: 5px 0 0 0; - color: #4d4d4d; -} -.profile-info .nums dl dt { - display: block; - font-weight: 300; -} -.profile-info .nums dl dd { - display: block; - font-size: 30px; - font-weight: 700; - line-height: 1.2; - margin-left: 0; -} .activity { margin: 10px 0; padding: 0; @@ -7232,13 +8450,16 @@ header.masthead .debug { .activity .item:after { display: table; content: ""; + line-height: 0; } .activity .item:after { clear: both; } -.activity .item i { +.activity .item .icon { display: block; - float: left; + position: absolute; + top: 0; + left: 0; width: 30px; height: 30px; line-height: 30px; @@ -7246,7 +8467,6 @@ header.masthead .debug { color: #ffffff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); font-weight: normal; - font-size: 16px; margin-right: 10px; -webkit-border-radius: 100px; -moz-border-radius: 100px; @@ -7261,20 +8481,19 @@ header.masthead .debug { border-radius: 100px; } .activity .item .actor .gravatar { - float: left; - margin-top: -5px; - margin-right: 10px; + position: absolute; + top: 0; + left: 40px; } .activity .item p { font-size: 14px; line-height: 1.5; - margin: 5px 0 0 0; + margin: 5px 0 0 80px; } .activity .item .date { color: #999; font-size: 12px; white-space: nowrap; - margin-left: 5px; } .activity .item .new { display: block; @@ -7294,106 +8513,278 @@ header.masthead .debug { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.popover .about { - margin-bottom: 10px; +.activity .load-less { + margin-bottom: 15px; +} +.popover { + width: 300px; +} +.popover .popover-title { + font-weight: bold; + margin-bottom: 0; +} +.popover p.about { + margin: 0 0 10px 0; } .popover .popover-close { float: right; text-decoration: none; } -.activity .item i { - background-color: #767dce; +.activity .item .icon { + background-color: #999999; } -.activity .item.added-tag i { +.activity .item.added-tag .icon { background-color: #6995a6; } -.activity .item.changed-group i { +.activity .item.changed-group .icon { background-color: #767dce; } -.activity .item.changed-package i { +.activity .item.changed-package .icon { background-color: #8c76ce; } -.activity .item.changed-package_extra i { +.activity .item.changed-package_extra .icon { background-color: #769ace; } -.activity .item.changed-resource i { +.activity .item.changed-resource .icon { background-color: #aa76ce; } -.activity .item.changed-user i { +.activity .item.changed-user .icon { background-color: #76b8ce; } -.activity .item.deleted-group i { +.activity .item.changed-organization .icon { + background-color: #699fa6; +} +.activity .item.deleted-group .icon { background-color: #b95252; } -.activity .item.deleted-package i { +.activity .item.deleted-package .icon { background-color: #b97452; } -.activity .item.deleted-package_extra i { +.activity .item.deleted-package_extra .icon { background-color: #b95274; } -.activity .item.deleted-resource i { +.activity .item.deleted-resource .icon { background-color: #b99752; } -.activity .item.new-group i { +.activity .item.deleted-organization .icon { + background-color: #b95297; +} +.activity .item.new-group .icon { background-color: #69a67a; } -.activity .item.new-package i { +.activity .item.new-package .icon { background-color: #69a68e; } -.activity .item.new-package_extra i { +.activity .item.new-package_extra .icon { background-color: #6ca669; } -.activity .item.new-resource i { +.activity .item.new-resource .icon { background-color: #81a669; } -.activity .item.new-user i { +.activity .item.new-user .icon { background-color: #69a6a3; } -.activity .item.removed-tag i { +.activity .item.new-organization .icon { + background-color: #81a669; +} +.activity .item.removed-tag .icon { background-color: #b95297; } -.activity .item.deleted-related-item i { +.activity .item.deleted-related-item .icon { background-color: #b9b952; } -.activity .item.follow-dataset i { +.activity .item.follow-dataset .icon { background-color: #767dce; } -.activity .item.follow-user i { +.activity .item.follow-user .icon { background-color: #8c76ce; } -.activity .item.new-related-item i { +.activity .item.new-related-item .icon { background-color: #95a669; } -.activity .item.follow-group i { +.activity .item.follow-group .icon { background-color: #8ba669; } -.popover-context-loading .popover-title { +.dropdown:hover .dropdown-menu { + display: block; +} +.js .dropdown .dropdown-menu, +.js .dropdown:hover .dropdown-menu { + display: none; +} +.js .dropdown.open .dropdown-menu { + display: block; +} +#followee-filter .btn { + *zoom: 1; +} +#followee-filter .btn:before, +#followee-filter .btn:after { + display: table; + content: ""; + line-height: 0; +} +#followee-filter .btn:after { + clear: both; +} +#followee-filter .btn span, +#followee-filter .btn strong { + display: block; + float: left; + line-height: 1.5; +} +#followee-filter .btn span { + font-weight: normal; +} +#followee-filter .btn strong { + margin: 0 5px; + white-space: nowrap; + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; +} +.dashboard-context { + position: relative; + margin-bottom: 20px; + padding: 20px; + border-bottom: 1px solid #DCDCDC; + background-color: #f6f6f6; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; +} +.dashboard-context h2 { + margin-bottom: 10px; +} +.dashboard-context .arrow { + position: absolute; + content: ' '; + top: 30px; + right: -10px; + width: 10px; + height: 21px; + background: transparent url("../../../base/images/dashboard-followee-related.png"); +} +.popover-followee .popover-title { display: none; } -.popover-context-loading .popover-content { +.popover-followee .popover-content { + padding: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -.popover-context-loading .popover-content img { - vertical-align: -3px; - margin-right: 10px; +.popover-followee .empty { + padding: 10px; } -.follower-list li { - margin: 0 0 15px 0; +.popover-followee .popover-header { + *zoom: 1; + background-color: whiteSmoke; + padding: 5px; + border-bottom: 1px solid #cccccc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.follower-list .gravatar { - vertical-align: -4px; - margin-right: 3px; +.popover-followee .popover-header:before, +.popover-followee .popover-header:after { + display: table; + content: ""; + line-height: 0; +} +.popover-followee .popover-header:after { + clear: both; +} +.popover-followee .popover-header .input-prepend { + margin-bottom: 0; +} +.popover-followee .popover-header .add-on, +.popover-followee .popover-header input { + float: left; + margin: 0; +} +.popover-followee .popover-header .add-on { + padding: 4px 8px 4px 12px; + border-right-width: 0; + -webkit-border-radius: 100px 0 0 100px; + -moz-border-radius: 100px 0 0 100px; + border-radius: 100px 0 0 100px; +} +.popover-followee .popover-header input { + padding: 4px 12px 4px 8px; + font-size: 13px; + width: 207px; + -webkit-border-radius: 0 100px 100px 0; + -moz-border-radius: 0 100px 100px 0; + border-radius: 0 100px 100px 0; +} +.popover-followee .nav { + padding: 0; + margin: 0; + max-height: 205px; + overflow: auto; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.popover-followee .nav li a { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: 7px 10px 7px 15px; + margin: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.popover-followee .nav li a i { + background-color: #e73892; + color: #ffffff; + margin-right: 11px; + padding: 3px 5px; + line-height: 1; -webkit-border-radius: 100px; -moz-border-radius: 100px; border-radius: 100px; + -webkit-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); } -.module-my-datasets .empty { - padding: 10px; +.popover-followee .nav li a:hover i { + background-color: #000; +} +.popover-followee .nav li.active a i { + color: #e73892; + background-color: #ffffff; +} +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; } body { - background-color: #f31df3; + background: #e73892 url("../../../base/images/bg.png"); } [hidden] { display: none; @@ -7412,11 +8803,10 @@ table .metric { width: 140px; } code { - padding: 2px 2px; color: #000000; - font-weight: bold; border: none; background: none; + white-space: normal; } pre { border: none; @@ -7446,10 +8836,11 @@ iframe { text-indent: -999em; } .empty { - color: #aeaeae; + color: #aaaaaa; font-style: italic; } .page-heading { + margin-top: 0; margin-bottom: 16px; } .m-top { @@ -7492,10 +8883,6 @@ iframe { position: relative; top: -20px; } -.ie .module, -.ie .media-image { - border: 1px solid #cccccc; -} .ie .module-popup { border-bottom: none; } @@ -7519,24 +8906,19 @@ iframe { .ie9 .control-large input { height: 56px; } -.ie9 .module { - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +.ie8 .account-masthead a.image, +.ie8 .account-masthead .username { + white-space: nowrap; } -.ie7 .masthead nav ul li a.active, -.ie8 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #e60be6; - border-top: 1px solid #cd0acd; - border-bottom: 1px solid #f30ef3; +.ie9 .homepage .media.module-heading .media-image img, +.ie8 .homepage .media.module-heading .media-image img, +.ie7 .homepage .media.module-heading .media-image img { + width: 85px !important; } -.ie8 .masthead .account a.image { - display: block; - width: 25px; - padding-right: 10px; - white-space: nowrap; +.ie8 .hero .hero-primary.module-popup .box, +.ie7 .hero .hero-primary.module-popup .box { + padding-bottom: 20px !important; + margin-bottom: 0 !important; } .ie7 .alert { position: relative; @@ -7556,6 +8938,7 @@ iframe { .ie7 .tags .tag-list:after { display: table; content: ""; + line-height: 0; } .ie7 .tags .tag-list:after { clear: both; @@ -7569,8 +8952,6 @@ iframe { } .ie7 .tags .tag { display: block; - border: 1px solid #d0d0d0; - background: #f5f5f5; } .ie7 .search-giant input { width: 95%; @@ -7621,6 +9002,9 @@ iframe { .ie7 .stages li .highlight { width: auto; } +.ie7 .account-masthead .account a i { + line-height: 31px; +} .ie7 .masthead { position: relative; z-index: 1; @@ -7632,39 +9016,12 @@ iframe { *zoom: 1; } -.ie7 .masthead nav ul { - margin-top: 5px; -} -.ie7 .masthead nav ul li { - float: left; -} -.ie7 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #e60be6; - border-top: 1px solid #cd0acd; - border-bottom: 1px solid #f30ef3; -} .ie7 .masthead .header-image { display: block; } .ie7 .masthead .account .dropdown-menu { z-index: 10000; } -.ie7 .footer-links { - *zoom: 1; -} -.ie7 .footer-links:before, -.ie7 .footer-links:after { - display: table; - content: ""; -} -.ie7 .footer-links:after { - clear: both; -} -.ie7 .footer-links li { - float: left; -} .ie7 .module-narrow .nav-item.image { *zoom: 1; } @@ -7672,6 +9029,7 @@ iframe { .ie7 .module-narrow .nav-item.image:after { display: table; content: ""; + line-height: 0; } .ie7 .module-narrow .nav-item.image:after { clear: both; @@ -7689,11 +9047,13 @@ iframe { } .ie7 .module-heading { *zoom: 1; + position: relative; } .ie7 .module-heading:before, .ie7 .module-heading:after { display: table; content: ""; + line-height: 0; } .ie7 .module-heading:after { clear: both; @@ -7713,3 +9073,22 @@ iframe { position: relative; zoom: 1; } +.ie7 .resource-item { + position: static; + padding-bottom: 1px; +} +.ie7 .resource-item .heading { + position: relative; +} +.ie7 .resource-item .format-label { + left: -48px; +} +.ie7 .resource-item .btn-group { + position: relative; + float: right; + top: -35px; + right: 0; +} +.ie7 .media-overlay .media-heading { + background-color: #000; +} diff --git a/ckan/public/base/css/green.css b/ckan/public/base/css/green.css index 2694c58a461..1cc58fa82dc 100644 --- a/ckan/public/base/css/green.css +++ b/ckan/public/base/css/green.css @@ -48,11 +48,25 @@ sub { bottom: -0.25em; } img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; + /* Part 1: Set a maxium relative to the parent */ + + width: auto\9; + /* IE7-8 need help adjusting responsive images */ + + height: auto; + /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img, +.google-maps img { + max-width: none; +} button, input, select, @@ -72,11 +86,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +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; @@ -92,6 +116,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !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; } @@ -99,6 +174,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -113,28 +189,47 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } body { margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #4d4d4d; - background-color: #efefef; + font-size: 14px; + line-height: 20px; + color: #444444; + background-color: #eeeeee; } a { - color: #045b04; + color: #2f9b45; text-decoration: none; } -a:hover { - color: #011201; +a:hover, +a:focus { + color: #1d602b; text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} .row { margin-left: -20px; *zoom: 1; @@ -143,15 +238,18 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -236,6 +334,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -243,65 +342,171 @@ a:hover { .row-fluid [class*="span"] { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; +} +.row-fluid .offset12 { + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; +} +.row-fluid .offset12:first-child { + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; +} +.row-fluid .offset11 { + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; +} +.row-fluid .offset11:first-child { + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; +} +.row-fluid .offset10 { + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; +} +.row-fluid .offset10:first-child { + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; +} +.row-fluid .offset9 { + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; +} +.row-fluid .offset9:first-child { + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; +} +.row-fluid .offset8 { + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; +} +.row-fluid .offset8:first-child { + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; +} +.row-fluid .offset7 { + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; +} +.row-fluid .offset7:first-child { + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; +} +.row-fluid .offset6 { + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; +} +.row-fluid .offset6:first-child { + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; +} +.row-fluid .offset5 { + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; +} +.row-fluid .offset5:first-child { + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; +} +.row-fluid .offset4 { + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; +} +.row-fluid .offset4:first-child { + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; +} +.row-fluid .offset3 { + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; +} +.row-fluid .offset3:first-child { + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; +} +.row-fluid .offset2 { + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; +} +.row-fluid .offset2:first-child { + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; +} +.row-fluid .offset1 { + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; +} +.row-fluid .offset1:first-child { + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; +} +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; } .container { margin-right: auto; @@ -312,6 +517,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -325,25 +531,75 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; - font-size: 20px; + margin-bottom: 20px; + font-size: 21px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; +} +a.muted:hover, +a.muted:focus { + color: #808080; +} +.text-warning { + color: #c09853; +} +a.text-warning:hover, +a.text-warning:focus { + color: #a47e3c; +} +.text-error { + color: #b55457; +} +a.text-error:hover, +a.text-error:focus { + color: #954143; +} +.text-info { + color: #3a87ad; +} +a.text-info:hover, +a.text-info:focus { + color: #2d6987; +} +.text-success { + color: #468847; +} +a.text-success:hover, +a.text-success:focus { + color: #356635; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; } h1, h2, @@ -351,9 +607,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -364,60 +621,53 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } -h1 { - font-size: 30px; - line-height: 36px; +h1, +h2, +h3 { + line-height: 40px; } -h1 small { - font-size: 18px; +h1 { + font-size: 38.5px; } h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; + font-size: 31.5px; } h3 { - font-size: 18px; - line-height: 27px; + font-size: 24.5px; } -h3 small { +h4 { + font-size: 17.5px; +} +h5 { font-size: 14px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 11.9px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24.5px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 17.5px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -425,37 +675,57 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding-left: 5px; + padding-right: 5px; +} dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; } dd { - margin-left: 9px; + margin-left: 10px; +} +.dl-horizontal { + *zoom: 1; +} +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: ""; + line-height: 0; +} +.dl-horizontal:after { + clear: both; } .dl-horizontal dt { float: left; - width: 120px; + width: 160px; clear: left; text-align: right; overflow: hidden; @@ -463,26 +733,18 @@ dd { white-space: nowrap; } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -490,18 +752,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 22.5px; + line-height: 1.25; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -518,6 +780,12 @@ blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} q:before, q:after, blockquote:before, @@ -526,20 +794,14 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} -small { - font-size: 100%; -} -cite { + margin-bottom: 20px; font-style: normal; + line-height: 20px; } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; @@ -551,13 +813,14 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -570,11 +833,13 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -583,7 +848,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -594,15 +859,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -610,9 +875,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -623,116 +888,181 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + vertical-align: middle; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +input, +textarea, +.uneditable-input { + width: 206px; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; +textarea { height: auto; - padding: 0; - margin: 3px 0; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: #ffffff; + border: 1px solid #cccccc; + -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); + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ + margin-top: 1px \9; + /* IE8-9 */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + line-height: normal; } -input[type="button"], +input[type="file"], +input[type="image"], +input[type="submit"], input[type="reset"], -input[type="submit"] { +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - height: auto; } select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; + line-height: 30px; } select { width: 220px; + border: 1px solid #cccccc; background-color: #ffffff; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -textarea { +.uneditable-input, +.uneditable-textarea { + color: #999999; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} +.uneditable-textarea { + width: auto; height: auto; } -input[type="hidden"] { - display: none; +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; } .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, .controls > .checkbox:first-child { @@ -749,39 +1079,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -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); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -811,46 +1108,105 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { margin-left: 0; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 926px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 846px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 766px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 686px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 606px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 526px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 446px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 366px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 286px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 206px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 126px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 46px; +} +.controls-row { + *zoom: 1; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +.controls-row:before, +.controls-row:after { + display: table; + content: ""; + line-height: 0; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +.controls-row:after { + clear: both; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { + float: left; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } input[disabled], select[disabled], @@ -860,7 +1216,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -868,24 +1223,33 @@ input[type="radio"][readonly], 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; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .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 input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -893,24 +1257,33 @@ input[type="checkbox"][readonly] { background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b55457; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b55457; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b55457; + -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 input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #954143; - -webkit-box-shadow: 0 0 6px #d49b9d; - -moz-box-shadow: 0 0 6px #d49b9d; - box-shadow: 0 0 6px #d49b9d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -918,24 +1291,33 @@ input[type="checkbox"][readonly] { background-color: #f8f0f0; border-color: #b55457; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .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 input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -943,59 +1325,78 @@ input[type="checkbox"][readonly] { background-color: #dff0d8; 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; box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} .help-block, .help-inline { - color: #555555; + color: #6a6a6a; } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1006,62 +1407,76 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { - margin-bottom: 5px; +.input-append, +.input-prepend { + display: inline-block; + margin-bottom: 10px; + vertical-align: middle; + font-size: 0; + white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-append .dropdown-menu, +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, +.input-prepend .add-on, +.input-append .btn, .input-prepend .btn, -.input-append .btn { - margin-left: -1px; +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,12 +1497,21 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; +.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 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 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 { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1099,6 +1523,13 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; 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 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; @@ -1113,7 +1544,10 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; +} +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1121,9 +1555,36 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, .form-inline input, @@ -1152,6 +1613,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1159,7 +1621,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1185,45 +1649,53 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; } .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } .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: 9px; 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 { max-width: 100%; @@ -1233,12 +1705,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1260,6 +1732,9 @@ table { .table tbody + tbody { border-top: 2px solid #dddddd; } +.table .table { + background-color: #eeeeee; +} .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1267,7 +1742,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1288,160 +1763,175 @@ table { .table-bordered tbody:first-child tr:first-child td { 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, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 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, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody: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 tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 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 thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; +} +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 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, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; +} +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; +} +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } -table .span1 { +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 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 tbody tr.success > td { + background-color: #dff0d8; } -table .span18 { - float: none; - width: 1404px; - margin-left: 0; +.table tbody tr.error > td { + background-color: #f8f0f0; } -table .span19 { - float: none; - width: 1484px; - margin-left: 0; +.table tbody tr.warning > td { + background-color: #fcf8e3; } -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.info > td { + background-color: #d9edf7; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table-hover tbody tr.error:hover > td { + background-color: #f0dfe0; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } .dropup, .dropdown { @@ -1463,18 +1953,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1483,17 +1966,17 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; + padding: 5px 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1508,35 +1991,71 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu > li > a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + text-decoration: none; + color: #ffffff; + background-color: #2d9342; + background-image: -moz-linear-gradient(top, #2f9b45, #29873c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2f9b45), to(#29873c)); + background-image: -webkit-linear-gradient(top, #2f9b45, #29873c); + background-image: -o-linear-gradient(top, #2f9b45, #29873c); + background-image: linear-gradient(to bottom, #2f9b45, #29873c); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f9b45', endColorstr='#ff29873c', GradientType=0); +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #045b04; + outline: 0; + background-color: #2d9342; + background-image: -moz-linear-gradient(top, #2f9b45, #29873c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2f9b45), to(#29873c)); + background-image: -webkit-linear-gradient(top, #2f9b45, #29873c); + background-image: -o-linear-gradient(top, #2f9b45, #29873c); + background-image: linear-gradient(to bottom, #2f9b45, #29873c); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f9b45', endColorstr='#ff29873c', GradientType=0); +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: default; } .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -1544,7 +2063,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -1552,7 +2071,62 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.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; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + 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-left: 20px; + padding-right: 20px; +} .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1563,8 +2137,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1590,16 +2163,13 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -1607,7 +2177,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -1618,13 +2187,14 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } -.close:hover { +.close:hover, +.close:focus { color: #000000; text-decoration: none; cursor: pointer; @@ -1644,25 +2214,23 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 12px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; + font-size: 14px; + line-height: 20px; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); border-color: #eaeaea #eaeaea #c4c4c4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; @@ -1681,10 +2249,12 @@ button.close { box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, +.btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #eaeaea; *background-color: #dddddd; } @@ -1695,17 +2265,13 @@ button.close { .btn:first-child { *margin-left: 0; } -.btn:hover { +.btn:hover, +.btn:focus { 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; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -1716,8 +2282,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,.15), 0 1px 2px rgba(0,0,0,.05); @@ -1727,7 +2291,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -1736,43 +2299,54 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 15px; - 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: 1px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; } .btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.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: 14px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + 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, @@ -1782,49 +2356,49 @@ button.close { .btn-inverse.active { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn-primary { - background-color: #099f33; - background-image: -moz-linear-gradient(top, #0acf0a, #085871); - background-image: -ms-linear-gradient(top, #0acf0a, #085871); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0acf0a), to(#085871)); - background-image: -webkit-linear-gradient(top, #0acf0a, #085871); - background-image: -o-linear-gradient(top, #0acf0a, #085871); - background-image: linear-gradient(top, #0acf0a, #085871); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #36b24f; + background-image: -moz-linear-gradient(top, #3bc256, #2f9b45); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3bc256), to(#2f9b45)); + background-image: -webkit-linear-gradient(top, #3bc256, #2f9b45); + background-image: -o-linear-gradient(top, #3bc256, #2f9b45); + background-image: linear-gradient(to bottom, #3bc256, #2f9b45); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0acf0a', endColorstr='#085871', GradientType=0); - border-color: #085871 #085871 #03202a; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3bc256', endColorstr='#ff2f9b45', GradientType=0); + border-color: #2f9b45 #2f9b45 #1d602b; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #085871; + *background-color: #2f9b45; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, +.btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #085871; - *background-color: #064559; + color: #ffffff; + background-color: #2f9b45; + *background-color: #29873c; } .btn-primary:active, .btn-primary.active { - background-color: #053341 \9; + background-color: #237434 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); 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); *background-color: #f89406; @@ -1833,10 +2407,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, +.btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -1845,15 +2421,16 @@ button.close { background-color: #c67605 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); 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); *background-color: #bd362f; @@ -1862,10 +2439,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, +.btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -1874,15 +2453,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); 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); *background-color: #51a351; @@ -1891,10 +2471,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, +.btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -1903,15 +2485,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); 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); *background-color: #2f96b4; @@ -1920,10 +2503,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, +.btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -1932,15 +2517,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + 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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); 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); *background-color: #222222; @@ -1949,10 +2535,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, +.btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -1962,8 +2550,8 @@ button.close { } button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { @@ -1985,19 +2573,46 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #2f9b45; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover, +.btn-link:focus { + color: #1d602b; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { + color: #333333; + text-decoration: none; +} .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + *zoom: 1; + font-size: 0; + vertical-align: middle; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2005,24 +2620,38 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } -.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 { + margin-left: 5px; } .btn-group > .btn { position: relative; - float: left; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu, +.btn-group > .popover { + font-size: 14px; +} +.btn-group > .btn-mini { + font-size: 10.5px; +} +.btn-group > .btn-small { + font-size: 11.9px; +} +.btn-group > .btn-large { + font-size: 17.5px; +} .btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; @@ -2069,26 +2698,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2100,7 +2733,7 @@ input[type="submit"].btn.btn-mini { background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #085871; + background-color: #2f9b45; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #f89406; @@ -2118,29 +2751,23 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -2150,45 +2777,95 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +} +.btn-group-vertical { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group-vertical > .btn { + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group-vertical > .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.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 { + -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 { + -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 { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.alert, +.alert h4 { color: #c09853; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #468847; } +.alert-success h4 { + color: #468847; +} .alert-danger, .alert-error { background-color: #f8f0f0; border-color: #c6898b; color: #b55457; } +.alert-danger h4, +.alert-error h4 { + color: #b55457; +} .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #3a87ad; } +.alert-info h4 { + color: #3a87ad; +} .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -2202,25 +2879,29 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} .nav > .pull-right { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2243,18 +2924,20 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #045b04; + background-color: #2f9b45; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2270,6 +2953,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2295,19 +2979,21 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-tabs > li > a:hover { +.nav-tabs > li > a:hover, +.nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: #555555; - background-color: #ffffff; + background-color: #eeeeee; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -2322,9 +3008,10 @@ input[type="submit"].btn.btn-mini { border-radius: 5px; } .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: #ffffff; - background-color: #045b04; + background-color: #2f9b45; } .nav-stacked > li { float: none; @@ -2342,16 +3029,23 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -2362,51 +3056,60 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #045b04; - border-bottom-color: #045b04; +.nav .dropdown-toggle .caret { + border-top-color: #2f9b45; + border-bottom-color: #2f9b45; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #011201; - border-bottom-color: #011201; +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { + border-top-color: #1d602b; + border-bottom-color: #1d602b; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; } -.nav > .dropdown.active > a:hover { - color: #000000; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: #ffffff; background-color: #999999; border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: #999999; } .tabbable { @@ -2416,6 +3119,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2448,12 +3152,14 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below > .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover, +.tabs-below > .nav-tabs > li > a:focus { border-bottom-color: transparent; border-top-color: #ddd; } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, @@ -2477,11 +3183,13 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2496,78 +3204,110 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.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); + *zoom: 1; +} +.navbar-inner:before, +.navbar-inner:after { + display: table; + content: ""; + line-height: 0; +} +.navbar-inner:after { + clear: both; } .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; + overflow: visible; } .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #777777; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .brand:hover, +.navbar .brand:focus { + text-decoration: none; } -.navbar .navbar-text { +.navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #777777; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover, +.navbar-link:focus { + color: #333333; +} +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #f2f2f2; + border-right: 1px solid #ffffff; } .navbar .btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { + margin-top: 0; } .navbar-form { margin-bottom: 0; @@ -2577,6 +3317,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -2588,7 +3329,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -2599,7 +3341,7 @@ input[type="submit"].btn.btn-mini { } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } .navbar-form .input-append input, @@ -2609,44 +3351,28 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; +.navbar-static-top { + position: static; + margin-bottom: 0; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -2657,6 +3383,13 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -2664,6 +3397,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -2671,9 +3405,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); +} .navbar-fixed-bottom { bottom: 0; } +.navbar-fixed-bottom .navbar-inner { + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -2683,51 +3428,36 @@ input[type="submit"].btn.btn-mini { } .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #777777; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; + text-shadow: 0 1px 0 #ffffff; } -.navbar .btn-group { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #ffffff; + color: #333333; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #555555; text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { display: none; @@ -2735,18 +3465,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + 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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + 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); - *background-color: #222222; + *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2755,16 +3486,18 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -2781,7 +3514,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -2792,7 +3525,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -2802,142 +3535,293 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + background-color: #e5e5e5; + color: #555555; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + border-color: #252525; } -.breadcrumb .divider { - padding: 0 5px; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover, +.navbar-inverse .brand:focus, +.navbar-inverse .nav > li > a:focus { + color: #ffffff; } -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); +.navbar-inverse .brand { + color: #999999; } -.pagination li { - display: inline; +.navbar-inverse .navbar-text { + color: #999999; } -.pagination a { +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + background-color: transparent; + color: #ffffff; +} +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover, +.navbar-inverse .navbar-link:focus { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #111111; + border-right-color: #222222; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111111; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > a:hover .caret, +.navbar-inverse .nav li.dropdown > a:focus .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; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + 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-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + 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); + *background-color: #040404; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:focus, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} +.breadcrumb { + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb > li > .divider { + padding: 0 5px; + color: #ccc; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + margin: 20px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -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 ul > li { + display: inline; +} +.pagination ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 34px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination ul > li > a:hover, +.pagination ul > li > a:focus, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a { +.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, +.pagination ul > .disabled > a:focus { color: #999999; background-color: transparent; cursor: default; } -.pagination li:first-child a { +.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-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.pagination li:last-child a { - -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; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -2945,9 +3829,63 @@ input[type="submit"].btn.btn-mini { .pagination-right { 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-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 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-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 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; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 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-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -2956,6 +3894,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -2963,7 +3902,8 @@ input[type="submit"].btn.btn-mini { .pager li { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -2972,34 +3912,27 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 15px; border-radius: 15px; } -.pager a:hover { +.pager li > a:hover, +.pager li > a:focus { 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 > a:focus, +.pager .disabled > span { color: #999999; background-color: #fff; cursor: default; } -.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: 2070; -} .modal-backdrop { position: fixed; top: 0; @@ -3019,12 +3952,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -3040,17 +3972,17 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -3059,7 +3991,12 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { + position: relative; overflow-y: auto; max-height: 400px; padding: 15px; @@ -3085,6 +4022,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3096,13 +4034,16 @@ input[type="submit"].btn.btn-mini { .modal-footer .btn-group .btn + .btn { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -3111,52 +4052,24 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .tooltip.top { - margin-top: -2px; + margin-top: -3px; + padding: 5px 0; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; + padding: 5px 0; } .tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: #ffffff; text-align: center; text-decoration: none; @@ -3169,100 +4082,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; } -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + border-width: 5px 5px 0; + border-top-color: #000000; } -.popover.right .arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + border-width: 5px 5px 5px 0; + border-right-color: #000000; } -.popover.left .arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -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); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + border-width: 5px 0 5px 5px; + border-left-color: #000000; } -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .thumbnails { margin-left: -20px; @@ -3273,6 +4122,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3282,23 +4132,28 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #045b04; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #2f9b45; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -3311,10 +4166,13 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3324,19 +4182,25 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, -a.badge:hover { +a.label:focus, +a.badge:hover, +a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; @@ -3381,9 +4245,18 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; } to { background-position: 0 0; @@ -3423,17 +4296,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', 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); @@ -3443,41 +4315,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', 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); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3490,88 +4364,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -3596,7 +4470,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -3604,47 +4478,47 @@ a.badge:hover { width: 100%; position: relative; } -.carousel .item { +.carousel-inner > .item { display: none; position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > 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%; } .carousel-control { @@ -3671,28 +4545,62 @@ a.badge:hover { left: auto; right: 15px; } -.carousel-control:hover { +.carousel-control:hover, +.carousel-control:focus { color: #ffffff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} +.carousel-indicators .active { + background-color: #fff; +} .carousel-caption { position: absolute; left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .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; @@ -3705,1500 +4613,2030 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; +.hero-unit li { + line-height: 30px; } -.hide { +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; } -.show { - display: block; +.popover.top { + margin-top: -10px; } -.invisible { - visibility: hidden; +.popover.right { + margin-left: 10px; } -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot'); - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; +.popover.bottom { + margin-top: 10px; } -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: FontAwesome; +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; +.popover-title:empty { + display: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: middle; - font-size: 1.3333333333333333em; +.popover-content { + padding: 9px 14px; } -.btn [class^="icon-"], -.nav-tabs [class^="icon-"], -.btn [class*=" icon-"], -.nav-tabs [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -li [class^="icon-"], -li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.popover .arrow { + border-width: 11px; } -li .icon-large:before, -li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; +.popover .arrow:after { + border-width: 10px; + content: ""; } -ul.icons { - list-style-type: none; - margin-left: 2em; - text-indent: -0.8em; +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .8em; +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); } -ul.icons li .icon-large:before, -ul.icons li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - vertical-align: initial; +.popover.right .arrow:after { + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } -.icon-music:before { - content: "\f001"; +.popover.bottom .arrow:after { + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; } -.icon-search:before { - content: "\f002"; +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); } -.icon-envelope:before { - content: "\f003"; +.popover.left .arrow:after { + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; } -.icon-heart:before { - content: "\f004"; +.pull-right { + float: right; } -.icon-star:before { - content: "\f005"; +.pull-left { + float: left; } -.icon-star-empty:before { - content: "\f006"; +.hide { + display: none; } -.icon-user:before { - content: "\f007"; +.show { + display: block; } -.icon-film:before { - content: "\f008"; +.invisible { + visibility: hidden; } -.icon-th-large:before { - content: "\f009"; +.affix { + position: fixed; } -.icon-th:before { - content: "\f00a"; +.tag { + display: inline-block; + margin-bottom: 4px; + color: #111111; + background-color: #f6f6f6; + padding: 1px 10px; + border: 1px solid #dddddd; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.icon-th-list:before { - content: "\f00b"; +a.tag:hover { + text-decoration: none; + color: #fff; + background-color: #3bc256; + border: 1px solid #2f9b45; + -webkit-box-shadow: inset 0 1px 0 #61cf77; + -moz-box-shadow: inset 0 1px 0 #61cf77; + box-shadow: inset 0 1px 0 #61cf77; } -.icon-ok:before { - content: "\f00c"; +.pill { + display: inline-block; + background-color: #6f8890; + color: #ffffff; + padding: 2px 10px 1px 10px; + margin-right: 5px; + font-weight: normal; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-remove:before { - content: "\f00d"; +.pill a { + color: #ffffff; } -.icon-zoom-in:before { - content: "\f00e"; +.pill a.remove { + font-size: 11px; } -.icon-zoom-out:before { - content: "\f010"; +.unstyled { + margin: 0; + list-style: none; } -.icon-off:before { - content: "\f011"; +.simple-item { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-signal:before { - content: "\f012"; +.simple-item:last-of-type { + border-bottom: 0; } -.icon-cog:before { - content: "\f013"; +.simple-list { + *zoom: 1; + margin: 0; + list-style: none; } -.icon-trash:before { - content: "\f014"; +.simple-list:before, +.simple-list:after { + display: table; + content: ""; + line-height: 0; } -.icon-home:before { - content: "\f015"; +.simple-list:after { + clear: both; } -.icon-file:before { - content: "\f016"; +.simple-list > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-time:before { - content: "\f017"; +.simple-list > li:last-of-type { + border-bottom: 0; } -.icon-road:before { - content: "\f018"; +.simple-list .ckan-icon { + position: relative; + top: 0px; } -.icon-download-alt:before { - content: "\f019"; +.module-narrow .simple-list > li { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-download:before { - content: "\f01a"; +.listing li { + text-align: right; + margin-bottom: 5px; } -.icon-upload:before { - content: "\f01b"; +.listing .key { + clear: right; + font-weight: bold; } -.icon-inbox:before { - content: "\f01c"; +.js .tab-content { + display: none; } -.icon-play-circle:before { - content: "\f01d"; +.js .tab-content.active { + display: block; } -.icon-repeat:before { - content: "\f01e"; +.box { + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); } -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; +.module { + margin: 20px 0; } -.icon-list-alt:before { - content: "\f022"; +.module-heading { + *zoom: 1; + margin: 0; + padding: 7px 25px; + font-size: 14px; + line-height: 1.3; + background-color: #f6f6f6; + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } -.icon-lock:before { - content: "\f023"; +.module-heading:before, +.module-heading:after { + display: table; + content: ""; + line-height: 0; } -.icon-flag:before { - content: "\f024"; +.module-heading:after { + clear: both; } -.icon-headphones:before { - content: "\f025"; +.module-heading .action { + float: right; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; } -.icon-volume-off:before { - content: "\f026"; +.module-heading .action:hover { + color: #444444; } -.icon-volume-down:before { - content: "\f027"; +.module-content { + padding: 0 25px; + margin: 20px 0; } -.icon-volume-up:before { - content: "\f028"; +.module-content:first-child { + margin-top: 0; + padding-top: 20px; } -.icon-qrcode:before { - content: "\f029"; +.module-content:last-child { + margin-bottom: 0; + padding-bottom: 20px; } -.icon-barcode:before { - content: "\f02a"; +.module-content > :last-child { + margin-bottom: 0; } -.icon-tag:before { - content: "\f02b"; +.module:first-child .module-heading { + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; + border-top-width: 0; } -.icon-tags:before { - content: "\f02c"; +.module:last-child { + margin-bottom: 20px; } -.icon-book:before { - content: "\f02d"; +.module-footer { + padding: 7px 25px 7px; + margin: 0; + border-top: 1px dotted #dddddd; } -.icon-bookmark:before { - content: "\f02e"; +.module .read-more { + font-weight: bold; + color: #000000; } -.icon-print:before { - content: "\f02f"; +.module .pagination { + height: 34px; + margin-bottom: 0; + border-top: 1px solid #dddddd; } -.icon-camera:before { - content: "\f030"; +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; } -.icon-font:before { - content: "\f031"; +.module .pagination > ul { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: 0; } -.icon-bold:before { - content: "\f032"; +.module .pagination li a { + border-top: none; + border-bottom: none; + padding-top: 7px; + padding-bottom: 7px; } -.icon-italic:before { - content: "\f033"; +.module .pagination li:first-child a, +.module .pagination li:last-child a { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.icon-text-height:before { - content: "\f034"; +.module .pagination li:first-child a { + border-left-width: 0; } -.icon-text-width:before { - content: "\f035"; +.module .pagination li:last-child a { + border-right-width: 0; } -.icon-align-left:before { - content: "\f036"; +.module .pagination li.active a { + border-left-width: 1px; + border-right-width: 1px; } -.icon-align-center:before { - content: "\f037"; +.module-content-shallow { + padding: 0; + margin-top: 10px; + padding-bottom: 10px; } -.icon-align-right:before { - content: "\f038"; +.module h1 { + margin-bottom: 20px; } -.icon-align-justify:before { - content: "\f039"; +.module-shallow .module-content { + padding: 10px; + margin: 0; } -.icon-list:before { - content: "\f03a"; +.module-shallow .module-tags { + margin-top: 0; + margin-bottom: 0; } -.icon-indent-left:before { - content: "\f03b"; +.module-shallow .module-content:first-child { + padding-top: 10px; } -.icon-indent-right:before { - content: "\f03c"; +.module-shallow .module-content:last-child { + padding-bottom: 10px; } -.icon-facetime-video:before { - content: "\f03d"; +.module-narrow .module-heading, +.module-narrow .module-content, +.module-narrow .module-footer { + padding-left: 15px; + padding-right: 15px; } -.icon-picture:before { - content: "\f03e"; +.module-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-pencil:before { - content: "\f040"; +.module-grid:before, +.module-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-map-marker:before { - content: "\f041"; +.module-grid:after { + clear: both; } -.icon-adjust:before { - content: "\f042"; +.module-item { + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + float: left; + margin-left: 20px; + width: 460px; + padding-top: 10px; + padding-bottom: 10px; + padding-right: 50px; + overflow: hidden; + position: relative; } -.icon-tint:before { - content: "\f043"; +.module-item span.count { + color: #999; } -.icon-edit:before { - content: "\f044"; +.module-item .media-image { + margin-bottom: 5px; } -.icon-share:before { - content: "\f045"; +.module-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-check:before { - content: "\f046"; +.module-item:hover { + z-index: 1; } -.icon-move:before { - content: "\f047"; +.module-item:hover .media-edit { + opacity: 1; } -.icon-step-backward:before { - content: "\f048"; +.module-item.first { + clear: left; } -.icon-fast-backward:before { - content: "\f049"; +.group .content img { + margin: 0 -5px 5px; + max-width: initial; } -.icon-backward:before { - content: "\f04a"; +.group .content h3 { + font-size: 14px; + line-height: 1.3; } -.icon-play:before { - content: "\f04b"; +.group-listing { + margin-left: -20px; } -.icon-pause:before { - content: "\f04c"; +.ckanext-datapreview { + position: relative; } -.icon-stop:before { - content: "\f04d"; +.ckanext-datapreview > iframe { + min-height: 400px; } -.icon-forward:before { - content: "\f04e"; +.ckanext-datapreview > img { + max-height: 500px; + max-width: 100%; + overflow: hidden; } -.icon-fast-forward:before { - content: "\f050"; +.package-info h4 { + margin-bottom: 10px; } -.icon-step-forward:before { - content: "\f051"; +.module-resource { + background-color: #ffffff; + border-bottom: 1px solid #dddddd; + margin-top: 0; + margin-bottom: 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.icon-eject:before { - content: "\f052"; +.module-resource .actions { + position: relative; + float: right; + top: -10px; + right: -15px; } -.icon-chevron-left:before { - content: "\f053"; +.module .module-tags { + padding-bottom: 8px; } -.icon-chevron-right:before { - content: "\f054"; +.secondary .module:first-child, +.primary .module:first-child { + margin-top: 0; } -.icon-plus-sign:before { - content: "\f055"; +.no-nav .module:last-child { + margin-top: 0; } -.icon-minus-sign:before { - content: "\f056"; +.module-image { + float: left; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + margin-right: 15px; } -.icon-remove-sign:before { - content: "\f057"; +.module-image img { + max-width: 50px; + max-height: 50px; + vertical-align: middle; } -.icon-ok-sign:before { - content: "\f058"; +.banner { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center; + position: absolute; + top: 15px; + right: -35px; + width: 80px; + color: #ffffff; + background-color: #2f9b45; + padding: 1px 20px; + font-size: 11px; + text-align: center; + text-transform: uppercase; } -.icon-question-sign:before { - content: "\f059"; +.media-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-info-sign:before { - content: "\f05a"; +.media-grid:before, +.media-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-screenshot:before { - content: "\f05b"; +.media-grid:after { + clear: both; } -.icon-remove-circle:before { - content: "\f05c"; +.media-item { + position: relative; + float: left; + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-ok-circle:before { - content: "\f05d"; +.media-item span.count { + color: #999; } -.icon-ban-circle:before { - content: "\f05e"; +.media-item .media-image { + margin-bottom: 5px; } -.icon-arrow-left:before { - content: "\f060"; +.media-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-arrow-right:before { - content: "\f061"; +.media-item:hover { + z-index: 1; } -.icon-arrow-up:before { - content: "\f062"; +.media-item:hover .media-edit { + opacity: 1; } -.icon-arrow-down:before { - content: "\f063"; +.media-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 1px solid #dddddd; + overflow: hidden; + -webkit-transition: all 0.2s ease-in; + -moz-transition: all 0.2s ease-in; + -o-transition: all 0.2s ease-in; + transition: all 0.2s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-share-alt:before { - content: "\f064"; +.media-view:hover, +.media-view.hovered { + border-color: #2f9b45; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); } -.icon-resize-full:before { - content: "\f065"; +.media-view:hover .banner, +.media-view.hovered .banner { + background-color: #2f9b45; } -.icon-resize-small:before { - content: "\f066"; +.media-view span { + display: none; } -.icon-plus:before { - content: "\f067"; +.media-view .banner { + display: block; + background-color: #b7b7b7; + -webkit-transition: background-color 0.2s ease-in; + -moz-transition: background-color 0.2s ease-in; + -o-transition: background-color 0.2s ease-in; + transition: background-color 0.2s ease-in; } -.icon-minus:before { - content: "\f068"; +.media-image { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.icon-asterisk:before { - content: "\f069"; +.media-heading { + font-size: 18px; + line-height: 1.3; + margin: 5px 0; } -.icon-exclamation-sign:before { - content: "\f06a"; +.media-overlay { + position: relative; + min-height: 35px; } -.icon-gift:before { - content: "\f06b"; +.media-overlay .media-heading { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 12px 10px; + margin: 0; + background-color: #000; + background-color: rgba(0, 0, 0, 0.8); + font-size: 13px; + color: #fff; + z-index: 1; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -.icon-leaf:before { - content: "\f06c"; +.media-overlay .media-image { + float: none; + display: block; + margin-right: 0; } -.icon-fire:before { - content: "\f06d"; +.media-item.is-expander .truncator-link { + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; + position: absolute; + z-index: 10; + left: 15px; + bottom: 15px; + opacity: 0; } -.icon-eye-open:before { - content: "\f06e"; +.media-item.is-expander:hover { + padding-bottom: 35px; } -.icon-eye-close:before { - content: "\f070"; +.media-item.is-expander:hover .truncator-link { + opacity: 1; } -.icon-warning-sign:before { - content: "\f071"; +.wide .media-item { + width: 186px; } -.icon-plane:before { - content: "\f072"; +.nav-simple, +.nav-aside { + *zoom: 1; + margin: 0; + list-style: none; + padding-bottom: 0; } -.icon-calendar:before { - content: "\f073"; +.nav-simple:before, +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { + display: table; + content: ""; + line-height: 0; } -.icon-random:before { - content: "\f074"; +.nav-simple:after, +.nav-aside:after { + clear: both; } -.icon-comment:before { - content: "\f075"; +.nav-simple > li, +.nav-aside > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-magnet:before { - content: "\f076"; +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { + border-bottom: 0; } -.icon-chevron-up:before { - content: "\f077"; +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { + position: relative; + top: 0px; } -.icon-chevron-down:before { - content: "\f078"; +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; } -.icon-retweet:before { - content: "\f079"; +.nav-item > a, +.nav-aside li a { + color: #333333; + font-size: 14px; + line-height: 20px; + margin: -7px -25px; + padding: 7px 25px; } -.icon-shopping-cart:before { - content: "\f07a"; +.nav-item.active, +.nav-aside li.active { + background-color: #f6f6f6; } -.icon-folder-close:before { - content: "\f07b"; +.nav-item.active > a, +.nav-aside li.active a { + position: relative; + color: #ffffff; + background-color: #8ca0a6; } -.icon-folder-open:before { - content: "\f07c"; +.nav-item.active > a:hover, +.nav-aside li.active a:hover { + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-vertical:before { - content: "\f07d"; +.nav-item.active > a:before, +.nav-aside li.active a:before { + content: ' '; + position: absolute; + top: 0; + right: -6px; + width: 6px; + height: 34px; + background-image: url("../../../base/images/nav-active.png?1"); } -.icon-resize-horizontal:before { - content: "\f07e"; +.nav-item.active > a span, +.nav-aside li.active a span { + white-space: nowrap; + overflow: hidden; + display: block; } -.icon-bar-chart:before { - content: "\f080"; +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-twitter-sign:before { - content: "\f081"; +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { + position: relative; } -.icon-facebook-sign:before { - content: "\f082"; +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { + padding-left: 42px; + padding-right: 42px; } -.icon-camera-retro:before { - content: "\f083"; +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { + position: absolute; + top: 50%; + left: 15px; + width: 20px; + height: 20px; + margin-top: -10px; + z-index: 2; } -.icon-key:before { - content: "\f084"; +.nav-facet .nav-item > a:hover:after, +.nav-facet .nav-item.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-cogs:before { - content: "\f085"; +.nav-facet .nav-item > a:hover:after { + width: 17px; + height: 17px; + background-position: -17px -16px; } -.icon-comments:before { - content: "\f086"; +.nav-facet .nav-item.active > a:after { + width: 17px; + height: 17px; + background-position: 0px -16px; + right: 3px; } -.icon-thumbs-up:before { - content: "\f087"; +.user-list { + margin: 0; + list-style: none; } -.icon-thumbs-down:before { - content: "\f088"; +.user-list li { + margin: 0 0 10px 0; } -.icon-star-half:before { - content: "\f089"; +.user-list .gravatar { + vertical-align: -4px; + margin-right: 3px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-heart-empty:before { - content: "\f08a"; +.nav-facet-tertiary { + margin: 10px 0; } -.icon-signout:before { - content: "\f08b"; +.nav-facet-tertiary .module-heading { + margin-bottom: 5px; + padding: 8px 12px; + border-bottom-width: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.icon-linkedin-sign:before { - content: "\f08c"; +.nav-facet-tertiary .module-heading i { + display: none; } -.icon-pushpin:before { - content: "\f08d"; +.nav-facet-tertiary .module-footer { + padding: 8px 12px; + border-top-width: 0; } -.icon-external-link:before { - content: "\f08e"; +.nav-facet-tertiary .module-footer a { + font-weight: normal; + color: #8C8C8C; } -.icon-signin:before { - content: "\f090"; +.nav-facet-tertiary .nav { + margin-bottom: 0; } -.icon-trophy:before { - content: "\f091"; +.nav-facet-tertiary .module-content.empty { + padding: 8px 12px; + margin-top: 0; } -.icon-github-sign:before { - content: "\f092"; +.nav-facet-tertiary .nav li.active { + position: relative; } -.icon-upload-alt:before { - content: "\f093"; +.nav-facet-tertiary .nav li.active > a:hover:after, +.nav-facet-tertiary .nav li.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 17px; + height: 17px; + background-position: 0px -16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-lemon:before { - content: "\f094"; +.nav-simple > .nav-btn { + padding-left: 0; + padding-right: 0; + text-align: center; } -.icon-phone:before { - content: "\f095"; +.nav-simple > .nav-btn .btn { + display: inline-block; } -.icon-check-empty:before { - content: "\f096"; +.js .js-hide { + display: none; } -.icon-bookmark-empty:before { - content: "\f097"; +.js .js-hide.active { + display: block; } -.icon-phone-sign:before { - content: "\f098"; +.btn, +label { + font-weight: bold; } -.icon-twitter:before { - content: "\f099"; +.btn-rounded { + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + padding-left: 15px; + padding-right: 15px; } -.icon-facebook:before { - content: "\f09a"; +label { + cursor: pointer; + font-size: 14px; } -.icon-github:before { - content: "\f09b"; +label:after { + content: ":"; } -.icon-unlock:before { - content: "\f09c"; +label.radio:after, +label.checkbox:after { + content: ""; } -.icon-credit-card:before { - content: "\f09d"; +input[type=radio], +input[type=checkbox] { + position: relative; + top: 7px; + padding: 0; + margin: 0; } -.icon-rss:before { - content: "\f09e"; +input[type=radio].checkbox-onown, +input[type=checkbox].checkbox-onown { + top: 0; } -.icon-hdd:before { - content: "\f0a0"; +select { + padding: 4px; } -.icon-bullhorn:before { - content: "\f0a1"; +textarea { + max-width: 100%; } -.icon-bell:before { - content: "\f0a2"; +.control-group .btn { + position: relative; + top: -2px; } -.icon-certificate:before { - content: "\f0a3"; +.control-full input, +.control-full select, +.control-full textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: auto; + width: 100%; } -.icon-hand-right:before { - content: "\f0a4"; +.control-medium input, +.control-medium select, +.control-medium textarea { + width: 320px; } -.icon-hand-left:before { - content: "\f0a5"; +.control-large input, +.control-large .control-label { + font-size: 17.5px; + line-height: 30px; } -.icon-hand-up:before { - content: "\f0a6"; +.control-large input { + height: 41px; } -.icon-hand-down:before { - content: "\f0a7"; +.form-actions { + background: none; + margin-left: -25px; + margin-right: -25px; + margin-bottom: 0; + padding-bottom: 0; + text-align: right; } -.icon-circle-arrow-left:before { - content: "\f0a8"; +.form-actions .action-info { + float: left; + width: 50%; + line-height: 2; + text-align: left; + color: #707070; + margin: 0; } -.icon-circle-arrow-right:before { - content: "\f0a9"; +.form-actions .action-info.small { + font-size: 11px; + line-height: 1.2; } -.icon-circle-arrow-up:before { - content: "\f0aa"; +.form-horizontal .control-label { + width: 120px; } -.icon-circle-arrow-down:before { - content: "\f0ab"; +.form-horizontal .controls { + margin-left: 130px; } -.icon-globe:before { - content: "\f0ac"; +.form-horizontal .info-block { + position: relative; + display: block; + font-size: 11px; + color: #aaaaaa; + line-height: 1.3; + padding: 6px 0 6px 25px; + margin-top: 6px; } -.icon-wrench:before { - content: "\f0ad"; +.form-horizontal .info-help { + padding: 6px 0; } -.icon-tasks:before { - content: "\f0ae"; +.form-horizontal .info-help:before { + display: none; } -.icon-filter:before { - content: "\f0b0"; +.form-horizontal .info-help-tight { + margin-top: -10px; } -.icon-briefcase:before { - content: "\f0b1"; +.form-horizontal .info-inline { + float: right; + width: 265px; + margin-top: 0; + padding-bottom: 0; } -.icon-fullscreen:before { - content: "\f0b2"; +.form-horizontal .control-medium .info-block.info-inline { + width: 165px; } -.icon-group:before { - content: "\f0c0"; +.form-horizontal .info-block:before { + font-size: 2.2em; + position: absolute; + left: 0; + top: 2px; } -.icon-link:before { - content: "\f0c1"; +.form-horizontal .info-inline:before { + top: 8px; } -.icon-cloud:before { - content: "\f0c2"; +.info-block .icon-large, +.info-inline .icon-large { + float: left; + font-size: 22px; + margin-right: 15px; } -.icon-beaker:before { - content: "\f0c3"; +.form-horizontal .info-block a { + color: #aaaaaa; + text-decoration: underline; } -.icon-cut:before { - content: "\f0c4"; +.form-horizontal .form-actions { + padding-left: 25px; + padding-right: 25px; } -.icon-copy:before { - content: "\f0c5"; +.form-inline input { + padding-bottom: 9px; } -.icon-paper-clip:before { - content: "\f0c6"; -} -.icon-save:before { - content: "\f0c7"; +.form-inline select { + margin-top: 0; } -.icon-sign-blank:before { - content: "\f0c8"; +.form-inline .btn { + margin-left: 5px; } -.icon-reorder:before { - content: "\f0c9"; +.form-narrow label { + margin-bottom: 0; } -.icon-list-ul:before { - content: "\f0ca"; +.form-narrow select { + width: 100%; } -.icon-list-ol:before { - content: "\f0cb"; +.form-narrow .form-actions { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px 0; } -.icon-strikethrough:before { - content: "\f0cc"; +.form-select label { + margin-right: 5px; } -.icon-underline:before { - content: "\f0cd"; +.simple-input label, +.simple-input button { + display: none; } -.icon-table:before { - content: "\f0ce"; +.simple-input .field { + position: relative; } -.icon-magic:before { - content: "\f0d0"; +.simple-input .field-bordered { + border-bottom: 1px dotted #dddddd; } -.icon-truck:before { - content: "\f0d1"; +.simple-input .field input { + width: 100%; + height: auto; + margin: 0 -7px; + padding: 7px 5px; } -.icon-pinterest:before { - content: "\f0d2"; +.simple-input .field .btn-search { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + background-position: -51px -16px; + position: absolute; + display: block; + height: 17px; + width: 17px; + top: 50%; + right: 0; + margin-top: -8px; + background-color: transparent; + border: none; + text-indent: -999em; } -.icon-pinterest-sign:before { - content: "\f0d3"; +.editor textarea { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: none; } -.icon-google-plus-sign:before { - content: "\f0d4"; +.editor .editor-info-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + float: none; + padding: 4px 10px; + background: #ebebeb; + width: auto; + border: 1px solid #cccccc; + border-top: none; + font-size: 11px; + color: #282828; } -.icon-google-plus:before { - content: "\f0d5"; +.editor .editor-info-block a { + color: #2f9b45; + text-decoration: none; } -.icon-money:before { - content: "\f0d6"; +.control-custom { + font-size: 0; } -.icon-caret-down:before { - content: "\f0d7"; +.control-custom label { + margin-bottom: 0; } -.icon-caret-up:before { - content: "\f0d8"; +.control-custom input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + width: 140px; } -.icon-caret-left:before { - content: "\f0d9"; +.control-custom input:last-of-type { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } -.icon-caret-right:before { - content: "\f0da"; +.control-custom .checkbox { + display: inline-block; + margin-left: 5px; } -.icon-columns:before { - content: "\f0db"; +.control-custom .checkbox input { + width: auto; } -.icon-sort:before { - content: "\f0dc"; +.control-custom.disabled label, +.control-custom.disabled input { + color: #aaaaaa; + text-decoration: line-through; + text-shadow: none; } -.icon-sort-down:before { - content: "\f0dd"; +.control-custom.disabled input { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f3f3f3; } -.icon-sort-up:before { - content: "\f0de"; +.control-custom.disabled .checkbox { + color: #444444; + text-decoration: none; } -.icon-envelope-alt:before { - content: "\f0e0"; +.control-custom .checkbox.btn { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + position: relative; + top: 0; + left: 5px; + height: 1px; + width: 9px; + padding: 3px 8px; + line-height: 18px; } -.icon-linkedin:before { - content: "\f0e1"; +.control-custom .checkbox.btn span { + display: none; + width: 30px; } -.icon-undo:before { - content: "\f0e2"; +.control-custom .checkbox.btn:before { + position: relative; + top: 1px; + left: -1px; + color: #fff; } -.icon-legal:before { - content: "\f0e3"; +.control-custom .checkbox.btn input { + display: none; } -.icon-dashboard:before { - content: "\f0e4"; +.control-custom.disabled .checkbox.btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #36b24f; + background-image: -moz-linear-gradient(top, #3bc256, #2f9b45); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3bc256), to(#2f9b45)); + background-image: -webkit-linear-gradient(top, #3bc256, #2f9b45); + background-image: -o-linear-gradient(top, #3bc256, #2f9b45); + background-image: linear-gradient(to bottom, #3bc256, #2f9b45); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3bc256', endColorstr='#ff2f9b45', GradientType=0); + border-color: #2f9b45 #2f9b45 #1d602b; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #2f9b45; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.icon-comment-alt:before { - content: "\f0e5"; +.control-custom.disabled .checkbox.btn:hover, +.control-custom.disabled .checkbox.btn:focus, +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active, +.control-custom.disabled .checkbox.btn.disabled, +.control-custom.disabled .checkbox.btn[disabled] { + color: #ffffff; + background-color: #2f9b45; + *background-color: #29873c; } -.icon-comments-alt:before { - content: "\f0e6"; +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active { + background-color: #237434 \9; } -.icon-bolt:before { - content: "\f0e7"; +.control-custom.disabled .checkbox.btn .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.icon-sitemap:before { - content: "\f0e8"; +.alert-danger a, +.alert-error a { + color: #b55457; } -.icon-umbrella:before { - content: "\f0e9"; +.control-group.error input, +.control-group.error select, +.control-group.error textarea, +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { + border-color: #c6898b; } -.icon-paste:before { - content: "\f0ea"; +.error-inline { + color: #b55457; } -.icon-user-md:before { - content: "\f200"; +.error-block, +.error-inline { + font-size: 12px; } -.pill { - background-color: #cccccc; +.error-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + padding: 6px 8px 3px; + background: #c6898b; + margin: -3px 0 0; color: #ffffff; - padding: 1px 5px 1px 8px; - margin-right: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + width: 208px; } -.pill a { - color: #ffffff; +.control-medium .error-block { + width: 318px; } -.pill a.remove { - font-size: 11px; +.control-full .error-block { + width: auto; } -.tag { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; - position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #045b04; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; +.control-group.error .input-prepend .error-block, +.control-custom.error .error-block { + width: auto; } -.tag:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; +.control-custom.error .error-block { + width: 401px; } -.unstyled { - margin: 0; - list-style: none; -} -.simple-item { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; -} -.simple-item:last-of-type { - border-bottom: 0; +.control-select.error .error-block { + width: 196px; } -.simple-list { - *zoom: 1; +.stages { margin: 0; list-style: none; + *zoom: 1; + color: #aeaeae; + counter-reset: stage; + margin: -20px -25px 20px; + overflow: hidden; } -.simple-list:before, -.simple-list:after { +.stages:before, +.stages:after { display: table; content: ""; + line-height: 0; } -.simple-list:after { +.stages:after { clear: both; } -.simple-list > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.stages li { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 27px; + counter-increment: stage; + width: 33.33%; + background-color: #ededed; + float: left; + padding: 10px 20px; + position: relative; + z-index: 0; } -.simple-list > li:last-of-type { - border-bottom: 0; +.stages li:before { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + content: counter(stage); + display: inline-block; + width: 27px; + height: 27px; + margin-right: 5px; + font-weight: bold; + text-align: center; + color: #ffffff; + background-color: #aeaeae; + z-index: 1; } -.simple-list .ckan-icon { - position: relative; - top: 0px; +.stages li:after { + left: 0; + border: solid rgba(237, 237, 237, 0); + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: #ededed; + border-bottom-color: #ededed; + border-width: 29px; + top: 50%; + margin-top: -29px; + margin-left: -30px; } -.module-narrow .simple-list > li { - padding-left: 15px; - padding-right: 15px; +.stages li.last { position: relative; + right: -1px; } -.listing li { - text-align: right; - margin-bottom: 5px; -} -.listing .key { - clear: right; - font-weight: bold; +.stages li.last, +.stages li.last .highlight { + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; } -.js .tab-content { - display: none; +.stages li.first:after { + content: none; + border: none; } -.js .tab-content.active { - display: block; +.stages li.active:after { + border-color: rgba(140, 198, 138, 0); + border-top-color: #8cc68a; + border-bottom-color: #8cc68a; } -.module { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - background-color: #ffffff; - margin-bottom: 20px; +.stages li.complete:after { + border-color: rgba(197, 226, 196, 0); + border-top-color: #c5e2c4; + border-bottom-color: #c5e2c4; } -.module-heading { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - font-size: 14px; - line-height: 1.3; - padding: 7px 25px; - border-bottom: 1px solid #d0d0d0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.stages.stage-3 li.complete:first-child:after { + content: none; } -.module-heading-secondary { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border-top: 1px solid #d0d0d0; +.stages li.active, +.stages li.complete { + background: none; } -.module-heading [class^=icon]:before { - font-size: 1.2em; - line-height: 1; - position: relative; - top: 1px; - margin-right: 0.1em; +.stages li.active:before { + color: #8cc68a; + background: #ffffff; } -.module-heading .action { - float: right; - color: #8c8c8c; - font-size: 11px; - text-decoration: underline; +.stages li.complete:before { + color: #c5e2c4; + background: #eef6ed; } -.module-content { - padding: 0 25px; - margin: 20px 0; +.stages li .highlight { + display: block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + padding: 10px 52px; + border: none; + text-align: left; + text-decoration: none; + line-height: 27px; + z-index: -1; } -.module-content:first-child { - margin-top: 0; - padding-top: 20px; +.stages li.active .highlight { + color: #ffffff; + background: #8cc68a; } -.module-content:last-child { - margin-bottom: 0; - padding-bottom: 20px; +.stages li.complete .highlight { + color: #eef6ed; + background: #c5e2c4; } -.module-content > :last-child { +.alert > :last-child { margin-bottom: 0; } -.module-border-top { - border-top: 1px dotted #cccccc; +.slug-preview { + font-size: 14px; + line-height: 1.5; + margin-top: 5px; + margin-left: 10px; } -.module-border-bottom { - border-bottom: 1px dotted #cccccc; +.slug-preview-value { + background-color: #faedcf; + margin-right: 3px; } -.module-footer { - padding: 7px 25px 7px; - border-top: 1px dotted #cccccc; +.resource-upload-field { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: bottom; } -.module .read-more { - font-weight: bold; - color: #000000; +.resource-upload-field label { + z-index: 0; } -.module .pagination { - height: 34px; - margin-bottom: 0; - border-top: 1px solid #d0d0d0; +.resource-upload-field input { + opacity: 0; + filter: alpha(opacity=0); + position: absolute; + top: 0; + right: 0; + z-index: 1; + margin: 0; + border: solid transparent; + border-width: 100px 0 0 200px; + cursor: pointer; + direction: ltr; + -moz-transform: translate(-300px, 0) scale(4); } -.module .pagination > ul { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0; +.resource-upload-field.loading { + display: inline-block; + background: url("../../../base/images/loading-spinner.gif") no-repeat center right; + padding-right: 5px; } -.module .pagination li a { - border-top: none; - border-bottom: none; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + font-size: 14px; } -.module .pagination li:first-child a, -.module .pagination li:last-child a { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.select2-container-multi .select2-choices .select2-search-field input { + height: 29px; } -.module .pagination li:first-child a { - border-left-width: 0; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + padding-left: 10px; } -.module .pagination li:last-child a { - border-right-width: 0; +.select2-container { + margin-top: 1px; } -.module .pagination li.active a { - border-left-width: 1px; - border-right-width: 1px; +.select2-container-multi { + margin-top: 0; } -.module .action { - text-align: center; +.select2-container-multi .select2-choices .select2-search-choice { + padding: 5px 8px 5px 22px; } -.module-shallow .module-content { - padding: 10px; - margin: 0; +.select2-container-multi.select2-container .select2-choices { + padding-top: 3px; + padding-bottom: 3px; } -.module-shallow .module-content:first-child { - padding-top: 10px; -} -.module-shallow .module-content:last-child { - padding-bottom: 10px; +.select2-search-choice-close, +.select2-container-multi .select2-search-choice-close { + top: 6px; + left: 5px; } -.module-shallow small { - font-size: 11px; - display: block; +.select2-container-multi .select2-choices { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -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); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; } -.module-narrow .module-heading, -.module-narrow .module-content, -.module-narrow .module-footer { - padding-left: 15px; - padding-right: 15px; +.select2-container-active .select2-choices, +.select2-container-multi.select2-container-active .select2-choices { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -.module-grid { - margin: 0; - list-style: none; - margin: 0; - list-style: none; - *zoom: 1; - margin-left: -20px; - padding: 0; +.select2-container-multi .select2-drop { + margin-top: -2px; } -.module-grid:before, -.module-grid:after { - display: table; - content: ""; +.select2-container .select2-results li { + line-height: 18px; + padding-top: 4px; + padding-bottom: 4px; } -.module-grid:after { - clear: both; +.control-full .select2-container { + width: 520px !important; } -.module-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; - float: left; - margin-left: 20px; - width: 460px; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 50px; - overflow: hidden; - position: relative; +.control-group.error .select2-container input:focus, +.control-group.error .select2-container select:focus, +.control-group.error .select2-container textarea:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.module-item.first { - clear: left; +.dataset-item { + border-bottom: 1px dotted #dddddd; + padding-bottom: 20px; + margin-bottom: 20px; } -.group .content img { - margin: 0 -5px 5px; - max-width: initial; +.dataset-item:last-of-type { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } -.group .content h3 { - font-size: 14px; +.dataset-heading { + font-size: 16px; + margin-top: 0; + margin-bottom: 8px; line-height: 1.3; } -.group-listing { - margin-left: -20px; +.dataset-heading a { + color: #333333; } -.ckanext-datapreview { +.dataset-heading .label { position: relative; + top: -1px; } -.ckanext-datapreview > iframe { - min-height: 400px; -} -.ckanext-datapreview > img { - max-height: 500px; - max-width: 100%; - overflow: hidden; +.dataset-private { + margin-right: 10px; + text-transform: uppercase; } -.package-info h4 { - margin-bottom: 10px; +.dataset-private .icon-lock { + width: 9px; } -.media { - position: relative; - overflow: hidden; +.dataset-private.pull-right { + margin-right: 0; } -.media-content > :last-child { - margin-bottom: 0; +.dataset-resources { + margin-top: 8px; } -.media-heading { - font-size: 14px; - line-height: 1.3em; - margin: 5px 0; +.dataset-resources li { + display: inline; } -.media-image, -.media .gravatar { - position: relative; - float: left; - margin-right: 10px; - overflow: hidden; +.dataset-resources li a { + background-color: #aaaaaa; } -.media-image:after { - -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - content: ""; - position: absolute; +.dataset-heading .popular { top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1; } -.media-image img { - display: block; - margin: 0 auto; -} -.media-vertical .media-image, -.media-vertical .media-content { - float: none; - display: block; -} -.media-vertical .media-image { - margin-right: 0; - max-height: 125px; -} -.media-grid, -ul.media-grid, -ol.media-grid { +.resource-list { margin: 0; list-style: none; - *zoom: 1; - margin-left: -20px; + margin: -10px -10px 10px -10px; } -.media-grid:before, -ul.media-grid:before, -ol.media-grid:before, -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - display: table; - content: ""; +.resource-item { + position: relative; + padding: 10px 10px 10px 60px; + margin-bottom: 0px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - clear: both; +.resource-item:hover { + background-color: #eeeeee; } -.media-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; +.resource-item .heading { + color: #000000; + font-size: 14px; + font-weight: bold; } -.media-item.first { - clear: left; +.resource-item .format-label { + position: absolute; + top: 10px; + left: 10px; } -.media-item .media-content { - min-height: 63px; +.resource-item .description { + font-size: 12px; + margin-bottom: 0; } -.related-item.expanded { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #ffffff; - background-color: rgba(255, 255, 255, 0.9); - z-index: 2; +.resource-item .btn-group { + position: absolute; + top: 14px; + right: 10px; } -.media-wide { - padding: 0; +.dataset-resource-form .dataset-form-resource-types { + margin-bottom: 5px; } -.media-wide .media { - float: left; - margin-left: 20px; - width: 460px; +.dataset-form-resource-types .ckan-icon { + position: relative; + top: 3px; } -.media-overlay { +.dataset-form-resource-types .radio { + font-weight: normal; + padding-left: 0; + padding-right: 18px; +} +.dataset-form-resource-types label { position: relative; - min-height: 35px; } -.media-overlay .media-heading { +.dataset-form-resource-types input[type=radio]:checked + label { + font-weight: bold; +} +.dataset-form-resource-types input[type=radio]:checked + label:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 16px; + height: 16px; + background-position: -192px 0; + display: block; + content: ""; position: absolute; + top: auto; left: 0; - right: 0; - bottom: 0; - padding: 12px 10px; + bottom: -12px; +} +.dataset-form-resource-types input[type=radio] { + display: none; +} +.tag-list { margin: 0; - background-color: #000; - background-color: rgba(0, 0, 0, 0.8); - font-size: 13px; - color: #fff; - z-index: 1; + list-style: none; + padding: 10px 10px 5px 10px; } -.media-overlay .media-image { - float: none; - display: block; +.tag-list li { + display: inline-block; + margin-right: 5px; +} +.tag-list li:last-child { margin-right: 0; } -.banner { - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-transform-origin: center center; - -moz-transform-origin: center center; - -ms-transform-origin: center center; - -o-transform-origin: center center; - transform-origin: center center; - position: absolute; - top: 15px; - right: -35px; - width: 80px; - color: #ffffff; - background: #707070; - padding: 1px 20px; - font-size: 11px; - text-align: center; - text-transform: uppercase; +.additional-info td, +.additional-info th { + width: 50%; } -.nav-simple { - *zoom: 1; - margin: 0; - list-style: none; - padding-bottom: 0; +.label[data-format=html], +.label[data-format*=html] { + background-color: #55a1ce; } -.nav-simple:before, -.nav-simple:after { - display: table; - content: ""; +.label[data-format=json], +.label[data-format*=json] { + background-color: #ef7100; } -.nav-simple:after { - clear: both; +.label[data-format=xml], +.label[data-format*=xml] { + background-color: #ef7100; } -.nav-simple > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.label[data-format=text], +.label[data-format*=text] { + background-color: #74cbec; } -.nav-simple > li:last-of-type { - border-bottom: 0; +.label[data-format=csv], +.label[data-format*=csv] { + background-color: #dfb100; } -.nav-simple .ckan-icon { - position: relative; - top: 0px; +.label[data-format=xls], +.label[data-format*=xls] { + background-color: #2db55d; } -.nav-item > a { - color: #333333; - margin: -7px -25px; - padding: 7px 25px; +.label[data-format=zip], +.label[data-format*=zip] { + background-color: #686868; } -.nav-item.active { - background-color: #f2f2f2; +.label[data-format=api], +.label[data-format*=api] { + background-color: #ec96be; } -.nav-item.active > a span { - white-space: nowrap; - overflow: hidden; - display: block; +.label[data-format=pdf], +.label[data-format*=pdf] { + background-color: #e0051e; +} +.label[data-format=rdf], +.label[data-format*=rdf], +.label[data-format*=nquad], +.label[data-format*=ntriples], +.label[data-format*=turtle] { + background-color: #0b4498; } -.nav-item.active > a { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #045b04; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; + margin-bottom: 20px; +} +.search-form .search-input input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; - font-size: 12px; - font-weight: bold; - position: relative; - left: 4px; - margin-left: -25px; - margin-right: -20px; - padding-left: 10px; - padding-right: 0px; - padding: 1px 22px; + margin: 0; + width: 100%; + height: auto; } -.nav-item.active > a:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; +.search-form .search-input button { + cursor: pointer; display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; } -.nav-item [class^=icon] { - font-size: 1.2em; - margin: -1px 0 -1px -1px; +.search-form .search-input button span { + display: none; } -.module-narrow .nav-item > a { - padding-left: 15px; - padding-right: 15px; - position: relative; +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; } -.module-narrow .nav-item.active > a { - padding-left: 12px; - padding-right: 12px; +.search-form .search-input button:hover i { + color: #000000; } -.module-narrow .nav-item.image { - position: relative; +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; } -.module-narrow .nav-item.image > a { - padding-left: 42px; - padding-right: 42px; +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; } -.module-narrow .nav-item.image > img { - position: absolute; - top: 50%; - left: 15px; - width: 20px; - height: 20px; - margin-top: -10px; - z-index: 2; +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; } -.nav-facet .nav-item > a:hover:after, -.nav-facet .nav-item.active > a:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - content: ""; - position: absolute; - top: 50%; - right: 5px; - margin-top: -8px; +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; } -.nav-facet .nav-item > a:hover:after:last-child, -.nav-facet .nav-item.active > a:after:last-child { - *margin-left: 0; +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; } -.nav-facet .nav-item > a:hover:after { - width: 17px; - height: 17px; - background-position: -17px -16px; +.search-form .control-order-by select { + width: 160px; + margin: 0; } -.nav-facet .nav-item.active > a:after { - width: 17px; - height: 17px; - background-position: 0px -16px; - right: 3px; +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; } -.js .js-hide { - display: none; +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; } -.js .js-hide.active { +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { display: block; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; } -.btn, -label { - font-weight: bold; +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; } -label { - cursor: pointer; - font-size: 14px; - line-height: 2; +.tertiary .search-input { + margin-bottom: 10px; } -label:after { - content: ":"; +.group .media-vertical .image { + margin: 0 -5px 5px; } -label.radio:after, -label.checkbox:after { - content: ""; +.group-list:nth-child(odd) { + clear: left; } -input, -textarea, -select, -.uneditable-input { - font-size: 14px; - padding: 8px 10px; +.group-list .module-heading { + padding-top: 15px; + padding-bottom: 15px; } -input[type=radio], -input[type=checkbox] { - position: relative; - top: 7px; - padding: 0; - margin: 0; +.group-list .dataset-content { + min-height: 54px; } -input[type=radio].checkbox-onown, -input[type=checkbox].checkbox-onown { - top: 0; +.group-list .module-heading h3 { + margin-bottom: 2px; } -select { - margin-top: 6px; - padding: 4px; +.group-list .module-heading h3 a { + color: #333333; } -textarea { - max-width: 100%; +.group-list .module-heading .media-image { + overflow: hidden; + max-height: 60px; } -.input-prepend .add-on { - padding: 8px 8px; - font-size: 14px; +.group-list .module-heading .media-image img { + max-width: 85px; } -.control-group .btn { +.toolbar { + *zoom: 1; position: relative; - top: -2px; + margin-bottom: 10px; + padding: 5px 0; } -.control-full input, -.control-full select, -.control-full textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - height: auto; - width: 100%; +.toolbar:before, +.toolbar:after { + display: table; + content: ""; + line-height: 0; } -.control-medium input, -.control-medium select, -.control-medium textarea { - width: 320px; +.toolbar:after { + clear: both; } -.control-large input, -.control-large .control-label { - font-size: 18px; +.page_primary_action { + margin-bottom: 20px; } -.form-actions { - background: none; - margin-left: -25px; - margin-right: -25px; - margin-bottom: 0; - padding-bottom: 0; - text-align: right; -} -.form-actions .action-info { +.toolbar .breadcrumb { + *zoom: 1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + position: relative; float: left; - width: 50%; - line-height: 2; - text-align: left; - color: #707070; margin: 0; + padding: 0; + border: none; + background: none; + font-size: 20px; + line-height: 1.3; } -.form-actions .action-info.small { - font-size: 11px; - line-height: 1.2; +.toolbar .breadcrumb:before, +.toolbar .breadcrumb:after { + display: table; + content: ""; + line-height: 0; } -.form-horizontal .control-label { - width: 120px; - line-height: 1.3; - padding-top: 9px; +.toolbar .breadcrumb:after { + clear: both; } -.form-horizontal .control-large input, -.form-horizontal .control-large .control-label { - font-size: 18px; - line-height: 2; +.toolbar .breadcrumb li:after { + content: " / "; } -.form-horizontal .control-large .control-label { - padding-top: 10px; +.toolbar .breadcrumb li.active:after { + content: ""; } -.form-horizontal .controls { - margin-left: 130px; +.toolbar .breadcrumb li:last-of-type:after { + content: ""; } -.form-horizontal .info-block { - position: relative; - display: block; - font-size: 11px; - color: #aeaeae; - line-height: 1.3; - padding: 6px 0 6px 25px; - margin-top: 6px; +.toolbar .home a { + text-decoration: none; } -.form-horizontal .info-inline { - float: right; - width: 265px; - margin-top: 0; +.toolbar .home span { + display: none; } -.form-horizontal .control-medium .info-block.info-inline { - width: 165px; +.toolbar .breadcrumb a { + color: #505050; } -.form-horizontal .info-block:before { - font-size: 2.2em; +.toolbar .breadcrumb .active a, +.toolbar .breadcrumb a.active { + font-weight: bold; +} +.actions { + margin: 0; + list-style: none; position: absolute; - left: 0; - top: 2px; + top: 10px; + right: 10px; + z-index: 1; } -.form-horizontal .info-inline:before { - top: 8px; +.actions li { + display: inline-block; + margin-right: 5px; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } -.info-block .icon-large, -.info-inline .icon-large { +.actions li:last-of-type { + margin-right: 0; +} +.hide-heading { + display: none; +} +.page-header { + *zoom: 1; + border-bottom: 1px solid #dddddd; + background-color: #f6f6f6; + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; +} +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} +.page-header .nav-tabs { float: left; - font-size: 22px; - margin-right: 15px; + margin-bottom: -1px; } -.form-horizontal .info-block a { - color: #aeaeae; - text-decoration: underline; +.page-header .nav-tabs li.active a, +.page-header .nav-tabs a:hover { + background-color: #ffffff; } -.form-horizontal .form-actions { - padding-left: 25px; - padding-right: 25px; +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; } -.form-inline input { - padding-bottom: 9px; +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.form-inline select { - margin-top: 0; +h1 { + font-size: 28px; } -.form-inline .btn { - margin-left: 5px; +h2 { + font-size: 21px; } -.form-narrow label { - margin-bottom: 0; +h3 { + font-size: 18px; } -.form-narrow select { - width: 100%; +h4 { + font-size: 14px; } -.form-narrow .form-actions { - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px 0; +h1, +h2, +h3, +h4 { + line-height: 1.5; } -.form-select label { - margin-right: 5px; +h1 small, +h2 small, +h3 small, +h4 small { + font-size: 14px; } -.simple-input label, -.simple-input button { - display: none; +.prose h1, +.prose heading-1 h2, +.prose heading-2 { + margin-bottom: 15px; } -.simple-input .field { - position: relative; +.prose h3, +.prose heading-3 { + margin-bottom: 10px; } -.simple-input .field-bordered { - border-bottom: 1px dotted #cccccc; +.table-chunky td, +.table-chunky th { + padding: 12px 15px; + font-size: 12px; } -.simple-input .field input { - width: 100%; - height: auto; - margin: 0 -7px; - padding: 7px 5px; +.table-chunky thead th, +.table-chunky thead td { + color: #ffffff; + background-color: #aaaaaa; + padding-top: 10px; + padding-bottom: 10px; } -.simple-input .field .btn-search { +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { + background-color: transparent; +} +.table-striped tbody tr:nth-child(even) td, +.table-striped tbody tr:nth-child(even) th { + background-color: #f2f2f2; +} +.table-chunky.table-bordered { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topleft: 2px; + border-top-left-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topright: 2px; + border-top-right-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 2px; + -moz-border-radius: 0 0 0 2px; + border-radius: 0 0 0 2px; + -webkit-border-bottom-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + border-bottom-left-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + border-bottom-right-radius: 2px; +} +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.ckan-icon { *margin-right: .3em; display: inline-block; vertical-align: text-bottom; @@ -5209,1524 +6647,1336 @@ textarea { background-image: url("../../../base/images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; - width: 17px; - height: 17px; - background-position: -51px -16px; - position: absolute; - display: block; - height: 17px; - width: 17px; - top: 50%; - right: 0; - margin-top: -8px; - background-color: transparent; - border: none; - text-indent: -999em; } -.simple-input .field .btn-search:last-child { - *margin-left: 0; +.ckan-icon-fb { + width: 16px; + height: 16px; + background-position: 0px 0; } -.editor textarea { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: none; +.ckan-icon-gplus { + width: 16px; + height: 16px; + background-position: -16px 0; } -.editor .editor-info-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - float: none; - padding: 4px 10px; - background: #ebebeb; +.ckan-icon-twitter { + width: 16px; + height: 16px; + background-position: -32px 0; +} +.ckan-icon-email { + width: 16px; + height: 16px; + background-position: -48px 0; +} +.ckan-icon-share { + width: 16px; + height: 16px; + background-position: -64px 0; +} +.ckan-icon-feed { + width: 16px; + height: 16px; + background-position: -80px 0; +} +.ckan-icon-calendar { + width: 16px; + height: 16px; + background-position: -96px 0; +} +.ckan-icon-file { + width: 16px; + height: 16px; + background-position: -112px 0; +} +.ckan-icon-lock { + width: 16px; + height: 16px; + background-position: -128px 0; +} +.ckan-icon-link-file { + width: 16px; + height: 16px; + background-position: -144px 0; +} +.ckan-icon-link-plugin { + width: 16px; + height: 16px; + background-position: -160px 0; +} +.ckan-icon-upload-file { + width: 16px; + height: 16px; + background-position: -176px 0; +} +.ckan-icon-callout { + width: 16px; + height: 16px; + background-position: -192px 0; +} +.ckan-icon-circle-cross { + width: 17px; + height: 17px; + background-position: 0px -16px; +} +.ckan-icon-circle-add { + width: 17px; + height: 17px; + background-position: -17px -16px; +} +.ckan-icon-flame { + width: 17px; + height: 17px; + background-position: -34px -16px; +} +.ckan-icon-search { + width: 17px; + height: 17px; + background-position: -51px -16px; +} +.ckan-icon-large-lock { + width: 20px; + height: 20px; + background-position: 0px -33px; +} +.ckan-icon-photo { + width: 20px; + height: 20px; + background-position: -20px -33px; +} +.ckan-icon-add { + width: 20px; + height: 20px; + background-position: -40px -33px; +} +.ckan-icon-home { + width: 20px; + height: 20px; + background-position: -60px -33px; +} +.ckan-icon-rewind { + width: 20px; + height: 20px; + background-position: -80px -33px; +} +.ckan-icon-tools { + width: 20px; + height: 20px; + background-position: -100px -33px; +} +.ckan-icon-flag { + width: 20px; + height: 20px; + background-position: -120px -33px; +} +.ckan-icon-clipboard { + width: 20px; + height: 20px; + background-position: -140px -33px; +} +.ckan-icon-share { + width: 20px; + height: 20px; + background-position: -160px -33px; +} +.ckan-icon-info { + width: 20px; + height: 20px; + background-position: -180px -33px; +} +.ckan-icon-download { + width: 20px; + height: 20px; + background-position: -200px -33px; +} +.ckan-icon-star { + width: 20px; + height: 20px; + background-position: -220px -33px; +} +.ckan-icon-info-flat { + width: 20px; + height: 20px; + background-position: -240px -33px; +} +.ckan-icon-tag { + width: 20px; + height: 20px; + background-position: -260px -33px; +} +.ckan-icon-plus { + width: 20px; + height: 20px; + background-position: -280px -33px; + width: 16px; +} +.ckan-icon-head { + width: 20px; + height: 20px; + background-position: -300px -33px; +} +.ckan-icon-arrow-e { + width: 20px; + height: 20px; + background-position: -320px -33px; + width: 16px; +} +.ckan-icon-bookmark { + width: 25px; + height: 25px; + background-position: 0px -53px; +} +.format-label { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + text-indent: -900em; + background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +} +.format-label { + width: 32px; + height: 35px; + background-position: 0px -62px; +} +.format-label[data-format=rdf], +.format-label[data-format*=rdf] { + width: 32px; + height: 35px; + background-position: -32px -62px; +} +.format-label[data-format=pdf], +.format-label[data-format*=pdf] { + width: 32px; + height: 35px; + background-position: -64px -62px; +} +.format-label[data-format=api], +.format-label[data-format*=api] { + width: 32px; + height: 35px; + background-position: -96px -62px; +} +.format-label[data-format=zip], +.format-label[data-format*=zip] { + width: 32px; + height: 35px; + background-position: -128px -62px; +} +.format-label[data-format=xls], +.format-label[data-format*=xls] { + width: 32px; + height: 35px; + background-position: -160px -62px; +} +.format-label[data-format=csv], +.format-label[data-format*=csv] { + width: 32px; + height: 35px; + background-position: -192px -62px; +} +.format-label[data-format=txt], +.format-label[data-format*=txt] { + width: 32px; + height: 35px; + background-position: -224px -62px; +} +.format-label[data-format=xml], +.format-label[data-format*=xml] { + width: 32px; + height: 35px; + background-position: -256px -62px; +} +.format-label[data-format=json], +.format-label[data-format*=json] { + width: 32px; + height: 35px; + background-position: -288px -62px; +} +.format-label[data-format=html], +.format-label[data-format*=html] { + width: 32px; + height: 35px; + background-position: -320px -62px; +} +/* This is a modified version of the font-awesome core less document. */ +@font-face { + font-family: 'FontAwesome'; + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + font-weight: normal; + font-style: normal; +} +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + display: inline; width: auto; - border: 1px solid #cccccc; - border-top: none; - font-size: 11px; - color: #282828; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; } -.editor .editor-info-block a { - color: #045b04; - text-decoration: none; +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } -.control-custom { - font-size: 0; +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } -.control-custom label { - margin-bottom: 0; +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } -.control-custom input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - width: 140px; +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } } -.control-custom input:last-of-type { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } } -.control-custom .checkbox { - display: inline-block; - margin-left: 5px; +@-moz-document url-prefix() { + .icon-spin { + height: .9em; + } + .btn .icon-spin { + height: auto; + } + .icon-spin.icon-large { + height: 1.25em; + } + .btn .icon-spin.icon-large { + height: .75em; + } } -.control-custom .checkbox input { - width: auto; +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; } -.control-custom.disabled label, -.control-custom.disabled input { - color: #aaaaaa; - text-decoration: line-through; - text-shadow: none; +.icon-music:before { + content: "\f001"; } -.control-custom.disabled input { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #f3f3f3; +.icon-search:before { + content: "\f002"; } -.control-custom.disabled .checkbox { - color: #4d4d4d; - text-decoration: none; +.icon-envelope:before { + content: "\f003"; } -.control-custom .checkbox.btn { - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - position: relative; - top: 0; - left: 5px; - height: 3px; - width: 8px; - padding: 3px 8px; +.icon-heart:before { + content: "\f004"; } -.control-custom .checkbox.btn span { - display: none; - width: 30px; +.icon-star:before { + content: "\f005"; } -.control-custom .checkbox.btn:before { - position: relative; - top: 1px; - left: -1px; - color: #fff; +.icon-star-empty:before { + content: "\f006"; } -.control-custom .checkbox.btn input { - display: none; +.icon-user:before { + content: "\f007"; } -.control-custom.disabled .checkbox.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #099f33; - background-image: -moz-linear-gradient(top, #0acf0a, #085871); - background-image: -ms-linear-gradient(top, #0acf0a, #085871); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0acf0a), to(#085871)); - background-image: -webkit-linear-gradient(top, #0acf0a, #085871); - background-image: -o-linear-gradient(top, #0acf0a, #085871); - background-image: linear-gradient(top, #0acf0a, #085871); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0acf0a', endColorstr='#085871', GradientType=0); - border-color: #085871 #085871 #03202a; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #085871; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-film:before { + content: "\f008"; } -.control-custom.disabled .checkbox.btn:hover, -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active, -.control-custom.disabled .checkbox.btn.disabled, -.control-custom.disabled .checkbox.btn[disabled] { - background-color: #085871; - *background-color: #064559; +.icon-th-large:before { + content: "\f009"; } -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active { - background-color: #053341 \9; +.icon-th:before { + content: "\f00a"; } -.control-custom.disabled .checkbox.btn .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-th-list:before { + content: "\f00b"; } -.alert-danger a, -.alert-error a { - color: #b55457; +.icon-ok:before { + content: "\f00c"; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea, -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - border-color: #c6898b; +.icon-remove:before { + content: "\f00d"; } -.error-inline { - color: #b55457; +.icon-zoom-in:before { + content: "\f00e"; } -.error-block, -.error-inline { - font-size: 12px; +.icon-zoom-out:before { + content: "\f010"; } -.error-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - padding: 6px 8px 3px; - background: #c6898b; - margin: -3px 0 0; - color: #ffffff; - width: 216px; +.icon-off:before { + content: "\f011"; } -.control-medium .error-block { - width: 326px; +.icon-signal:before { + content: "\f012"; } -.control-full .error-block { - width: auto; +.icon-cog:before { + content: "\f013"; } -.control-group.error .input-prepend .error-block, -.control-custom.error .error-block { - margin-left: -1px; - width: auto; +.icon-trash:before { + content: "\f014"; } -.control-custom.error .error-block { - width: 409px; +.icon-home:before { + content: "\f015"; } -.control-select.error .error-block { - width: 204px; +.icon-file:before { + content: "\f016"; } -.stages { - margin: 0; - list-style: none; - *zoom: 1; - color: #aeaeae; - counter-reset: stage; - margin: -20px -25px 20px; - overflow: hidden; +.icon-time:before { + content: "\f017"; } -.stages:before, -.stages:after { - display: table; - content: ""; +.icon-road:before { + content: "\f018"; } -.stages:after { - clear: both; +.icon-download-alt:before { + content: "\f019"; } -.stages li { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - line-height: 27px; - counter-increment: stage; - width: 33.33%; - background-color: #ededed; - float: left; - padding: 10px 20px; - position: relative; - z-index: 0; +.icon-download:before { + content: "\f01a"; } -.stages li:before { - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; - content: counter(stage); - display: inline-block; - width: 27px; - height: 27px; - margin-right: 5px; - font-weight: bold; - text-align: center; - color: #ffffff; - background-color: #aeaeae; - z-index: 1; +.icon-upload:before { + content: "\f01b"; +} +.icon-inbox:before { + content: "\f01c"; +} +.icon-play-circle:before { + content: "\f01d"; +} +.icon-repeat:before { + content: "\f01e"; +} +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; +} +.icon-list-alt:before { + content: "\f022"; +} +.icon-lock:before { + content: "\f023"; +} +.icon-flag:before { + content: "\f024"; +} +.icon-headphones:before { + content: "\f025"; +} +.icon-volume-off:before { + content: "\f026"; +} +.icon-volume-down:before { + content: "\f027"; +} +.icon-volume-up:before { + content: "\f028"; +} +.icon-qrcode:before { + content: "\f029"; +} +.icon-barcode:before { + content: "\f02a"; } -.stages li:after { - left: 0; - border: solid rgba(237, 237, 237, 0); - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #ededed; - border-bottom-color: #ededed; - border-width: 29px; - top: 50%; - margin-top: -29px; - margin-left: -30px; +.icon-tag:before { + content: "\f02b"; } -.stages li.first, -.stages li.first .highlight { - -webkit-border-radius: 3px 0 0 0; - -moz-border-radius: 3px 0 0 0; - border-radius: 3px 0 0 0; +.icon-tags:before { + content: "\f02c"; } -.stages li.last { - position: relative; - right: -1px; +.icon-book:before { + content: "\f02d"; } -.stages li.last, -.stages li.last .highlight { - -webkit-border-radius: 0 3px 0 0; - -moz-border-radius: 0 3px 0 0; - border-radius: 0 3px 0 0; +.icon-bookmark:before { + content: "\f02e"; } -.stages li.first:after { - content: none; - border: none; +.icon-print:before { + content: "\f02f"; } -.stages li.active:after { - border-color: rgba(140, 198, 138, 0); - border-top-color: #8cc68a; - border-bottom-color: #8cc68a; +.icon-camera:before { + content: "\f030"; } -.stages li.complete:after { - border-color: rgba(197, 226, 196, 0); - border-top-color: #c5e2c4; - border-bottom-color: #c5e2c4; +.icon-font:before { + content: "\f031"; } -.stages.stage-3 li.complete:first-child:after { - content: none; +.icon-bold:before { + content: "\f032"; } -.stages li.active, -.stages li.complete { - background: none; +.icon-italic:before { + content: "\f033"; } -.stages li.active:before { - color: #8cc68a; - background: #ffffff; +.icon-text-height:before { + content: "\f034"; } -.stages li.complete:before { - color: #c5e2c4; - background: #eef6ed; +.icon-text-width:before { + content: "\f035"; } -.stages li .highlight { - display: block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - padding: 10px 52px; - border: none; - text-align: left; - text-decoration: none; - line-height: 27px; - z-index: -1; +.icon-align-left:before { + content: "\f036"; } -.stages li.active .highlight { - color: #ffffff; - background: #8cc68a; +.icon-align-center:before { + content: "\f037"; } -.stages li.complete .highlight { - color: #eef6ed; - background: #c5e2c4; +.icon-align-right:before { + content: "\f038"; } -.alert > :last-child { - margin-bottom: 0; +.icon-align-justify:before { + content: "\f039"; } -.slug-preview { - font-size: 14px; - line-height: 1.5; - margin-top: 5px; - margin-left: 10px; +.icon-list:before { + content: "\f03a"; } -.slug-preview-value { - background-color: #faedcf; - margin-right: 3px; +.icon-indent-left:before { + content: "\f03b"; } -.slug-preview .btn { - padding-top: 3px; - padding-bottom: 3px; +.icon-indent-right:before { + content: "\f03c"; } -.resource-upload-field { - position: relative; - overflow: hidden; - display: inline-block; - vertical-align: bottom; +.icon-facetime-video:before { + content: "\f03d"; } -.resource-upload-field label { - z-index: 0; +.icon-picture:before { + content: "\f03e"; } -.resource-upload-field input { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - right: 0; - z-index: 1; - margin: 0; - border: solid transparent; - border-width: 100px 0 0 200px; - cursor: pointer; - direction: ltr; - -moz-transform: translate(-300px, 0) scale(4); +.icon-pencil:before { + content: "\f040"; } -.resource-upload-field.loading { - display: inline-block; - background: url("../../../base/images/loading-spinner.gif") no-repeat center right; - padding-right: 5px; +.icon-map-marker:before { + content: "\f041"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - font-size: 14px; +.icon-adjust:before { + content: "\f042"; } -.select2-container-multi .select2-choices .select2-search-field input { - height: 29px; +.icon-tint:before { + content: "\f043"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - padding-left: 10px; +.icon-edit:before { + content: "\f044"; } -.select2-container { - margin-top: 5px; +.icon-share:before { + content: "\f045"; } -.select2-container-multi { - margin-top: 0; +.icon-check:before { + content: "\f046"; } -.select2-container-multi .select2-choices .select2-search-choice { - padding: 5px 8px 5px 22px; +.icon-move:before { + content: "\f047"; } -.select2-container-multi.select2-container .select2-choices { - padding-top: 3px; - padding-bottom: 3px; +.icon-step-backward:before { + content: "\f048"; } -.select2-search-choice-close, -.select2-container-multi .select2-search-choice-close { - top: 6px; - left: 5px; +.icon-fast-backward:before { + content: "\f049"; } -.select2-container-multi .select2-choices { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - background-color: #ffffff; - border: 1px solid #cccccc; +.icon-backward:before { + content: "\f04a"; } -.select2-container-active .select2-choices, -.select2-container-multi.select2-container-active .select2-choices { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +.icon-play:before { + content: "\f04b"; } -.select2-container-multi .select2-drop { - margin-top: -2px; +.icon-pause:before { + content: "\f04c"; } -.select2-container .select2-results li { - line-height: 18px; - padding-top: 4px; - padding-bottom: 4px; +.icon-stop:before { + content: "\f04d"; } -.control-full .select2-container { - width: 520px !important; +.icon-forward:before { + content: "\f04e"; } -.dataset-item { - border-bottom: 1px dotted #cccccc; - padding-bottom: 20px; - margin-bottom: 20px; +.icon-fast-forward:before { + content: "\f050"; } -.dataset-item:last-of-type { - border-bottom: none; - margin-bottom: 0; - padding-bottom: 0; +.icon-step-forward:before { + content: "\f051"; } -.dataset-heading { - font-size: 14px; - line-height: 1.3; +.icon-eject:before { + content: "\f052"; } -.dataset-heading a { - color: #333333; +.icon-chevron-left:before { + content: "\f053"; +} +.icon-chevron-right:before { + content: "\f054"; +} +.icon-plus-sign:before { + content: "\f055"; +} +.icon-minus-sign:before { + content: "\f056"; +} +.icon-remove-sign:before { + content: "\f057"; } -.dataset-heading .label { - position: relative; - top: -1px; +.icon-ok-sign:before { + content: "\f058"; } -.dataset-content { - font-size: 12px; +.icon-question-sign:before { + content: "\f059"; } -.dataset-resources { - font-size: 10px; - line-height: 14px; - margin-top: 5px; +.icon-info-sign:before { + content: "\f05a"; } -.dataset-resources li { - display: inline; +.icon-screenshot:before { + content: "\f05b"; } -.dataset-resources li a { - background-color: #aaaaaa; +.icon-remove-circle:before { + content: "\f05c"; } -.dataset-heading .popular { - top: 0; +.icon-ok-circle:before { + content: "\f05d"; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #cccccc; +.icon-ban-circle:before { + content: "\f05e"; } -.results strong { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; +.icon-arrow-left:before { + content: "\f060"; } -.results strong:before { - float: right; - content: " "; - width: 280px; - white-space: pre; +.icon-arrow-right:before { + content: "\f061"; } -.filter-list { - color: #4d4d4d; - font-weight: bold; +.icon-arrow-up:before { + content: "\f062"; } -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; +.icon-arrow-down:before { + content: "\f063"; } -.dataset-search { - position: relative; +.icon-share-alt:before { + content: "\f064"; } -.search-giant { - position: relative; +.icon-resize-full:before { + content: "\f065"; } -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; +.icon-resize-small:before { + content: "\f066"; } -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; +.icon-plus:before { + content: "\f067"; } -.control-order-by { - position: absolute; - bottom: -65px; - right: 0; +.icon-minus:before { + content: "\f068"; } -.control-order-by label, -.control-order-by select { - display: inline; +.icon-asterisk:before { + content: "\f069"; } -.control-order-by select { - width: 160px; +.icon-exclamation-sign:before { + content: "\f06a"; } -.resource-list { - margin: 0; - list-style: none; - margin: -10px -10px 10px -10px; +.icon-gift:before { + content: "\f06b"; } -.resource-item { - position: relative; - padding: 10px 110px 10px 60px; - margin-bottom: 0px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-leaf:before { + content: "\f06c"; } -.resource-item:hover { - background-color: #efefef; +.icon-fire:before { + content: "\f06d"; } -.resource-item .heading { - color: #000000; - font-size: 14px; - font-weight: bold; +.icon-eye-open:before { + content: "\f06e"; } -.resource-item .format-label { - position: absolute; - top: 10px; - left: 10px; +.icon-eye-close:before { + content: "\f070"; } -.resource-item .description { - font-size: 12px; - margin-bottom: 0; +.icon-warning-sign:before { + content: "\f071"; } -.resource-item .btn-group { - position: absolute; - top: 13px; - right: 10px; +.icon-plane:before { + content: "\f072"; } -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; +.icon-calendar:before { + content: "\f073"; } -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; +.icon-random:before { + content: "\f074"; } -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; +.icon-comment:before { + content: "\f075"; } -.dataset-form-resource-types label { - position: relative; +.icon-magnet:before { + content: "\f076"; } -.dataset-form-resource-types input[type=radio]:checked + label { - font-weight: bold; +.icon-chevron-up:before { + content: "\f077"; } -.dataset-form-resource-types input[type=radio]:checked + label:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 16px; - height: 16px; - background-position: -192px 0; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; +.icon-chevron-down:before { + content: "\f078"; } -.dataset-form-resource-types input[type=radio]:checked + label:after:last-child { - *margin-left: 0; +.icon-retweet:before { + content: "\f079"; } -.dataset-form-resource-types input[type=radio] { - display: none; +.icon-shopping-cart:before { + content: "\f07a"; } -.tag-list { - margin: 0; - list-style: none; - padding: 10px; +.icon-folder-close:before { + content: "\f07b"; } -.tag-list li { - display: inline-block; - margin-right: 5px; +.icon-folder-open:before { + content: "\f07c"; } -.tag-list li:last-child { - margin-right: 0; +.icon-resize-vertical:before { + content: "\f07d"; } -.additional-info td, -.additional-info th { - width: 50%; +.icon-resize-horizontal:before { + content: "\f07e"; } -.label[data-format=html], -.label[data-format*=html] { - background-color: #55a1ce; +.icon-bar-chart:before { + content: "\f080"; } -.label[data-format=json], -.label[data-format*=json] { - background-color: #ef7100; +.icon-twitter-sign:before { + content: "\f081"; } -.label[data-format=xml], -.label[data-format*=xml] { - background-color: #ef7100; +.icon-facebook-sign:before { + content: "\f082"; } -.label[data-format=text], -.label[data-format*=text] { - background-color: #74cbec; +.icon-camera-retro:before { + content: "\f083"; } -.label[data-format=csv], -.label[data-format*=csv] { - background-color: #dfb100; +.icon-key:before { + content: "\f084"; } -.label[data-format=xls], -.label[data-format*=xls] { - background-color: #2db55d; +.icon-cogs:before { + content: "\f085"; } -.label[data-format=zip], -.label[data-format*=zip] { - background-color: #686868; +.icon-comments:before { + content: "\f086"; } -.label[data-format=api], -.label[data-format*=api] { - background-color: #ec96be; +.icon-thumbs-up:before { + content: "\f087"; } -.label[data-format=pdf], -.label[data-format*=pdf] { - background-color: #e0051e; +.icon-thumbs-down:before { + content: "\f088"; } -.label[data-format=rdf], -.label[data-format*=rdf], -.label[data-format*=nquad], -.label[data-format*=ntriples], -.label[data-format*=turtle] { - background-color: #0b4498; +.icon-star-half:before { + content: "\f089"; } -.group .media-vertical .image { - margin: 0 -5px 5px; +.icon-heart-empty:before { + content: "\f08a"; } -.group-list:nth-child(odd) { - clear: left; +.icon-signout:before { + content: "\f08b"; } -.group-list .module-heading { - padding-top: 15px; - padding-bottom: 15px; +.icon-linkedin-sign:before { + content: "\f08c"; } -.group-list .dataset-content { - min-height: 54px; +.icon-pushpin:before { + content: "\f08d"; } -.group-list .module-heading h3 { - margin-bottom: 2px; +.icon-external-link:before { + content: "\f08e"; } -.group-list .module-heading h3 a { - color: #333333; +.icon-signin:before { + content: "\f090"; } -.toolbar { - *zoom: 1; - margin-top: -10px; - margin-bottom: 10px; - padding: 5px 0; +.icon-trophy:before { + content: "\f091"; } -.toolbar:before, -.toolbar:after { - display: table; - content: ""; +.icon-github-sign:before { + content: "\f092"; } -.toolbar:after { - clear: both; +.icon-upload-alt:before { + content: "\f093"; } -.toolbar .breadcrumb { - *zoom: 1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - position: relative; - float: left; - margin: 0; - padding: 0; - border: none; - background: none; - font-size: 20px; +.icon-lemon:before { + content: "\f094"; } -.toolbar .breadcrumb:before, -.toolbar .breadcrumb:after { - display: table; - content: ""; +.icon-phone:before { + content: "\f095"; } -.toolbar .breadcrumb:after { - clear: both; +.icon-check-empty:before { + content: "\f096"; } -.toolbar li [class^=icon]:before { - width: auto; +.icon-bookmark-empty:before { + content: "\f097"; } -.toolbar .breadcrumb li:after { - content: " / "; +.icon-phone-sign:before { + content: "\f098"; } -.toolbar .breadcrumb li.active:after { - content: ""; +.icon-twitter:before { + content: "\f099"; } -.toolbar .breadcrumb li:last-of-type:after { - content: ""; +.icon-facebook:before { + content: "\f09a"; } -.toolbar .home a { - text-decoration: none; +.icon-github:before { + content: "\f09b"; } -.toolbar .home span { - display: none; +.icon-unlock:before { + content: "\f09c"; } -.toolbar .breadcrumb a { - color: #505050; - line-height: 28px; +.icon-credit-card:before { + content: "\f09d"; } -.toolbar .breadcrumb .active a { - font-weight: bold; +.icon-rss:before { + content: "\f09e"; } -.toolbar .actions { - margin: 0; - list-style: none; +.icon-hdd:before { + content: "\f0a0"; } -.toolbar .actions li { - display: inline-block; - margin-right: 5px; +.icon-bullhorn:before { + content: "\f0a1"; } -.toolbar .actions li { - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.icon-bell:before { + content: "\f0a2"; } -.toolbar .actions li:last-of-type { - margin-right: 0; +.icon-certificate:before { + content: "\f0a3"; } -.toolbar .btn { - padding: 0 10px 0 8px; - border-color: #b7b7b7; - line-height: 27px; +.icon-hand-right:before { + content: "\f0a4"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - 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); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-hand-left:before { + content: "\f0a5"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-hand-up:before { + content: "\f0a6"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-hand-down:before { + content: "\f0a7"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-circle-arrow-left:before { + content: "\f0a8"; } -.toolbar .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #099f33; - background-image: -moz-linear-gradient(top, #0acf0a, #085871); - background-image: -ms-linear-gradient(top, #0acf0a, #085871); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0acf0a), to(#085871)); - background-image: -webkit-linear-gradient(top, #0acf0a, #085871); - background-image: -o-linear-gradient(top, #0acf0a, #085871); - background-image: linear-gradient(top, #0acf0a, #085871); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0acf0a', endColorstr='#085871', GradientType=0); - border-color: #085871 #085871 #03202a; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #085871; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-circle-arrow-right:before { + content: "\f0a9"; } -.toolbar .btn-primary:hover, -.toolbar .btn-primary:active, -.toolbar .btn-primary.active, -.toolbar .btn-primary.disabled, -.toolbar .btn-primary[disabled] { - background-color: #085871; - *background-color: #064559; +.icon-circle-arrow-up:before { + content: "\f0aa"; } -.toolbar .btn-primary:active, -.toolbar .btn-primary.active { - background-color: #053341 \9; +.icon-circle-arrow-down:before { + content: "\f0ab"; } -.toolbar .btn-primary .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-globe:before { + content: "\f0ac"; } -.toolbar .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - 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); - *background-color: #f89406; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-wrench:before { + content: "\f0ad"; } -.toolbar .btn-warning:hover, -.toolbar .btn-warning:active, -.toolbar .btn-warning.active, -.toolbar .btn-warning.disabled, -.toolbar .btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; +.icon-tasks:before { + content: "\f0ae"; } -.toolbar .btn-warning:active, -.toolbar .btn-warning.active { - background-color: #c67605 \9; +.icon-filter:before { + content: "\f0b0"; } -.toolbar .btn-warning .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-briefcase:before { + content: "\f0b1"; } -.toolbar .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - 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); - *background-color: #bd362f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-fullscreen:before { + content: "\f0b2"; } -.toolbar .btn-danger:hover, -.toolbar .btn-danger:active, -.toolbar .btn-danger.active, -.toolbar .btn-danger.disabled, -.toolbar .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; +.icon-group:before { + content: "\f0c0"; } -.toolbar .btn-danger:active, -.toolbar .btn-danger.active { - background-color: #942a25 \9; +.icon-link:before { + content: "\f0c1"; } -.toolbar .btn-danger .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-cloud:before { + content: "\f0c2"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - 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); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-beaker:before { + content: "\f0c3"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-cut:before { + content: "\f0c4"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-copy:before { + content: "\f0c5"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-paper-clip:before { + content: "\f0c6"; } -.toolbar .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - 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); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-save:before { + content: "\f0c7"; +} +.icon-sign-blank:before { + content: "\f0c8"; } -.toolbar .btn-info:hover, -.toolbar .btn-info:active, -.toolbar .btn-info.active, -.toolbar .btn-info.disabled, -.toolbar .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; +.icon-reorder:before { + content: "\f0c9"; } -.toolbar .btn-info:active, -.toolbar .btn-info.active { - background-color: #24748c \9; +.icon-list-ul:before { + content: "\f0ca"; } -.toolbar .btn-info .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-list-ol:before { + content: "\f0cb"; } -.toolbar .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - 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); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-strikethrough:before { + content: "\f0cc"; } -.toolbar .btn-inverse:hover, -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active, -.toolbar .btn-inverse.disabled, -.toolbar .btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; +.icon-underline:before { + content: "\f0cd"; } -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active { - background-color: #080808 \9; +.icon-table:before { + content: "\f0ce"; } -.toolbar .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-magic:before { + content: "\f0d0"; } -.hide-heading { - display: none; +.icon-truck:before { + content: "\f0d1"; } -.page-header { - position: relative; - border-bottom: 1px solid #d0d0d0; - height: 30px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.icon-pinterest:before { + content: "\f0d2"; } -.page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; +.icon-pinterest-sign:before { + content: "\f0d3"; } -.page-header .nav-tabs i { - margin-right: 10px; - font-size: 14px; +.icon-google-plus-sign:before { + content: "\f0d4"; } -.page-header .nav-tabs a:hover { - background-color: #ffffff; +.icon-google-plus:before { + content: "\f0d5"; } -.prose h1, -.prose heading-1 h2, -.prose heading-2 { - margin-bottom: 15px; +.icon-money:before { + content: "\f0d6"; } -.prose h3, -.prose heading-3 { - margin-bottom: 10px; +.icon-caret-down:before { + content: "\f0d7"; } -.table-chunky td, -.table-chunky th { - padding: 12px 15px; - font-size: 12px; +.icon-caret-up:before { + content: "\f0d8"; } -.table-chunky thead th, -.table-chunky thead td { - color: #ffffff; - background-color: #aaaaaa; - padding-top: 10px; - padding-bottom: 10px; +.icon-caret-left:before { + content: "\f0d9"; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: transparent; +.icon-caret-right:before { + content: "\f0da"; } -.table-striped tbody tr:nth-child(even) td, -.table-striped tbody tr:nth-child(even) th { - background-color: #f2f2f2; +.icon-columns:before { + content: "\f0db"; } -.table-chunky.table-bordered { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-sort:before { + content: "\f0dc"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; +.icon-sort-down:before { + content: "\f0dd"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +.icon-sort-up:before { + content: "\f0de"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 2px; - -moz-border-radius: 0 0 0 2px; - border-radius: 0 0 0 2px; - -webkit-border-bottom-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - border-bottom-left-radius: 2px; +.icon-envelope-alt:before { + content: "\f0e0"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - border-bottom-right-radius: 2px; +.icon-linkedin:before { + content: "\f0e1"; } -.ckan-icon { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; +.icon-undo:before { + content: "\f0e2"; } -.ckan-icon:last-child { - *margin-left: 0; +.icon-legal:before { + content: "\f0e3"; } -.ckan-icon-fb { - width: 16px; - height: 16px; - background-position: 0px 0; +.icon-dashboard:before { + content: "\f0e4"; } -.ckan-icon-gplus { - width: 16px; - height: 16px; - background-position: -16px 0; +.icon-comment-alt:before { + content: "\f0e5"; } -.ckan-icon-twitter { - width: 16px; - height: 16px; - background-position: -32px 0; +.icon-comments-alt:before { + content: "\f0e6"; } -.ckan-icon-email { - width: 16px; - height: 16px; - background-position: -48px 0; +.icon-bolt:before { + content: "\f0e7"; } -.ckan-icon-share { - width: 16px; - height: 16px; - background-position: -64px 0; +.icon-sitemap:before { + content: "\f0e8"; } -.ckan-icon-feed { - width: 16px; - height: 16px; - background-position: -80px 0; +.icon-umbrella:before { + content: "\f0e9"; } -.ckan-icon-calendar { - width: 16px; - height: 16px; - background-position: -96px 0; +.icon-paste:before { + content: "\f0ea"; } -.ckan-icon-file { - width: 16px; - height: 16px; - background-position: -112px 0; +.icon-lightbulb:before { + content: "\f0eb"; } -.ckan-icon-lock { - width: 16px; - height: 16px; - background-position: -128px 0; +.icon-exchange:before { + content: "\f0ec"; } -.ckan-icon-link-file { - width: 16px; - height: 16px; - background-position: -144px 0; +.icon-cloud-download:before { + content: "\f0ed"; } -.ckan-icon-link-plugin { - width: 16px; - height: 16px; - background-position: -160px 0; +.icon-cloud-upload:before { + content: "\f0ee"; } -.ckan-icon-upload-file { - width: 16px; - height: 16px; - background-position: -176px 0; +.icon-user-md:before { + content: "\f0f0"; } -.ckan-icon-callout { - width: 16px; - height: 16px; - background-position: -192px 0; +.icon-stethoscope:before { + content: "\f0f1"; } -.ckan-icon-circle-cross { - width: 17px; - height: 17px; - background-position: 0px -16px; +.icon-suitcase:before { + content: "\f0f2"; } -.ckan-icon-circle-add { - width: 17px; - height: 17px; - background-position: -17px -16px; +.icon-bell-alt:before { + content: "\f0f3"; } -.ckan-icon-flame { - width: 17px; - height: 17px; - background-position: -34px -16px; +.icon-coffee:before { + content: "\f0f4"; } -.ckan-icon-search { - width: 17px; - height: 17px; - background-position: -51px -16px; +.icon-food:before { + content: "\f0f5"; } -.ckan-icon-large-lock { - width: 20px; - height: 20px; - background-position: 0px -33px; +.icon-file-alt:before { + content: "\f0f6"; } -.ckan-icon-photo { - width: 20px; - height: 20px; - background-position: -20px -33px; +.icon-building:before { + content: "\f0f7"; } -.ckan-icon-add { - width: 20px; - height: 20px; - background-position: -40px -33px; +.icon-hospital:before { + content: "\f0f8"; } -.ckan-icon-home { - width: 20px; - height: 20px; - background-position: -60px -33px; +.icon-ambulance:before { + content: "\f0f9"; } -.ckan-icon-rewind { - width: 20px; - height: 20px; - background-position: -80px -33px; +.icon-medkit:before { + content: "\f0fa"; +} +.icon-fighter-jet:before { + content: "\f0fb"; +} +.icon-beer:before { + content: "\f0fc"; +} +.icon-h-sign:before { + content: "\f0fd"; +} +.icon-plus-sign-alt:before { + content: "\f0fe"; } -.ckan-icon-tools { - width: 20px; - height: 20px; - background-position: -100px -33px; +.icon-double-angle-left:before { + content: "\f100"; } -.ckan-icon-flag { - width: 20px; - height: 20px; - background-position: -120px -33px; +.icon-double-angle-right:before { + content: "\f101"; } -.ckan-icon-clipboard { - width: 20px; - height: 20px; - background-position: -140px -33px; +.icon-double-angle-up:before { + content: "\f102"; } -.ckan-icon-share { - width: 20px; - height: 20px; - background-position: -160px -33px; +.icon-double-angle-down:before { + content: "\f103"; } -.ckan-icon-info { - width: 20px; - height: 20px; - background-position: -180px -33px; +.icon-angle-left:before { + content: "\f104"; } -.ckan-icon-download { - width: 20px; - height: 20px; - background-position: -200px -33px; +.icon-angle-right:before { + content: "\f105"; } -.ckan-icon-star { - width: 20px; - height: 20px; - background-position: -220px -33px; +.icon-angle-up:before { + content: "\f106"; } -.ckan-icon-info-flat { - width: 20px; - height: 20px; - background-position: -240px -33px; +.icon-angle-down:before { + content: "\f107"; } -.ckan-icon-tag { - width: 20px; - height: 20px; - background-position: -260px -33px; +.icon-desktop:before { + content: "\f108"; } -.ckan-icon-plus { - width: 20px; - height: 20px; - background-position: -280px -33px; - width: 16px; +.icon-laptop:before { + content: "\f109"; } -.ckan-icon-head { - width: 20px; - height: 20px; - background-position: -300px -33px; +.icon-tablet:before { + content: "\f10a"; } -.ckan-icon-arrow-e { - width: 20px; - height: 20px; - background-position: -320px -33px; - width: 16px; +.icon-mobile-phone:before { + content: "\f10b"; } -.ckan-icon-bookmark { - width: 25px; - height: 25px; - background-position: 0px -53px; +.icon-circle-blank:before { + content: "\f10c"; } -.format-label { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - text-indent: -900em; - background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +.icon-quote-left:before { + content: "\f10d"; } -.format-label:last-child { - *margin-left: 0; +.icon-quote-right:before { + content: "\f10e"; } -.format-label { - width: 32px; - height: 35px; - background-position: 0px -62px; +.icon-spinner:before { + content: "\f110"; } -.format-label[data-format=rdf], -.format-label[data-format*=rdf] { - width: 32px; - height: 35px; - background-position: -32px -62px; +.icon-circle:before { + content: "\f111"; } -.format-label[data-format=pdf], -.format-label[data-format*=pdf] { - width: 32px; - height: 35px; - background-position: -64px -62px; +.icon-reply:before { + content: "\f112"; } -.format-label[data-format=api], -.format-label[data-format*=api] { - width: 32px; - height: 35px; - background-position: -96px -62px; +.icon-github-alt:before { + content: "\f113"; } -.format-label[data-format=zip], -.format-label[data-format*=zip] { - width: 32px; - height: 35px; - background-position: -128px -62px; +.icon-folder-close-alt:before { + content: "\f114"; } -.format-label[data-format=xls], -.format-label[data-format*=xls] { - width: 32px; - height: 35px; - background-position: -160px -62px; +.icon-folder-open-alt:before { + content: "\f115"; } -.format-label[data-format=csv], -.format-label[data-format*=csv] { - width: 32px; - height: 35px; - background-position: -192px -62px; +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + text-align: right; + font-size: 14px; + line-height: 1; + width: 14px; } -.format-label[data-format=txt], -.format-label[data-format*=txt] { - width: 32px; - height: 35px; - background-position: -224px -62px; +.btn [class^="icon-"], +.nav [class^="icon-"], +.module-heading [class^="icon-"], +.dropdown [class^="icon-"], +.btn [class*=" icon-"], +.nav [class*=" icon-"], +.module-heading [class*=" icon-"], +.dropdown [class*=" icon-"] { + margin-right: 4px; } -.format-label[data-format=xml], -.format-label[data-format*=xml] { - width: 32px; - height: 35px; - background-position: -256px -62px; +.info-block [class^="icon-"], +.info-block [class*=" icon-"] { + float: left; + font-size: 28px; + width: 28px; + margin-right: 5px; + margin-top: 2px; } -.format-label[data-format=json], -.format-label[data-format*=json] { - width: 32px; - height: 35px; - background-position: -288px -62px; +.breadcrumb .home .icon-home { + font-size: 24px; + width: 24px; + vertical-align: -1px; } -.format-label[data-format=html], -.format-label[data-format*=html] { - width: 32px; - height: 35px; - background-position: -320px -62px; +.info-block-small [class^="icon-"], +.info-block-small [class*=" icon-"] { + font-size: 14px; + width: 14px; + margin-top: 1px; } -li [class^="icon-"], -li [class*=" icon-"] { - width: auto; +.wrapper { + *zoom: 1; + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + position: relative; + background: #ffffff url("../../../base/images/nav.png") 0 0 repeat-y; + margin-bottom: 20px; } -li .icon-large:before, -li .icon-large:before { - width: auto; +.wrapper:before, +.wrapper:after { + display: table; + content: ""; + line-height: 0; +} +.wrapper:after { + clear: both; +} +.wrapper.no-nav { + background-image: none; } [role=main], .main { position: relative; - padding-top: 27px; - padding-bottom: 27px; - background-color: #efefef; + padding-top: 10px; + padding-bottom: 20px; + background: #eeeeee url("../../../base/images/bg.png"); } [role=main] { min-height: 350px; } .main:after, -.main:before, -[role=main]:after, -[role=main]:before { - content: ""; - position: absolute; - left: 0; - right: 0; - height: 7px; - background: #ffffff; - border-color: #c9c9c9; - border-style: solid; - border-width: 0; -} -.main:before, -[role=main]:before { - top: 0; - border-bottom-width: 1px; -} -.main:after, [role=main]:after { bottom: 0; border-top-width: 1px; } [role=main] .primary { - float: left; - margin-left: 20px; - width: 700px; + width: 717px; float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; float: left; } -.primary > :last-child, -.secondary > :last-child { - margin-bottom: 0; +.primary > :last-child, +.secondary > :last-child { + margin-bottom: 0; +} +.primary .primary { + float: left; + width: 467px; + margin-left: 0; + margin-bottom: 20px; +} +.primary .primary h1:first-child, +.primary .primary h2:first-child, +.primary .primary h3:first-child, +.primary .primary h4:first-child { + margin-top: 0; +} +.primary .tertiary { + float: left; + width: 180px; + margin-left: 20px; + margin-bottom: 20px; +} +.hero { + background: url("../../../base/images/background-tile.png"); +} +.hero:after { + background-color: rgba(0, 0, 0, 0.09); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-repeat: repeat-x; + background-color: #f6f6f6; + border-bottom: 1px solid #d0d0d0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + -moz-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); +} +.hero:after .back:hover { + text-decoration: none; +} +.hero:after .back:hover span { + text-decoration: underline; +} +.context-info .module-content { + padding: 15px; +} +.context-info .image { + margin-bottom: 10px; +} +.context-info .image img, +.context-info .image a { + display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.context-info p { + overflow: auto; +} +.context-info code { + display: block; + font-weight: normal; + padding: 0; + margin: 0; + overflow: auto; +} +.context-info h1.heading { + margin: 0 0 5px 0; + font-size: 18px; + line-height: 1.3; +} +.context-info .info { + margin-top: 15px; + padding-top: 10px; + border-top: 1px dotted #DDD; +} +.context-info .info dl dd { + margin-top: 3px; + margin-left: 0; +} +.context-info .nums { + *zoom: 1; + margin-top: 15px; + padding-top: 10px; + padding-bottom: 0; + border-top: 1px dotted #DDD; +} +.context-info .nums:before, +.context-info .nums:after { + display: table; + content: ""; + line-height: 0; +} +.context-info .nums:after { + clear: both; +} +.context-info .nums dl { + float: left; + width: 50%; + margin: 5px 0 0 0; + color: #444444; +} +.context-info .nums dl dt { + display: block; + font-size: 13px; + font-weight: 300; +} +.context-info .nums dl dd { + display: block; + font-size: 30px; + font-weight: 700; + line-height: 36px; + margin-left: 0; +} +.context-info .nums dl dd .smallest { + font-size: 13px; +} +.context-info .nums dl dd .smaller { + font-size: 16px; } -.hero { - background: url("../../../base/images/background-tile.png"); +.context-info .nums dl dd .small { + font-size: 21px; } -.hero:after { - background-color: rgba(0, 0, 0, 0.09); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-repeat: repeat-x; - background-color: transparent; - top: 7px; - bottom: auto; - height: 5px; +.context-info .follow_button { + margin-top: 15px; +} +.context-info.editing .module-content { + margin-top: 0; } .hero { - padding-bottom: 0; + background: url("../../../base/images/background-tile.png"); + padding: 20px 0; min-height: 0; } .hero > .container { position: relative; padding-bottom: 0; } -.hero-primary, -.hero-secondary { - float: left; - margin-left: 20px; - width: 460px; -} -.hero-primary { - margin-left: 0; -} -.hero-primary { - margin-left: 0; - margin-bottom: 0; -} -.hero-secondary { - position: absolute; - bottom: 0; - right: 0; -} -.hero-secondary-inner { - bottom: 0; - left: 0; - right: 0; -} -.hero .module-popup { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - margin-top: 50px; +.hero .search-giant { + margin-bottom: 10px; } -.hero .module-popup .module-content { - padding-bottom: 2px; +.hero .search-giant input { + border-color: #003f52; } .hero .page-heading { font-size: 18px; @@ -6734,290 +7984,339 @@ li .icon-large:before { } .hero .module-dark { padding: 5px; - margin-bottom: 10px; + margin-bottom: 0; color: #ffffff; background: #ffffff; } .hero .module-dark .module-content { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - background-color: #068106; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + background-color: #2f9b45; + border-bottom: none; } .hero .module-dark .module-content .heading { + margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { - margin-bottom: 9px; -} -.hero .tags .tag, -.hero .tags .tag-list { - display: inline-block; -} -.hero .tags .tag-list { - padding: 0; -} -.hero .tags .tag { - margin-right: 15px; -} -header.masthead { *zoom: 1; - color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #079107; - background-image: -moz-linear-gradient(top, #068106, #08a808); - background-image: -ms-linear-gradient(top, #068106, #08a808); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#068106), to(#08a808)); - background-image: -webkit-linear-gradient(top, #068106, #08a808); - background-image: -o-linear-gradient(top, #068106, #08a808); - background-image: linear-gradient(top, #068106, #08a808); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#068106', endColorstr='#08a808', GradientType=0); + padding: 5px 10px 10px 10px; + background-color: #237434; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -header.masthead:before, -header.masthead:after { +.hero .tags:before, +.hero .tags:after { display: table; content: ""; + line-height: 0; } -header.masthead:after { +.hero .tags:after { clear: both; } -header.masthead .container { - position: relative; +.hero .tags h3, +.hero .tags .tag { + display: block; + float: left; + margin: 5px 10px 0 0; } -header.masthead a { - color: #ffffff; +.hero .tags h3 { + font-size: 14px; + line-height: 20px; + padding: 2px 8px; } -header.masthead hgroup h1, -header.masthead hgroup h2 { +.hero-primary, +.hero-secondary { float: left; - font-size: 34px; - line-height: 1.5; -} -header.masthead hgroup h1 { - font-weight: 900; - letter-spacing: -1px; + margin-left: 20px; + width: 460px; } -header.masthead hgroup h2 { - position: absolute; - bottom: -3px; - left: 0; - margin: 0; - font-size: 15px; - font-weight: normal; - line-height: 1.2; - white-space: nowrap; +.hero-primary { + margin-left: 0; + margin-bottom: 0; } -header.masthead .content { +.hero-secondary { position: absolute; - top: 10px; + bottom: 0; right: 0; } -header.masthead .section { - float: left; +.hero-secondary .hero-secondary-inner { + bottom: 0; + left: 0; + right: 0; } -header.masthead .navigation { - margin-right: 20px; +.main.homepage { + padding-top: 20px; + padding-bottom: 20px; + border-top: 1px solid #cccccc; } -header.masthead .navigation ul.unstyled { - *zoom: 1; - margin: 5px 0; +.main.homepage .module-heading .media-image { + margin-right: 15px; + max-height: 53px; + -webkit-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); } -header.masthead .navigation ul.unstyled:before, -header.masthead .navigation ul.unstyled:after { - display: table; - content: ""; +.main.homepage .group-listing .box { + min-height: 275px; } -header.masthead .navigation ul.unstyled:after { - clear: both; +.main.homepage .group-list { + margin-bottom: 0; } -header.masthead .navigation ul.unstyled li { - display: block; - float: left; +.main.homepage .group-list .dataset-content { + min-height: 70px; } -header.masthead .navigation ul.unstyled li a { - display: block; - font-size: 12px; - font-weight: bold; - padding: 4px 10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.main.homepage .box .module { + margin-top: 0; } -header.masthead .navigation ul.unstyled li a.active { - background-color: #128712; - box-shadow: 0 -1px 0 #0c5a0c, 0 1px 0 #2b942b; +.account-masthead { + *zoom: 1; + min-height: 30px; + color: #ffffff; + background: #237434 url("../../../base/images/bg.png"); } -header.masthead .site-search { - margin: 3px 0; +.account-masthead:before, +.account-masthead:after { + display: table; + content: ""; + line-height: 0; } -header.masthead .site-search input { - width: 190px; - font-size: 11px; - padding: 4px; +.account-masthead:after { + clear: both; } -header.masthead .account { - background: #079007; - padding: 3px 5px; - margin: 2px 0 2px 30px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 2px 4px #067706; - -moz-box-shadow: inset 0 2px 4px #067706; - box-shadow: inset 0 2px 4px #067706; +.account-masthead .account { + float: right; } -header.masthead .account ul.unstyled { +.account-masthead .account ul { *zoom: 1; } -header.masthead .account ul.unstyled:before, -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:before, +.account-masthead .account ul:after { display: table; content: ""; + line-height: 0; } -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:after { clear: both; } -header.masthead .account ul.unstyled li { +.account-masthead .account ul li { display: block; float: left; + border-left: 1px solid #1d602b; } -header.masthead .account ul.unstyled li a { +.account-masthead .account ul li a { display: block; - font-size: 12px; + color: #cbe6d1; + font-size: 13px; font-weight: bold; - padding: 4px 10px; + padding: 0 10px; + line-height: 31px; +} +.account-masthead .account ul li a span.username { + margin: 0 2px 0 4px; } -header.masthead .account ul.unstyled li a.sub { +.account-masthead .account ul li a:hover { + color: #e0f0e3; + background-color: #1d602b; + text-decoration: none; +} +.account-masthead .account ul li a.sub { font-weight: 300; - border-left: 1px solid #067706; } -header.masthead .account .dropdown { - float: left; +.account-masthead .account ul li a .btn { + vertical-align: 1px; + margin-left: 3px; } -header.masthead .account .button { - display: block; - text-decoration: none; - background-color: #068106; - color: #83c083; - text-shadow: 0 1px 1px #045004; +.account-masthead .account .notifications a span { + font-size: 12px; + margin-left: 3px; + padding: 1px 6px; + background-color: #1d602b; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 #079907; - -moz-box-shadow: inset 0 1px 0 #079907; - box-shadow: inset 0 1px 0 #079907; } -header.masthead .account .image { - margin: 2px 0; - padding: 0 4px 0 0; - overflow: hidden; - font-size: 10px; +.account-masthead .account .notifications a:hover span { + color: #ffffff; + background-color: #174d22; +} +.account-masthead .account .notifications.notifications-important a span { + color: #ffffff; + background-color: #c9403a; +} +.account-masthead .account.authed .image { + padding: 0 6px; +} +.account-masthead .account.authed .image img { + vertical-align: -6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -header.masthead .account .image i { - vertical-align: -1px; +.masthead { + *zoom: 1; + min-height: 55px; + color: #ffffff; + background: #2f9b45 url("../../../base/images/bg.png"); } -header.masthead .account .image img { - opacity: 0.7; - border-right: 1px solid #08a808; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.masthead:before, +.masthead:after { + display: table; + content: ""; + line-height: 0; +} +.masthead:after { + clear: both; } -header.masthead .account .notifications { - padding: 4px 8px 3px 8px; - margin: 2px 5px 2px 0; +.masthead .container { + position: relative; } -header.masthead .account .notifications.notifications-important { +.masthead a { color: #ffffff; - background-color: #c9403a; - text-shadow: 0 1px 1px #a3322d; - -webkit-box-shadow: inset 0 1px 0 #ce534e; - -moz-box-shadow: inset 0 1px 0 #ce534e; - box-shadow: inset 0 1px 0 #ce534e; } -header.masthead .account .dropdown.open .image img, -header.masthead .account .dropdown .image:hover img { - opacity: 1; - border-right-color: #0ad90a; +.masthead hgroup h1, +.masthead hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; } -header.masthead .account .dropdown.open .button, -header.masthead .account .dropdown .button:hover { - color: #ffffff; - background-color: #6ab36a; - -webkit-box-shadow: inset 0 1px 0 #83c083; - -moz-box-shadow: inset 0 1px 0 #83c083; - box-shadow: inset 0 1px 0 #83c083; - text-decoration: none; +.masthead hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.masthead hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; } -header.masthead .account .dropdown.open .notifications-important, -header.masthead .account .dropdown .notifications-important:hover { - background-color: #d46762; - text-shadow: 0 1px 1px #c9403a; - -webkit-box-shadow: inset 0 1px 0 #d97a76; - -moz-box-shadow: inset 0 1px 0 #d97a76; - box-shadow: inset 0 1px 0 #d97a76; +.masthead .content { + position: absolute; + top: 10px; + right: 0; } -header.masthead .account.authed { - margin: 0 0 0 30px; +.masthead .section { + float: left; } -header.masthead .account.not-authed { - padding-top: 2px; - padding-bottom: 2px; +.masthead input[type="text"] { + border-color: #29873c; } -header.masthead .dropdown-menu { - margin-top: -1px; +.masthead .navigation { + margin-right: 20px; } -header.masthead .user-dropdown-menu a { - color: #068106; +.masthead .navigation .nav-pills { + margin-bottom: 0; } -header.masthead .user-dropdown-menu a:hover { - color: #ffffff; +.masthead .navigation .nav-pills li a:hover, +.masthead .navigation .nav-pills li.active a { + background-color: #237434; } -header.masthead .debug { +.masthead .site-search { + margin: 2px 8px 2px 0; +} +.masthead .site-search input { + width: 200px; + padding: 4px 10px; +} +.masthead .debug { position: absolute; - bottom: 10px; + top: 37px; left: 10px; - font-size: 11px; color: rgba(255, 255, 255, 0.5); - line-height: 1.2; } .site-footer { *zoom: 1; + min-height: 55px; color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #079107; - background-image: -moz-linear-gradient(top, #068106, #08a808); - background-image: -ms-linear-gradient(top, #068106, #08a808); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#068106), to(#08a808)); - background-image: -webkit-linear-gradient(top, #068106, #08a808); - background-image: -o-linear-gradient(top, #068106, #08a808); - background-image: linear-gradient(top, #068106, #08a808); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#068106', endColorstr='#08a808', GradientType=0); - font-size: 12px; + background: #2f9b45 url("../../../base/images/bg.png"); padding: 20px 0; } .site-footer:before, .site-footer:after { display: table; content: ""; + line-height: 0; } .site-footer:after { clear: both; } +.site-footer .container { + position: relative; +} +.site-footer a { + color: #ffffff; +} +.site-footer hgroup h1, +.site-footer hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; +} +.site-footer hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.site-footer hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.site-footer .content { + position: absolute; + top: 10px; + right: 0; +} +.site-footer .section { + float: left; +} +.site-footer input[type="text"] { + border-color: #29873c; +} +.site-footer .navigation { + margin-right: 20px; +} +.site-footer .navigation .nav-pills { + margin-bottom: 0; +} +.site-footer .navigation .nav-pills li a:hover, +.site-footer .navigation .nav-pills li.active a { + background-color: #237434; +} +.site-footer .site-search { + margin: 2px 8px 2px 0; +} +.site-footer .site-search input { + width: 200px; + padding: 4px 10px; +} +.site-footer .debug { + position: absolute; + top: 37px; + left: 10px; + color: rgba(255, 255, 255, 0.5); +} .site-footer, .site-footer label, .site-footer small { - color: #ccdee3; + color: #acd7b5; } .site-footer a { - color: #ccdee3; + color: #acd7b5; } .footer-links, .attribution { @@ -7025,22 +8324,27 @@ header.masthead .debug { margin-left: 20px; width: 460px; } -.footer-links { +.footer-links { + margin-left: 0; +} +.footer-links ul { + float: left; + margin-left: 20px; + width: 220px; +} +.footer-links ul:first-child { margin-left: 0; } -.footer-links li { - display: inline-block; - width: 40%; - margin-right: 5%; +.footer-links ul li { margin-bottom: 5px; } .attribution small { - color: #ccdee3; + color: #acd7b5; font-size: 12px; } .attribution .ckan-footer-logo { display: block; - width: 65px; + width: 68px; height: 21px; margin-top: 2px; background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left; @@ -7053,6 +8357,7 @@ header.masthead .debug { .lang-select:after { display: table; content: ""; + line-height: 0; } .lang-select:after { clear: both; @@ -7069,153 +8374,66 @@ header.masthead .debug { .lang-dropdown li { width: auto; } -.lang-dropdown .select2-result-label[data-value]:before { - content: ""; - display: inline-block; - background-image: url("../../../base/images/flags.png"); - background-repeat: no-repeat; - background-position: 0 11px; - width: 17px; - height: 11px; - position: relative; - top: 1px; -} -.lang-dropdown .select2-result-label[data-value*="/en/"]:before { - background-position: 0 0; -} -.lang-dropdown .select2-result-label[data-value*="/de/"]:before { - background-position: 0 -11px; -} -.lang-dropdown .select2-result-label[data-value*="/fr/"]:before { - background-position: 0 -22px; -} -.lang-dropdown .select2-result-label[data-value*="/it/"]:before { - background-position: 0 -33px; -} -.lang-dropdown .select2-result-label[data-value*="/es/"]:before { - background-position: 0 -44px; -} -.lang-dropdown .select2-result-label[data-value*="/pl/"]:before { - background-position: 0 -55px; +.table-selected td { + background-color: #f5f5f5; } -.lang-dropdown .select2-result-label[data-value*="/ru/"]:before { - background-position: 0 -66px; +.table-selected td .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/nl/"]:before { - background-position: 0 -77px; +.table-bulk-edit th input { + top: -5px; } -.lang-dropdown .select2-result-label[data-value*="/sv/"]:before { - background-position: 0 -88px; +.table-bulk-edit .table-actions .btn-group { + float: left; + margin: 0 10px 0 0; } -.lang-dropdown .select2-result-label[data-value*="/no/"]:before { - background-position: 0 -99px; +.table-bulk-edit .context p { + margin-bottom: 0; } -.lang-dropdown .select2-result-label[data-value*="/cs/"]:before, -.lang-dropdown .select2-result-label[data-value*="/cs_CZ/"]:before { - background-position: 0 -110px; +.table-header thead th { + background-color: #f6f6f6; } -.lang-dropdown .select2-result-label[data-value*="/hu/"]:before { - background-position: 0 -121px; +.table-edit-hover .edit { + display: none; + float: right; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.table-edit-hover tr:hover .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/fi/"]:before { - background-position: 0 -143px; +.js .table-toggle-more .toggle-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/bg/"]:before { - background-position: 0 -154px; +.js .table-toggle-more .show-more { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/ca/"]:before { - background-position: 0 -165px; +.js .table-toggle-more .show-less { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/sq/"]:before { - background-position: 0 -176px; +.js .table-toggle-more .toggle-seperator { + display: table-row; } -.lang-dropdown .select2-result-label[data-value*="/sr/"]:before, -.lang-dropdown .select2-result-label[data-value*="/sr_Latn/"]:before { - background-position: 0 -187px; +.js .table-toggle-more .toggle-seperator td { + height: 11px; + padding: 0; + background-image: url("../../../base/images/table-seperator.png"); } -.lang-dropdown .select2-result-label[data-value*="/zh_TW/"]:before { - background-position: 0 -198px; +.js .table .toggle-show td { + background: none; + text-align: center; } -.lang-dropdown .select2-result-label[data-value*="/lv/"]:before { - background-position: 0 -209px; +.js .table-toggle-less .show-less { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/sk/"]:before { - background-position: 0 -220px; +.js .table-toggle-less .show-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.js .table-toggle-less .toggle-seperator { + display: none; } .profile .empty, .profile .dataset-list { margin-bottom: 20px; } -.profile-info .module-content { - padding: 15px; -} -.profile-info .avatar { - border: 1px solid #DDD; - padding: 5px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.profile-info .avatar img, -.profile-info .avatar a { - display: block; -} -.profile-info code { - font-weight: normal; - padding: 0; - margin: 0; -} -.profile-info h1.heading { - margin: 10px 0 5px 0; - font-size: 21px; -} -.profile-info .info { - margin-top: 15px; - padding-top: 10px; - border-top: 1px dotted #DDD; -} -.profile-info .info dl dd { - margin-top: 3px; - margin-left: 0; -} -.profile-info .nums { - *zoom: 1; - margin-top: 15px; - padding-top: 10px; - padding-bottom: 0; - border-top: 1px dotted #DDD; -} -.profile-info .nums:before, -.profile-info .nums:after { - display: table; - content: ""; -} -.profile-info .nums:after { - clear: both; -} -.profile-info .nums dl { - float: left; - width: 33%; - margin: 5px 0 0 0; - color: #4d4d4d; -} -.profile-info .nums dl dt { - display: block; - font-weight: 300; -} -.profile-info .nums dl dd { - display: block; - font-size: 30px; - font-weight: 700; - line-height: 1.2; - margin-left: 0; -} .activity { margin: 10px 0; padding: 0; @@ -7232,13 +8450,16 @@ header.masthead .debug { .activity .item:after { display: table; content: ""; + line-height: 0; } .activity .item:after { clear: both; } -.activity .item i { +.activity .item .icon { display: block; - float: left; + position: absolute; + top: 0; + left: 0; width: 30px; height: 30px; line-height: 30px; @@ -7246,7 +8467,6 @@ header.masthead .debug { color: #ffffff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); font-weight: normal; - font-size: 16px; margin-right: 10px; -webkit-border-radius: 100px; -moz-border-radius: 100px; @@ -7261,20 +8481,19 @@ header.masthead .debug { border-radius: 100px; } .activity .item .actor .gravatar { - float: left; - margin-top: -5px; - margin-right: 10px; + position: absolute; + top: 0; + left: 40px; } .activity .item p { font-size: 14px; line-height: 1.5; - margin: 5px 0 0 0; + margin: 5px 0 0 80px; } .activity .item .date { color: #999; font-size: 12px; white-space: nowrap; - margin-left: 5px; } .activity .item .new { display: block; @@ -7294,106 +8513,278 @@ header.masthead .debug { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.popover .about { - margin-bottom: 10px; +.activity .load-less { + margin-bottom: 15px; +} +.popover { + width: 300px; +} +.popover .popover-title { + font-weight: bold; + margin-bottom: 0; +} +.popover p.about { + margin: 0 0 10px 0; } .popover .popover-close { float: right; text-decoration: none; } -.activity .item i { - background-color: #767dce; +.activity .item .icon { + background-color: #999999; } -.activity .item.added-tag i { +.activity .item.added-tag .icon { background-color: #6995a6; } -.activity .item.changed-group i { +.activity .item.changed-group .icon { background-color: #767dce; } -.activity .item.changed-package i { +.activity .item.changed-package .icon { background-color: #8c76ce; } -.activity .item.changed-package_extra i { +.activity .item.changed-package_extra .icon { background-color: #769ace; } -.activity .item.changed-resource i { +.activity .item.changed-resource .icon { background-color: #aa76ce; } -.activity .item.changed-user i { +.activity .item.changed-user .icon { background-color: #76b8ce; } -.activity .item.deleted-group i { +.activity .item.changed-organization .icon { + background-color: #699fa6; +} +.activity .item.deleted-group .icon { background-color: #b95252; } -.activity .item.deleted-package i { +.activity .item.deleted-package .icon { background-color: #b97452; } -.activity .item.deleted-package_extra i { +.activity .item.deleted-package_extra .icon { background-color: #b95274; } -.activity .item.deleted-resource i { +.activity .item.deleted-resource .icon { background-color: #b99752; } -.activity .item.new-group i { +.activity .item.deleted-organization .icon { + background-color: #b95297; +} +.activity .item.new-group .icon { background-color: #69a67a; } -.activity .item.new-package i { +.activity .item.new-package .icon { background-color: #69a68e; } -.activity .item.new-package_extra i { +.activity .item.new-package_extra .icon { background-color: #6ca669; } -.activity .item.new-resource i { +.activity .item.new-resource .icon { background-color: #81a669; } -.activity .item.new-user i { +.activity .item.new-user .icon { background-color: #69a6a3; } -.activity .item.removed-tag i { +.activity .item.new-organization .icon { + background-color: #81a669; +} +.activity .item.removed-tag .icon { background-color: #b95297; } -.activity .item.deleted-related-item i { +.activity .item.deleted-related-item .icon { background-color: #b9b952; } -.activity .item.follow-dataset i { +.activity .item.follow-dataset .icon { background-color: #767dce; } -.activity .item.follow-user i { +.activity .item.follow-user .icon { background-color: #8c76ce; } -.activity .item.new-related-item i { +.activity .item.new-related-item .icon { background-color: #95a669; } -.activity .item.follow-group i { +.activity .item.follow-group .icon { background-color: #8ba669; } -.popover-context-loading .popover-title { +.dropdown:hover .dropdown-menu { + display: block; +} +.js .dropdown .dropdown-menu, +.js .dropdown:hover .dropdown-menu { + display: none; +} +.js .dropdown.open .dropdown-menu { + display: block; +} +#followee-filter .btn { + *zoom: 1; +} +#followee-filter .btn:before, +#followee-filter .btn:after { + display: table; + content: ""; + line-height: 0; +} +#followee-filter .btn:after { + clear: both; +} +#followee-filter .btn span, +#followee-filter .btn strong { + display: block; + float: left; + line-height: 1.5; +} +#followee-filter .btn span { + font-weight: normal; +} +#followee-filter .btn strong { + margin: 0 5px; + white-space: nowrap; + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; +} +.dashboard-context { + position: relative; + margin-bottom: 20px; + padding: 20px; + border-bottom: 1px solid #DCDCDC; + background-color: #f6f6f6; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; +} +.dashboard-context h2 { + margin-bottom: 10px; +} +.dashboard-context .arrow { + position: absolute; + content: ' '; + top: 30px; + right: -10px; + width: 10px; + height: 21px; + background: transparent url("../../../base/images/dashboard-followee-related.png"); +} +.popover-followee .popover-title { display: none; } -.popover-context-loading .popover-content { +.popover-followee .popover-content { + padding: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -.popover-context-loading .popover-content img { - vertical-align: -3px; - margin-right: 10px; +.popover-followee .empty { + padding: 10px; } -.follower-list li { - margin: 0 0 15px 0; +.popover-followee .popover-header { + *zoom: 1; + background-color: whiteSmoke; + padding: 5px; + border-bottom: 1px solid #cccccc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.follower-list .gravatar { - vertical-align: -4px; - margin-right: 3px; +.popover-followee .popover-header:before, +.popover-followee .popover-header:after { + display: table; + content: ""; + line-height: 0; +} +.popover-followee .popover-header:after { + clear: both; +} +.popover-followee .popover-header .input-prepend { + margin-bottom: 0; +} +.popover-followee .popover-header .add-on, +.popover-followee .popover-header input { + float: left; + margin: 0; +} +.popover-followee .popover-header .add-on { + padding: 4px 8px 4px 12px; + border-right-width: 0; + -webkit-border-radius: 100px 0 0 100px; + -moz-border-radius: 100px 0 0 100px; + border-radius: 100px 0 0 100px; +} +.popover-followee .popover-header input { + padding: 4px 12px 4px 8px; + font-size: 13px; + width: 207px; + -webkit-border-radius: 0 100px 100px 0; + -moz-border-radius: 0 100px 100px 0; + border-radius: 0 100px 100px 0; +} +.popover-followee .nav { + padding: 0; + margin: 0; + max-height: 205px; + overflow: auto; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.popover-followee .nav li a { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: 7px 10px 7px 15px; + margin: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.popover-followee .nav li a i { + background-color: #2f9b45; + color: #ffffff; + margin-right: 11px; + padding: 3px 5px; + line-height: 1; -webkit-border-radius: 100px; -moz-border-radius: 100px; border-radius: 100px; + -webkit-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); } -.module-my-datasets .empty { - padding: 10px; +.popover-followee .nav li a:hover i { + background-color: #000; +} +.popover-followee .nav li.active a i { + color: #2f9b45; + background-color: #ffffff; +} +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; } body { - background-color: #08a808; + background: #2f9b45 url("../../../base/images/bg.png"); } [hidden] { display: none; @@ -7412,11 +8803,10 @@ table .metric { width: 140px; } code { - padding: 2px 2px; color: #000000; - font-weight: bold; border: none; background: none; + white-space: normal; } pre { border: none; @@ -7446,10 +8836,11 @@ iframe { text-indent: -999em; } .empty { - color: #aeaeae; + color: #aaaaaa; font-style: italic; } .page-heading { + margin-top: 0; margin-bottom: 16px; } .m-top { @@ -7492,10 +8883,6 @@ iframe { position: relative; top: -20px; } -.ie .module, -.ie .media-image { - border: 1px solid #cccccc; -} .ie .module-popup { border-bottom: none; } @@ -7519,24 +8906,19 @@ iframe { .ie9 .control-large input { height: 56px; } -.ie9 .module { - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +.ie8 .account-masthead a.image, +.ie8 .account-masthead .username { + white-space: nowrap; } -.ie7 .masthead nav ul li a.active, -.ie8 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #068b06; - border-top: 1px solid #057205; - border-bottom: 1px solid #079907; +.ie9 .homepage .media.module-heading .media-image img, +.ie8 .homepage .media.module-heading .media-image img, +.ie7 .homepage .media.module-heading .media-image img { + width: 85px !important; } -.ie8 .masthead .account a.image { - display: block; - width: 25px; - padding-right: 10px; - white-space: nowrap; +.ie8 .hero .hero-primary.module-popup .box, +.ie7 .hero .hero-primary.module-popup .box { + padding-bottom: 20px !important; + margin-bottom: 0 !important; } .ie7 .alert { position: relative; @@ -7556,6 +8938,7 @@ iframe { .ie7 .tags .tag-list:after { display: table; content: ""; + line-height: 0; } .ie7 .tags .tag-list:after { clear: both; @@ -7569,8 +8952,6 @@ iframe { } .ie7 .tags .tag { display: block; - border: 1px solid #d0d0d0; - background: #f5f5f5; } .ie7 .search-giant input { width: 95%; @@ -7621,6 +9002,9 @@ iframe { .ie7 .stages li .highlight { width: auto; } +.ie7 .account-masthead .account a i { + line-height: 31px; +} .ie7 .masthead { position: relative; z-index: 1; @@ -7632,39 +9016,12 @@ iframe { *zoom: 1; } -.ie7 .masthead nav ul { - margin-top: 5px; -} -.ie7 .masthead nav ul li { - float: left; -} -.ie7 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #068b06; - border-top: 1px solid #057205; - border-bottom: 1px solid #079907; -} .ie7 .masthead .header-image { display: block; } .ie7 .masthead .account .dropdown-menu { z-index: 10000; } -.ie7 .footer-links { - *zoom: 1; -} -.ie7 .footer-links:before, -.ie7 .footer-links:after { - display: table; - content: ""; -} -.ie7 .footer-links:after { - clear: both; -} -.ie7 .footer-links li { - float: left; -} .ie7 .module-narrow .nav-item.image { *zoom: 1; } @@ -7672,6 +9029,7 @@ iframe { .ie7 .module-narrow .nav-item.image:after { display: table; content: ""; + line-height: 0; } .ie7 .module-narrow .nav-item.image:after { clear: both; @@ -7689,11 +9047,13 @@ iframe { } .ie7 .module-heading { *zoom: 1; + position: relative; } .ie7 .module-heading:before, .ie7 .module-heading:after { display: table; content: ""; + line-height: 0; } .ie7 .module-heading:after { clear: both; @@ -7713,3 +9073,22 @@ iframe { position: relative; zoom: 1; } +.ie7 .resource-item { + position: static; + padding-bottom: 1px; +} +.ie7 .resource-item .heading { + position: relative; +} +.ie7 .resource-item .format-label { + left: -48px; +} +.ie7 .resource-item .btn-group { + position: relative; + float: right; + top: -35px; + right: 0; +} +.ie7 .media-overlay .media-heading { + background-color: #000; +} diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css index cd13f31aa21..44400d449de 100644 --- a/ckan/public/base/css/main.css +++ b/ckan/public/base/css/main.css @@ -2055,6 +2055,14 @@ table th[class*="span"], .open > .dropdown-menu { display: block; } +.dropdown-backdrop { + position: fixed; + left: 0; + right: 0; + bottom: 0; + top: 0; + z-index: 990; +} .pull-right > .dropdown-menu { right: 0; left: auto; @@ -5110,6 +5118,9 @@ a.tag:hover { .primary .module:first-child { margin-top: 0; } +.no-nav .module:last-child { + margin-top: 0; +} .module-image { float: left; width: 50px; @@ -5287,54 +5298,74 @@ a.tag:hover { .media-item.is-expander:hover .truncator-link { opacity: 1; } -.nav-simple { +.wide .media-item { + width: 186px; +} +.nav-simple, +.nav-aside { *zoom: 1; margin: 0; list-style: none; padding-bottom: 0; } .nav-simple:before, -.nav-simple:after { +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { display: table; content: ""; line-height: 0; } -.nav-simple:after { +.nav-simple:after, +.nav-aside:after { clear: both; } -.nav-simple > li { +.nav-simple > li, +.nav-aside > li { font-size: 12px; line-height: 1.1666666666666667em; padding: 7px 25px; border-bottom: 1px dotted #dddddd; } -.nav-simple > li:last-of-type { +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { border-bottom: 0; } -.nav-simple .ckan-icon { +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { position: relative; top: 0px; } -.nav-item > a { +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; +} +.nav-item > a, +.nav-aside li a { color: #333333; font-size: 14px; line-height: 20px; margin: -7px -25px; padding: 7px 25px; } -.nav-item.active { +.nav-item.active, +.nav-aside li.active { background-color: #f6f6f6; } -.nav-item.active > a { +.nav-item.active > a, +.nav-aside li.active a { position: relative; color: #ffffff; background-color: #8ca0a6; } -.nav-item.active > a:hover { +.nav-item.active > a:hover, +.nav-aside li.active a:hover { color: #ffffff; background-color: #8ca0a6; } -.nav-item.active > a:before { +.nav-item.active > a:before, +.nav-aside li.active a:before { content: ' '; position: absolute; top: 0; @@ -5343,24 +5374,29 @@ a.tag:hover { height: 34px; background-image: url("../../../base/images/nav-active.png?1"); } -.nav-item.active > a span { +.nav-item.active > a span, +.nav-aside li.active a span { white-space: nowrap; overflow: hidden; display: block; } -.module-narrow .nav-item > a { +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { padding-left: 15px; padding-right: 15px; position: relative; } -.module-narrow .nav-item.image { +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { position: relative; } -.module-narrow .nav-item.image > a { +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { padding-left: 42px; padding-right: 42px; } -.module-narrow .nav-item.image > img { +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { position: absolute; top: 50%; left: 15px; @@ -5544,6 +5580,12 @@ textarea { .control-large input { height: 41px; } +.control-required { + color: #c6898b; +} +.form-actions .control-required-message { + float: left; +} .form-actions { background: none; margin-left: -25px; @@ -6513,6 +6555,11 @@ textarea { margin-top: -5px; margin-right: -7px; } +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; +} h1 { font-size: 28px; } @@ -6871,842 +6918,6 @@ h4 small { height: 35px; background-position: -320px -62px; } -/* This is a modified version of the font-awesome core less document. */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); - src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); - font-weight: normal; - font-style: normal; -} -[class^="icon-"], -[class*=" icon-"] { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} -.icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} -@-moz-keyframes spin { - 0% { - -moz-transform: rotate(0deg); - } - 100% { - -moz-transform: rotate(359deg); - } -} -@-webkit-keyframes spin { - 0% { - -webkit-transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - } -} -@-o-keyframes spin { - 0% { - -o-transform: rotate(0deg); - } - 100% { - -o-transform: rotate(359deg); - } -} -@-ms-keyframes spin { - 0% { - -ms-transform: rotate(0deg); - } - 100% { - -ms-transform: rotate(359deg); - } -} -@keyframes spin { - 0% { - transform: rotate(0deg); - } - 100% { - transform: rotate(359deg); - } -} -@-moz-document url-prefix() { - .icon-spin { - height: .9em; - } - .btn .icon-spin { - height: auto; - } - .icon-spin.icon-large { - height: 1.25em; - } - .btn .icon-spin.icon-large { - height: .75em; - } -} -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; -} -.icon-music:before { - content: "\f001"; -} -.icon-search:before { - content: "\f002"; -} -.icon-envelope:before { - content: "\f003"; -} -.icon-heart:before { - content: "\f004"; -} -.icon-star:before { - content: "\f005"; -} -.icon-star-empty:before { - content: "\f006"; -} -.icon-user:before { - content: "\f007"; -} -.icon-film:before { - content: "\f008"; -} -.icon-th-large:before { - content: "\f009"; -} -.icon-th:before { - content: "\f00a"; -} -.icon-th-list:before { - content: "\f00b"; -} -.icon-ok:before { - content: "\f00c"; -} -.icon-remove:before { - content: "\f00d"; -} -.icon-zoom-in:before { - content: "\f00e"; -} -.icon-zoom-out:before { - content: "\f010"; -} -.icon-off:before { - content: "\f011"; -} -.icon-signal:before { - content: "\f012"; -} -.icon-cog:before { - content: "\f013"; -} -.icon-trash:before { - content: "\f014"; -} -.icon-home:before { - content: "\f015"; -} -.icon-file:before { - content: "\f016"; -} -.icon-time:before { - content: "\f017"; -} -.icon-road:before { - content: "\f018"; -} -.icon-download-alt:before { - content: "\f019"; -} -.icon-download:before { - content: "\f01a"; -} -.icon-upload:before { - content: "\f01b"; -} -.icon-inbox:before { - content: "\f01c"; -} -.icon-play-circle:before { - content: "\f01d"; -} -.icon-repeat:before { - content: "\f01e"; -} -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; -} -.icon-list-alt:before { - content: "\f022"; -} -.icon-lock:before { - content: "\f023"; -} -.icon-flag:before { - content: "\f024"; -} -.icon-headphones:before { - content: "\f025"; -} -.icon-volume-off:before { - content: "\f026"; -} -.icon-volume-down:before { - content: "\f027"; -} -.icon-volume-up:before { - content: "\f028"; -} -.icon-qrcode:before { - content: "\f029"; -} -.icon-barcode:before { - content: "\f02a"; -} -.icon-tag:before { - content: "\f02b"; -} -.icon-tags:before { - content: "\f02c"; -} -.icon-book:before { - content: "\f02d"; -} -.icon-bookmark:before { - content: "\f02e"; -} -.icon-print:before { - content: "\f02f"; -} -.icon-camera:before { - content: "\f030"; -} -.icon-font:before { - content: "\f031"; -} -.icon-bold:before { - content: "\f032"; -} -.icon-italic:before { - content: "\f033"; -} -.icon-text-height:before { - content: "\f034"; -} -.icon-text-width:before { - content: "\f035"; -} -.icon-align-left:before { - content: "\f036"; -} -.icon-align-center:before { - content: "\f037"; -} -.icon-align-right:before { - content: "\f038"; -} -.icon-align-justify:before { - content: "\f039"; -} -.icon-list:before { - content: "\f03a"; -} -.icon-indent-left:before { - content: "\f03b"; -} -.icon-indent-right:before { - content: "\f03c"; -} -.icon-facetime-video:before { - content: "\f03d"; -} -.icon-picture:before { - content: "\f03e"; -} -.icon-pencil:before { - content: "\f040"; -} -.icon-map-marker:before { - content: "\f041"; -} -.icon-adjust:before { - content: "\f042"; -} -.icon-tint:before { - content: "\f043"; -} -.icon-edit:before { - content: "\f044"; -} -.icon-share:before { - content: "\f045"; -} -.icon-check:before { - content: "\f046"; -} -.icon-move:before { - content: "\f047"; -} -.icon-step-backward:before { - content: "\f048"; -} -.icon-fast-backward:before { - content: "\f049"; -} -.icon-backward:before { - content: "\f04a"; -} -.icon-play:before { - content: "\f04b"; -} -.icon-pause:before { - content: "\f04c"; -} -.icon-stop:before { - content: "\f04d"; -} -.icon-forward:before { - content: "\f04e"; -} -.icon-fast-forward:before { - content: "\f050"; -} -.icon-step-forward:before { - content: "\f051"; -} -.icon-eject:before { - content: "\f052"; -} -.icon-chevron-left:before { - content: "\f053"; -} -.icon-chevron-right:before { - content: "\f054"; -} -.icon-plus-sign:before { - content: "\f055"; -} -.icon-minus-sign:before { - content: "\f056"; -} -.icon-remove-sign:before { - content: "\f057"; -} -.icon-ok-sign:before { - content: "\f058"; -} -.icon-question-sign:before { - content: "\f059"; -} -.icon-info-sign:before { - content: "\f05a"; -} -.icon-screenshot:before { - content: "\f05b"; -} -.icon-remove-circle:before { - content: "\f05c"; -} -.icon-ok-circle:before { - content: "\f05d"; -} -.icon-ban-circle:before { - content: "\f05e"; -} -.icon-arrow-left:before { - content: "\f060"; -} -.icon-arrow-right:before { - content: "\f061"; -} -.icon-arrow-up:before { - content: "\f062"; -} -.icon-arrow-down:before { - content: "\f063"; -} -.icon-share-alt:before { - content: "\f064"; -} -.icon-resize-full:before { - content: "\f065"; -} -.icon-resize-small:before { - content: "\f066"; -} -.icon-plus:before { - content: "\f067"; -} -.icon-minus:before { - content: "\f068"; -} -.icon-asterisk:before { - content: "\f069"; -} -.icon-exclamation-sign:before { - content: "\f06a"; -} -.icon-gift:before { - content: "\f06b"; -} -.icon-leaf:before { - content: "\f06c"; -} -.icon-fire:before { - content: "\f06d"; -} -.icon-eye-open:before { - content: "\f06e"; -} -.icon-eye-close:before { - content: "\f070"; -} -.icon-warning-sign:before { - content: "\f071"; -} -.icon-plane:before { - content: "\f072"; -} -.icon-calendar:before { - content: "\f073"; -} -.icon-random:before { - content: "\f074"; -} -.icon-comment:before { - content: "\f075"; -} -.icon-magnet:before { - content: "\f076"; -} -.icon-chevron-up:before { - content: "\f077"; -} -.icon-chevron-down:before { - content: "\f078"; -} -.icon-retweet:before { - content: "\f079"; -} -.icon-shopping-cart:before { - content: "\f07a"; -} -.icon-folder-close:before { - content: "\f07b"; -} -.icon-folder-open:before { - content: "\f07c"; -} -.icon-resize-vertical:before { - content: "\f07d"; -} -.icon-resize-horizontal:before { - content: "\f07e"; -} -.icon-bar-chart:before { - content: "\f080"; -} -.icon-twitter-sign:before { - content: "\f081"; -} -.icon-facebook-sign:before { - content: "\f082"; -} -.icon-camera-retro:before { - content: "\f083"; -} -.icon-key:before { - content: "\f084"; -} -.icon-cogs:before { - content: "\f085"; -} -.icon-comments:before { - content: "\f086"; -} -.icon-thumbs-up:before { - content: "\f087"; -} -.icon-thumbs-down:before { - content: "\f088"; -} -.icon-star-half:before { - content: "\f089"; -} -.icon-heart-empty:before { - content: "\f08a"; -} -.icon-signout:before { - content: "\f08b"; -} -.icon-linkedin-sign:before { - content: "\f08c"; -} -.icon-pushpin:before { - content: "\f08d"; -} -.icon-external-link:before { - content: "\f08e"; -} -.icon-signin:before { - content: "\f090"; -} -.icon-trophy:before { - content: "\f091"; -} -.icon-github-sign:before { - content: "\f092"; -} -.icon-upload-alt:before { - content: "\f093"; -} -.icon-lemon:before { - content: "\f094"; -} -.icon-phone:before { - content: "\f095"; -} -.icon-check-empty:before { - content: "\f096"; -} -.icon-bookmark-empty:before { - content: "\f097"; -} -.icon-phone-sign:before { - content: "\f098"; -} -.icon-twitter:before { - content: "\f099"; -} -.icon-facebook:before { - content: "\f09a"; -} -.icon-github:before { - content: "\f09b"; -} -.icon-unlock:before { - content: "\f09c"; -} -.icon-credit-card:before { - content: "\f09d"; -} -.icon-rss:before { - content: "\f09e"; -} -.icon-hdd:before { - content: "\f0a0"; -} -.icon-bullhorn:before { - content: "\f0a1"; -} -.icon-bell:before { - content: "\f0a2"; -} -.icon-certificate:before { - content: "\f0a3"; -} -.icon-hand-right:before { - content: "\f0a4"; -} -.icon-hand-left:before { - content: "\f0a5"; -} -.icon-hand-up:before { - content: "\f0a6"; -} -.icon-hand-down:before { - content: "\f0a7"; -} -.icon-circle-arrow-left:before { - content: "\f0a8"; -} -.icon-circle-arrow-right:before { - content: "\f0a9"; -} -.icon-circle-arrow-up:before { - content: "\f0aa"; -} -.icon-circle-arrow-down:before { - content: "\f0ab"; -} -.icon-globe:before { - content: "\f0ac"; -} -.icon-wrench:before { - content: "\f0ad"; -} -.icon-tasks:before { - content: "\f0ae"; -} -.icon-filter:before { - content: "\f0b0"; -} -.icon-briefcase:before { - content: "\f0b1"; -} -.icon-fullscreen:before { - content: "\f0b2"; -} -.icon-group:before { - content: "\f0c0"; -} -.icon-link:before { - content: "\f0c1"; -} -.icon-cloud:before { - content: "\f0c2"; -} -.icon-beaker:before { - content: "\f0c3"; -} -.icon-cut:before { - content: "\f0c4"; -} -.icon-copy:before { - content: "\f0c5"; -} -.icon-paper-clip:before { - content: "\f0c6"; -} -.icon-save:before { - content: "\f0c7"; -} -.icon-sign-blank:before { - content: "\f0c8"; -} -.icon-reorder:before { - content: "\f0c9"; -} -.icon-list-ul:before { - content: "\f0ca"; -} -.icon-list-ol:before { - content: "\f0cb"; -} -.icon-strikethrough:before { - content: "\f0cc"; -} -.icon-underline:before { - content: "\f0cd"; -} -.icon-table:before { - content: "\f0ce"; -} -.icon-magic:before { - content: "\f0d0"; -} -.icon-truck:before { - content: "\f0d1"; -} -.icon-pinterest:before { - content: "\f0d2"; -} -.icon-pinterest-sign:before { - content: "\f0d3"; -} -.icon-google-plus-sign:before { - content: "\f0d4"; -} -.icon-google-plus:before { - content: "\f0d5"; -} -.icon-money:before { - content: "\f0d6"; -} -.icon-caret-down:before { - content: "\f0d7"; -} -.icon-caret-up:before { - content: "\f0d8"; -} -.icon-caret-left:before { - content: "\f0d9"; -} -.icon-caret-right:before { - content: "\f0da"; -} -.icon-columns:before { - content: "\f0db"; -} -.icon-sort:before { - content: "\f0dc"; -} -.icon-sort-down:before { - content: "\f0dd"; -} -.icon-sort-up:before { - content: "\f0de"; -} -.icon-envelope-alt:before { - content: "\f0e0"; -} -.icon-linkedin:before { - content: "\f0e1"; -} -.icon-undo:before { - content: "\f0e2"; -} -.icon-legal:before { - content: "\f0e3"; -} -.icon-dashboard:before { - content: "\f0e4"; -} -.icon-comment-alt:before { - content: "\f0e5"; -} -.icon-comments-alt:before { - content: "\f0e6"; -} -.icon-bolt:before { - content: "\f0e7"; -} -.icon-sitemap:before { - content: "\f0e8"; -} -.icon-umbrella:before { - content: "\f0e9"; -} -.icon-paste:before { - content: "\f0ea"; -} -.icon-lightbulb:before { - content: "\f0eb"; -} -.icon-exchange:before { - content: "\f0ec"; -} -.icon-cloud-download:before { - content: "\f0ed"; -} -.icon-cloud-upload:before { - content: "\f0ee"; -} -.icon-user-md:before { - content: "\f0f0"; -} -.icon-stethoscope:before { - content: "\f0f1"; -} -.icon-suitcase:before { - content: "\f0f2"; -} -.icon-bell-alt:before { - content: "\f0f3"; -} -.icon-coffee:before { - content: "\f0f4"; -} -.icon-food:before { - content: "\f0f5"; -} -.icon-file-alt:before { - content: "\f0f6"; -} -.icon-building:before { - content: "\f0f7"; -} -.icon-hospital:before { - content: "\f0f8"; -} -.icon-ambulance:before { - content: "\f0f9"; -} -.icon-medkit:before { - content: "\f0fa"; -} -.icon-fighter-jet:before { - content: "\f0fb"; -} -.icon-beer:before { - content: "\f0fc"; -} -.icon-h-sign:before { - content: "\f0fd"; -} -.icon-plus-sign-alt:before { - content: "\f0fe"; -} -.icon-double-angle-left:before { - content: "\f100"; -} -.icon-double-angle-right:before { - content: "\f101"; -} -.icon-double-angle-up:before { - content: "\f102"; -} -.icon-double-angle-down:before { - content: "\f103"; -} -.icon-angle-left:before { - content: "\f104"; -} -.icon-angle-right:before { - content: "\f105"; -} -.icon-angle-up:before { - content: "\f106"; -} -.icon-angle-down:before { - content: "\f107"; -} -.icon-desktop:before { - content: "\f108"; -} -.icon-laptop:before { - content: "\f109"; -} -.icon-tablet:before { - content: "\f10a"; -} -.icon-mobile-phone:before { - content: "\f10b"; -} -.icon-circle-blank:before { - content: "\f10c"; -} -.icon-quote-left:before { - content: "\f10d"; -} -.icon-quote-right:before { - content: "\f10e"; -} -.icon-spinner:before { - content: "\f110"; -} -.icon-circle:before { - content: "\f111"; -} -.icon-reply:before { - content: "\f112"; -} -.icon-github-alt:before { - content: "\f113"; -} -.icon-folder-close-alt:before { - content: "\f114"; -} -.icon-folder-open-alt:before { - content: "\f115"; -} [class^="icon-"], [class*=" icon-"] { display: inline-block; @@ -8626,7 +7837,7 @@ h4 small { .dashboard-context .arrow { position: absolute; content: ' '; - top: 70px; + top: 30px; right: -10px; width: 10px; height: 21px; @@ -8725,6 +7936,31 @@ h4 small { color: #187794; background-color: #ffffff; } +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; +} body { background: #005d7a url("../../../base/images/bg.png"); } @@ -9034,6 +8270,3 @@ iframe { .ie7 .media-overlay .media-heading { background-color: #000; } -.debug { - display: none; -} diff --git a/ckan/public/base/css/maroon.css b/ckan/public/base/css/maroon.css index 3ecb2ff2fce..c052d27ea74 100644 --- a/ckan/public/base/css/maroon.css +++ b/ckan/public/base/css/maroon.css @@ -48,11 +48,25 @@ sub { bottom: -0.25em; } img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; + /* Part 1: Set a maxium relative to the parent */ + + width: auto\9; + /* IE7-8 need help adjusting responsive images */ + + height: auto; + /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img, +.google-maps img { + max-width: none; +} button, input, select, @@ -72,11 +86,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +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; @@ -92,6 +116,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !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; } @@ -99,6 +174,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -113,28 +189,47 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } body { margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #4d4d4d; - background-color: #efefef; + font-size: 14px; + line-height: 20px; + color: #444444; + background-color: #eeeeee; } a { - color: #5b0404; + color: #810606; text-decoration: none; } -a:hover { - color: #120101; +a:hover, +a:focus { + color: #380303; text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} .row { margin-left: -20px; *zoom: 1; @@ -143,15 +238,18 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -236,6 +334,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -243,65 +342,171 @@ a:hover { .row-fluid [class*="span"] { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; +} +.row-fluid .offset12 { + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; +} +.row-fluid .offset12:first-child { + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; +} +.row-fluid .offset11 { + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; +} +.row-fluid .offset11:first-child { + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; +} +.row-fluid .offset10 { + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; +} +.row-fluid .offset10:first-child { + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; +} +.row-fluid .offset9 { + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; +} +.row-fluid .offset9:first-child { + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; +} +.row-fluid .offset8 { + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; +} +.row-fluid .offset8:first-child { + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; +} +.row-fluid .offset7 { + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; +} +.row-fluid .offset7:first-child { + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; +} +.row-fluid .offset6 { + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; +} +.row-fluid .offset6:first-child { + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; +} +.row-fluid .offset5 { + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; +} +.row-fluid .offset5:first-child { + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; +} +.row-fluid .offset4 { + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; +} +.row-fluid .offset4:first-child { + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; +} +.row-fluid .offset3 { + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; +} +.row-fluid .offset3:first-child { + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; +} +.row-fluid .offset2 { + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; +} +.row-fluid .offset2:first-child { + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; +} +.row-fluid .offset1 { + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; +} +.row-fluid .offset1:first-child { + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; +} +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; } .container { margin-right: auto; @@ -312,6 +517,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -325,25 +531,75 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; - font-size: 20px; + margin-bottom: 20px; + font-size: 21px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; +} +a.muted:hover, +a.muted:focus { + color: #808080; +} +.text-warning { + color: #c09853; +} +a.text-warning:hover, +a.text-warning:focus { + color: #a47e3c; +} +.text-error { + color: #b55457; +} +a.text-error:hover, +a.text-error:focus { + color: #954143; +} +.text-info { + color: #3a87ad; +} +a.text-info:hover, +a.text-info:focus { + color: #2d6987; +} +.text-success { + color: #468847; +} +a.text-success:hover, +a.text-success:focus { + color: #356635; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; } h1, h2, @@ -351,9 +607,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -364,60 +621,53 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } -h1 { - font-size: 30px; - line-height: 36px; +h1, +h2, +h3 { + line-height: 40px; } -h1 small { - font-size: 18px; +h1 { + font-size: 38.5px; } h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; + font-size: 31.5px; } h3 { - font-size: 18px; - line-height: 27px; + font-size: 24.5px; } -h3 small { +h4 { + font-size: 17.5px; +} +h5 { font-size: 14px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 11.9px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24.5px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 17.5px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -425,37 +675,57 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding-left: 5px; + padding-right: 5px; +} dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; } dd { - margin-left: 9px; + margin-left: 10px; +} +.dl-horizontal { + *zoom: 1; +} +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: ""; + line-height: 0; +} +.dl-horizontal:after { + clear: both; } .dl-horizontal dt { float: left; - width: 120px; + width: 160px; clear: left; text-align: right; overflow: hidden; @@ -463,26 +733,18 @@ dd { white-space: nowrap; } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -490,18 +752,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 22.5px; + line-height: 1.25; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -518,6 +780,12 @@ blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} q:before, q:after, blockquote:before, @@ -526,20 +794,14 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} -small { - font-size: 100%; -} -cite { + margin-bottom: 20px; font-style: normal; + line-height: 20px; } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; @@ -551,13 +813,14 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -570,11 +833,13 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -583,7 +848,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -594,15 +859,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -610,9 +875,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -623,116 +888,181 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + vertical-align: middle; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +input, +textarea, +.uneditable-input { + width: 206px; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; +textarea { height: auto; - padding: 0; - margin: 3px 0; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: #ffffff; + border: 1px solid #cccccc; + -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); + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ + margin-top: 1px \9; + /* IE8-9 */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + line-height: normal; } -input[type="button"], +input[type="file"], +input[type="image"], +input[type="submit"], input[type="reset"], -input[type="submit"] { +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - height: auto; } select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; + line-height: 30px; } select { width: 220px; + border: 1px solid #cccccc; background-color: #ffffff; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -textarea { +.uneditable-input, +.uneditable-textarea { + color: #999999; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} +.uneditable-textarea { + width: auto; height: auto; } -input[type="hidden"] { - display: none; +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; } .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, .controls > .checkbox:first-child { @@ -749,39 +1079,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -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); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -811,46 +1108,105 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { margin-left: 0; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 926px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 846px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 766px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 686px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 606px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 526px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 446px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 366px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 286px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 206px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 126px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 46px; +} +.controls-row { + *zoom: 1; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +.controls-row:before, +.controls-row:after { + display: table; + content: ""; + line-height: 0; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +.controls-row:after { + clear: both; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { + float: left; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } input[disabled], select[disabled], @@ -860,7 +1216,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -868,24 +1223,33 @@ input[type="radio"][readonly], 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; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .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 input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -893,24 +1257,33 @@ input[type="checkbox"][readonly] { background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b55457; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b55457; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b55457; + -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 input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #954143; - -webkit-box-shadow: 0 0 6px #d49b9d; - -moz-box-shadow: 0 0 6px #d49b9d; - box-shadow: 0 0 6px #d49b9d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -918,24 +1291,33 @@ input[type="checkbox"][readonly] { background-color: #f8f0f0; border-color: #b55457; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .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 input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -943,59 +1325,78 @@ input[type="checkbox"][readonly] { background-color: #dff0d8; 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; box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} .help-block, .help-inline { - color: #555555; + color: #6a6a6a; } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1006,62 +1407,76 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { - margin-bottom: 5px; +.input-append, +.input-prepend { + display: inline-block; + margin-bottom: 10px; + vertical-align: middle; + font-size: 0; + white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-append .dropdown-menu, +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, +.input-prepend .add-on, +.input-append .btn, .input-prepend .btn, -.input-append .btn { - margin-left: -1px; +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,12 +1497,21 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; +.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 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 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 { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1099,6 +1523,13 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; 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 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; @@ -1113,7 +1544,10 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; +} +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1121,9 +1555,36 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, .form-inline input, @@ -1152,6 +1613,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1159,7 +1621,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1185,45 +1649,53 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; } .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } .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: 9px; 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 { max-width: 100%; @@ -1233,12 +1705,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1260,6 +1732,9 @@ table { .table tbody + tbody { border-top: 2px solid #dddddd; } +.table .table { + background-color: #eeeeee; +} .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1267,7 +1742,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1288,160 +1763,175 @@ table { .table-bordered tbody:first-child tr:first-child td { 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, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 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, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody: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 tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 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 thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; +} +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 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, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; +} +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; +} +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } -table .span1 { +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 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 tbody tr.success > td { + background-color: #dff0d8; } -table .span18 { - float: none; - width: 1404px; - margin-left: 0; +.table tbody tr.error > td { + background-color: #f8f0f0; } -table .span19 { - float: none; - width: 1484px; - margin-left: 0; +.table tbody tr.warning > td { + background-color: #fcf8e3; } -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.info > td { + background-color: #d9edf7; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table-hover tbody tr.error:hover > td { + background-color: #f0dfe0; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } .dropup, .dropdown { @@ -1463,18 +1953,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1483,17 +1966,17 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; + padding: 5px 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1508,35 +1991,71 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu > li > a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + text-decoration: none; + color: #ffffff; + background-color: #770606; + background-image: -moz-linear-gradient(top, #810606, #690505); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#810606), to(#690505)); + background-image: -webkit-linear-gradient(top, #810606, #690505); + background-image: -o-linear-gradient(top, #810606, #690505); + background-image: linear-gradient(to bottom, #810606, #690505); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff810606', endColorstr='#ff690505', GradientType=0); +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #5b0404; + outline: 0; + background-color: #770606; + background-image: -moz-linear-gradient(top, #810606, #690505); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#810606), to(#690505)); + background-image: -webkit-linear-gradient(top, #810606, #690505); + background-image: -o-linear-gradient(top, #810606, #690505); + background-image: linear-gradient(to bottom, #810606, #690505); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff810606', endColorstr='#ff690505', GradientType=0); +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: default; } .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -1544,7 +2063,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -1552,7 +2071,62 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.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; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + 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-left: 20px; + padding-right: 20px; +} .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1563,8 +2137,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1590,16 +2163,13 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -1607,7 +2177,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -1618,13 +2187,14 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } -.close:hover { +.close:hover, +.close:focus { color: #000000; text-decoration: none; cursor: pointer; @@ -1644,25 +2214,23 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 12px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; + font-size: 14px; + line-height: 20px; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); border-color: #eaeaea #eaeaea #c4c4c4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; @@ -1681,10 +2249,12 @@ button.close { box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, +.btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #eaeaea; *background-color: #dddddd; } @@ -1695,17 +2265,13 @@ button.close { .btn:first-child { *margin-left: 0; } -.btn:hover { +.btn:hover, +.btn:focus { 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; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -1716,8 +2282,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,.15), 0 1px 2px rgba(0,0,0,.05); @@ -1727,7 +2291,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -1736,43 +2299,54 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 15px; - 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: 1px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; } .btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { + margin-top: 0; } -.btn-small [class^="icon-"] { +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] { margin-top: -1px; } .btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + 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, @@ -1782,49 +2356,49 @@ button.close { .btn-inverse.active { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn-primary { - background-color: #dd0c0c; - background-image: -moz-linear-gradient(top, #cf0a0a, #f21010); - background-image: -ms-linear-gradient(top, #cf0a0a, #f21010); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cf0a0a), to(#f21010)); - background-image: -webkit-linear-gradient(top, #cf0a0a, #f21010); - background-image: -o-linear-gradient(top, #cf0a0a, #f21010); - background-image: linear-gradient(top, #cf0a0a, #f21010); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #9e0707; + background-image: -moz-linear-gradient(top, #b20808, #810606); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b20808), to(#810606)); + background-image: -webkit-linear-gradient(top, #b20808, #810606); + background-image: -o-linear-gradient(top, #b20808, #810606); + background-image: linear-gradient(to bottom, #b20808, #810606); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf0a0a', endColorstr='#f21010', GradientType=0); - border-color: #f21010 #f21010 #ac0909; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb20808', endColorstr='#ff810606', GradientType=0); + border-color: #810606 #810606 #380303; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f21010; + *background-color: #810606; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, +.btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #f21010; - *background-color: #dd0c0c; + color: #ffffff; + background-color: #810606; + *background-color: #690505; } .btn-primary:active, .btn-primary.active { - background-color: #c40b0b \9; + background-color: #500404 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); 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); *background-color: #f89406; @@ -1833,10 +2407,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, +.btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -1845,15 +2421,16 @@ button.close { background-color: #c67605 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); 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); *background-color: #bd362f; @@ -1862,10 +2439,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, +.btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -1874,15 +2453,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); 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); *background-color: #51a351; @@ -1891,10 +2471,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, +.btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -1903,15 +2485,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); 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); *background-color: #2f96b4; @@ -1920,10 +2503,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, +.btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -1932,15 +2517,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + 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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); 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); *background-color: #222222; @@ -1949,10 +2535,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, +.btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -1962,8 +2550,8 @@ button.close { } button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { @@ -1985,19 +2573,46 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #810606; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover, +.btn-link:focus { + color: #380303; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { + color: #333333; + text-decoration: none; +} .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + *zoom: 1; + font-size: 0; + vertical-align: middle; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2005,24 +2620,38 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } -.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 { + margin-left: 5px; } .btn-group > .btn { position: relative; - float: left; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu, +.btn-group > .popover { + font-size: 14px; +} +.btn-group > .btn-mini { + font-size: 10.5px; +} +.btn-group > .btn-small { + font-size: 11.9px; +} +.btn-group > .btn-large { + font-size: 17.5px; +} .btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; @@ -2069,26 +2698,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2100,7 +2733,7 @@ input[type="submit"].btn.btn-mini { background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #f21010; + background-color: #810606; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #f89406; @@ -2118,29 +2751,23 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -2150,45 +2777,95 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +} +.btn-group-vertical { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group-vertical > .btn { + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group-vertical > .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.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 { + -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 { + -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 { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.alert, +.alert h4 { color: #c09853; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #468847; } +.alert-success h4 { + color: #468847; +} .alert-danger, .alert-error { background-color: #f8f0f0; border-color: #c6898b; color: #b55457; } +.alert-danger h4, +.alert-error h4 { + color: #b55457; +} .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #3a87ad; } +.alert-info h4 { + color: #3a87ad; +} .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -2202,25 +2879,29 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} .nav > .pull-right { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2243,18 +2924,20 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #5b0404; + background-color: #810606; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2270,6 +2953,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2295,19 +2979,21 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-tabs > li > a:hover { +.nav-tabs > li > a:hover, +.nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: #555555; - background-color: #ffffff; + background-color: #eeeeee; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -2322,9 +3008,10 @@ input[type="submit"].btn.btn-mini { border-radius: 5px; } .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: #ffffff; - background-color: #5b0404; + background-color: #810606; } .nav-stacked > li { float: none; @@ -2342,16 +3029,23 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -2362,51 +3056,60 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #5b0404; - border-bottom-color: #5b0404; +.nav .dropdown-toggle .caret { + border-top-color: #810606; + border-bottom-color: #810606; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #120101; - border-bottom-color: #120101; +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { + border-top-color: #380303; + border-bottom-color: #380303; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; } -.nav > .dropdown.active > a:hover { - color: #000000; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: #ffffff; background-color: #999999; border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: #999999; } .tabbable { @@ -2416,6 +3119,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2448,12 +3152,14 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below > .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover, +.tabs-below > .nav-tabs > li > a:focus { border-bottom-color: transparent; border-top-color: #ddd; } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, @@ -2477,11 +3183,13 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2496,78 +3204,110 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.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); + *zoom: 1; +} +.navbar-inner:before, +.navbar-inner:after { + display: table; + content: ""; + line-height: 0; +} +.navbar-inner:after { + clear: both; } .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; + overflow: visible; } .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #777777; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .brand:hover, +.navbar .brand:focus { + text-decoration: none; } -.navbar .navbar-text { +.navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #777777; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover, +.navbar-link:focus { + color: #333333; +} +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #f2f2f2; + border-right: 1px solid #ffffff; } .navbar .btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { + margin-top: 0; } .navbar-form { margin-bottom: 0; @@ -2577,6 +3317,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -2588,7 +3329,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -2599,7 +3341,7 @@ input[type="submit"].btn.btn-mini { } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } .navbar-form .input-append input, @@ -2609,44 +3351,28 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; +.navbar-static-top { + position: static; + margin-bottom: 0; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -2657,6 +3383,13 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -2664,6 +3397,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -2671,9 +3405,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); +} .navbar-fixed-bottom { bottom: 0; } +.navbar-fixed-bottom .navbar-inner { + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -2683,51 +3428,36 @@ input[type="submit"].btn.btn-mini { } .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #777777; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; + text-shadow: 0 1px 0 #ffffff; } -.navbar .btn-group { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #ffffff; + color: #333333; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #555555; text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { display: none; @@ -2735,18 +3465,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + 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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + 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); - *background-color: #222222; + *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2755,16 +3486,18 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -2781,7 +3514,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -2792,7 +3525,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -2802,142 +3535,293 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + background-color: #e5e5e5; + color: #555555; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + border-color: #252525; } -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { + color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.breadcrumb .divider { - padding: 0 5px; +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover, +.navbar-inverse .brand:focus, +.navbar-inverse .nav > li > a:focus { + color: #ffffff; +} +.navbar-inverse .brand { color: #999999; } -.breadcrumb .active a { - color: #333333; +.navbar-inverse .navbar-text { + color: #999999; } -.pagination { - height: 36px; - margin: 18px 0; +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + background-color: transparent; + color: #ffffff; } -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover, +.navbar-inverse .navbar-link:focus { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #111111; + border-right-color: #222222; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111111; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > a:hover .caret, +.navbar-inverse .nav li.dropdown > a:focus .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; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + 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-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + 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); + *background-color: #040404; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:focus, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} +.breadcrumb { + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb > li > .divider { + padding: 0 5px; + color: #ccc; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + margin: 20px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; -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 ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 34px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination ul > li > a:hover, +.pagination ul > li > a:focus, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a { +.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, +.pagination ul > .disabled > a:focus { color: #999999; background-color: transparent; cursor: default; } -.pagination li:first-child a { +.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-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.pagination li:last-child a { - -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; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -2945,9 +3829,63 @@ input[type="submit"].btn.btn-mini { .pagination-right { 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-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 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-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 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; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 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-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -2956,6 +3894,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -2963,7 +3902,8 @@ input[type="submit"].btn.btn-mini { .pager li { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -2972,34 +3912,27 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 15px; border-radius: 15px; } -.pager a:hover { +.pager li > a:hover, +.pager li > a:focus { 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 > a:focus, +.pager .disabled > span { color: #999999; background-color: #fff; cursor: default; } -.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: 2070; -} .modal-backdrop { position: fixed; top: 0; @@ -3019,12 +3952,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -3040,17 +3972,17 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -3059,7 +3991,12 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { + position: relative; overflow-y: auto; max-height: 400px; padding: 15px; @@ -3085,6 +4022,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3096,13 +4034,16 @@ input[type="submit"].btn.btn-mini { .modal-footer .btn-group .btn + .btn { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -3111,52 +4052,24 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .tooltip.top { - margin-top: -2px; + margin-top: -3px; + padding: 5px 0; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; + padding: 5px 0; } .tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: #ffffff; text-align: center; text-decoration: none; @@ -3169,100 +4082,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; } -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + border-width: 5px 5px 0; + border-top-color: #000000; } -.popover.right .arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + border-width: 5px 5px 5px 0; + border-right-color: #000000; } -.popover.left .arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -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); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + border-width: 5px 0 5px 5px; + border-left-color: #000000; } -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .thumbnails { margin-left: -20px; @@ -3273,6 +4122,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3282,23 +4132,28 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #5b0404; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #810606; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -3311,10 +4166,13 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3324,19 +4182,25 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, -a.badge:hover { +a.label:focus, +a.badge:hover, +a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; @@ -3381,6 +4245,15 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0; @@ -3423,17 +4296,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', 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); @@ -3443,41 +4315,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', 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); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3490,88 +4364,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -3596,7 +4470,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -3604,47 +4478,47 @@ a.badge:hover { width: 100%; position: relative; } -.carousel .item { +.carousel-inner > .item { display: none; position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > 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%; } .carousel-control { @@ -3671,28 +4545,62 @@ a.badge:hover { left: auto; right: 15px; } -.carousel-control:hover { +.carousel-control:hover, +.carousel-control:focus { color: #ffffff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} +.carousel-indicators .active { + background-color: #fff; +} .carousel-caption { position: absolute; left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .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; @@ -3705,1279 +4613,2219 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; +.hero-unit li { + line-height: 30px; } -.hide { +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; } -.show { - display: block; +.popover.top { + margin-top: -10px; } -.invisible { - visibility: hidden; +.popover.right { + margin-left: 10px; } -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot'); - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; +.popover.bottom { + margin-top: 10px; } -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: FontAwesome; +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; +.popover-title:empty { + display: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: middle; - font-size: 1.3333333333333333em; +.popover-content { + padding: 9px 14px; } -.btn [class^="icon-"], -.nav-tabs [class^="icon-"], -.btn [class*=" icon-"], -.nav-tabs [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -li [class^="icon-"], -li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.popover .arrow { + border-width: 11px; } -li .icon-large:before, -li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; +.popover .arrow:after { + border-width: 10px; + content: ""; } -ul.icons { - list-style-type: none; - margin-left: 2em; - text-indent: -0.8em; +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .8em; +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); } -ul.icons li .icon-large:before, -ul.icons li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - vertical-align: initial; +.popover.right .arrow:after { + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } -.icon-music:before { - content: "\f001"; +.popover.bottom .arrow:after { + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; } -.icon-search:before { - content: "\f002"; +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); } -.icon-envelope:before { - content: "\f003"; +.popover.left .arrow:after { + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; } -.icon-heart:before { - content: "\f004"; +.pull-right { + float: right; } -.icon-star:before { - content: "\f005"; +.pull-left { + float: left; } -.icon-star-empty:before { - content: "\f006"; +.hide { + display: none; } -.icon-user:before { - content: "\f007"; +.show { + display: block; } -.icon-film:before { - content: "\f008"; +.invisible { + visibility: hidden; } -.icon-th-large:before { - content: "\f009"; +.affix { + position: fixed; } -.icon-th:before { - content: "\f00a"; +.tag { + display: inline-block; + margin-bottom: 4px; + color: #111111; + background-color: #f6f6f6; + padding: 1px 10px; + border: 1px solid #dddddd; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.icon-th-list:before { - content: "\f00b"; +a.tag:hover { + text-decoration: none; + color: #fff; + background-color: #b20808; + border: 1px solid #810606; + -webkit-box-shadow: inset 0 1px 0 #e20b0b; + -moz-box-shadow: inset 0 1px 0 #e20b0b; + box-shadow: inset 0 1px 0 #e20b0b; } -.icon-ok:before { - content: "\f00c"; +.pill { + display: inline-block; + background-color: #6f8890; + color: #ffffff; + padding: 2px 10px 1px 10px; + margin-right: 5px; + font-weight: normal; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-remove:before { - content: "\f00d"; +.pill a { + color: #ffffff; } -.icon-zoom-in:before { - content: "\f00e"; +.pill a.remove { + font-size: 11px; } -.icon-zoom-out:before { - content: "\f010"; +.unstyled { + margin: 0; + list-style: none; } -.icon-off:before { - content: "\f011"; +.simple-item { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-signal:before { - content: "\f012"; +.simple-item:last-of-type { + border-bottom: 0; } -.icon-cog:before { - content: "\f013"; +.simple-list { + *zoom: 1; + margin: 0; + list-style: none; } -.icon-trash:before { - content: "\f014"; +.simple-list:before, +.simple-list:after { + display: table; + content: ""; + line-height: 0; } -.icon-home:before { - content: "\f015"; +.simple-list:after { + clear: both; } -.icon-file:before { - content: "\f016"; +.simple-list > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-time:before { - content: "\f017"; +.simple-list > li:last-of-type { + border-bottom: 0; } -.icon-road:before { - content: "\f018"; +.simple-list .ckan-icon { + position: relative; + top: 0px; } -.icon-download-alt:before { - content: "\f019"; +.module-narrow .simple-list > li { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-download:before { - content: "\f01a"; +.listing li { + text-align: right; + margin-bottom: 5px; } -.icon-upload:before { - content: "\f01b"; +.listing .key { + clear: right; + font-weight: bold; } -.icon-inbox:before { - content: "\f01c"; +.js .tab-content { + display: none; } -.icon-play-circle:before { - content: "\f01d"; +.js .tab-content.active { + display: block; } -.icon-repeat:before { - content: "\f01e"; +.box { + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); } -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; +.module { + margin: 20px 0; } -.icon-list-alt:before { - content: "\f022"; +.module-heading { + *zoom: 1; + margin: 0; + padding: 7px 25px; + font-size: 14px; + line-height: 1.3; + background-color: #f6f6f6; + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } -.icon-lock:before { - content: "\f023"; +.module-heading:before, +.module-heading:after { + display: table; + content: ""; + line-height: 0; } -.icon-flag:before { - content: "\f024"; +.module-heading:after { + clear: both; } -.icon-headphones:before { - content: "\f025"; +.module-heading .action { + float: right; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; } -.icon-volume-off:before { - content: "\f026"; +.module-heading .action:hover { + color: #444444; } -.icon-volume-down:before { - content: "\f027"; +.module-content { + padding: 0 25px; + margin: 20px 0; } -.icon-volume-up:before { - content: "\f028"; +.module-content:first-child { + margin-top: 0; + padding-top: 20px; } -.icon-qrcode:before { - content: "\f029"; +.module-content:last-child { + margin-bottom: 0; + padding-bottom: 20px; } -.icon-barcode:before { - content: "\f02a"; +.module-content > :last-child { + margin-bottom: 0; } -.icon-tag:before { - content: "\f02b"; +.module:first-child .module-heading { + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; + border-top-width: 0; } -.icon-tags:before { - content: "\f02c"; +.module:last-child { + margin-bottom: 20px; } -.icon-book:before { - content: "\f02d"; +.module-footer { + padding: 7px 25px 7px; + margin: 0; + border-top: 1px dotted #dddddd; } -.icon-bookmark:before { - content: "\f02e"; +.module .read-more { + font-weight: bold; + color: #000000; } -.icon-print:before { - content: "\f02f"; +.module .pagination { + height: 34px; + margin-bottom: 0; + border-top: 1px solid #dddddd; } -.icon-camera:before { - content: "\f030"; +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; } -.icon-font:before { - content: "\f031"; +.module .pagination > ul { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: 0; } -.icon-bold:before { - content: "\f032"; +.module .pagination li a { + border-top: none; + border-bottom: none; + padding-top: 7px; + padding-bottom: 7px; } -.icon-italic:before { - content: "\f033"; +.module .pagination li:first-child a, +.module .pagination li:last-child a { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.icon-text-height:before { - content: "\f034"; +.module .pagination li:first-child a { + border-left-width: 0; } -.icon-text-width:before { - content: "\f035"; +.module .pagination li:last-child a { + border-right-width: 0; } -.icon-align-left:before { - content: "\f036"; +.module .pagination li.active a { + border-left-width: 1px; + border-right-width: 1px; } -.icon-align-center:before { - content: "\f037"; +.module-content-shallow { + padding: 0; + margin-top: 10px; + padding-bottom: 10px; } -.icon-align-right:before { - content: "\f038"; +.module h1 { + margin-bottom: 20px; } -.icon-align-justify:before { - content: "\f039"; +.module-shallow .module-content { + padding: 10px; + margin: 0; } -.icon-list:before { - content: "\f03a"; +.module-shallow .module-tags { + margin-top: 0; + margin-bottom: 0; } -.icon-indent-left:before { - content: "\f03b"; +.module-shallow .module-content:first-child { + padding-top: 10px; } -.icon-indent-right:before { - content: "\f03c"; +.module-shallow .module-content:last-child { + padding-bottom: 10px; } -.icon-facetime-video:before { - content: "\f03d"; +.module-narrow .module-heading, +.module-narrow .module-content, +.module-narrow .module-footer { + padding-left: 15px; + padding-right: 15px; } -.icon-picture:before { - content: "\f03e"; +.module-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-pencil:before { - content: "\f040"; +.module-grid:before, +.module-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-map-marker:before { - content: "\f041"; +.module-grid:after { + clear: both; } -.icon-adjust:before { - content: "\f042"; +.module-item { + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + float: left; + margin-left: 20px; + width: 460px; + padding-top: 10px; + padding-bottom: 10px; + padding-right: 50px; + overflow: hidden; + position: relative; } -.icon-tint:before { - content: "\f043"; +.module-item span.count { + color: #999; } -.icon-edit:before { - content: "\f044"; +.module-item .media-image { + margin-bottom: 5px; } -.icon-share:before { - content: "\f045"; +.module-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-check:before { - content: "\f046"; +.module-item:hover { + z-index: 1; } -.icon-move:before { - content: "\f047"; +.module-item:hover .media-edit { + opacity: 1; } -.icon-step-backward:before { - content: "\f048"; +.module-item.first { + clear: left; } -.icon-fast-backward:before { - content: "\f049"; +.group .content img { + margin: 0 -5px 5px; + max-width: initial; } -.icon-backward:before { - content: "\f04a"; +.group .content h3 { + font-size: 14px; + line-height: 1.3; } -.icon-play:before { - content: "\f04b"; +.group-listing { + margin-left: -20px; } -.icon-pause:before { - content: "\f04c"; +.ckanext-datapreview { + position: relative; } -.icon-stop:before { - content: "\f04d"; +.ckanext-datapreview > iframe { + min-height: 400px; } -.icon-forward:before { - content: "\f04e"; +.ckanext-datapreview > img { + max-height: 500px; + max-width: 100%; + overflow: hidden; } -.icon-fast-forward:before { - content: "\f050"; +.package-info h4 { + margin-bottom: 10px; } -.icon-step-forward:before { - content: "\f051"; +.module-resource { + background-color: #ffffff; + border-bottom: 1px solid #dddddd; + margin-top: 0; + margin-bottom: 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.icon-eject:before { - content: "\f052"; +.module-resource .actions { + position: relative; + float: right; + top: -10px; + right: -15px; } -.icon-chevron-left:before { - content: "\f053"; +.module .module-tags { + padding-bottom: 8px; } -.icon-chevron-right:before { - content: "\f054"; +.secondary .module:first-child, +.primary .module:first-child { + margin-top: 0; } -.icon-plus-sign:before { - content: "\f055"; +.no-nav .module:last-child { + margin-top: 0; } -.icon-minus-sign:before { - content: "\f056"; -} -.icon-remove-sign:before { - content: "\f057"; +.module-image { + float: left; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + margin-right: 15px; } -.icon-ok-sign:before { - content: "\f058"; +.module-image img { + max-width: 50px; + max-height: 50px; + vertical-align: middle; } -.icon-question-sign:before { - content: "\f059"; +.banner { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center; + position: absolute; + top: 15px; + right: -35px; + width: 80px; + color: #ffffff; + background-color: #810606; + padding: 1px 20px; + font-size: 11px; + text-align: center; + text-transform: uppercase; } -.icon-info-sign:before { - content: "\f05a"; +.media-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-screenshot:before { - content: "\f05b"; +.media-grid:before, +.media-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-remove-circle:before { - content: "\f05c"; +.media-grid:after { + clear: both; } -.icon-ok-circle:before { - content: "\f05d"; +.media-item { + position: relative; + float: left; + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-ban-circle:before { - content: "\f05e"; +.media-item span.count { + color: #999; } -.icon-arrow-left:before { - content: "\f060"; +.media-item .media-image { + margin-bottom: 5px; } -.icon-arrow-right:before { - content: "\f061"; +.media-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-arrow-up:before { - content: "\f062"; +.media-item:hover { + z-index: 1; } -.icon-arrow-down:before { - content: "\f063"; +.media-item:hover .media-edit { + opacity: 1; } -.icon-share-alt:before { - content: "\f064"; +.media-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 1px solid #dddddd; + overflow: hidden; + -webkit-transition: all 0.2s ease-in; + -moz-transition: all 0.2s ease-in; + -o-transition: all 0.2s ease-in; + transition: all 0.2s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-resize-full:before { - content: "\f065"; +.media-view:hover, +.media-view.hovered { + border-color: #810606; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); } -.icon-resize-small:before { - content: "\f066"; +.media-view:hover .banner, +.media-view.hovered .banner { + background-color: #810606; } -.icon-plus:before { - content: "\f067"; +.media-view span { + display: none; } -.icon-minus:before { - content: "\f068"; +.media-view .banner { + display: block; + background-color: #b7b7b7; + -webkit-transition: background-color 0.2s ease-in; + -moz-transition: background-color 0.2s ease-in; + -o-transition: background-color 0.2s ease-in; + transition: background-color 0.2s ease-in; } -.icon-asterisk:before { - content: "\f069"; +.media-image { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.icon-exclamation-sign:before { - content: "\f06a"; +.media-heading { + font-size: 18px; + line-height: 1.3; + margin: 5px 0; } -.icon-gift:before { - content: "\f06b"; +.media-overlay { + position: relative; + min-height: 35px; } -.icon-leaf:before { - content: "\f06c"; +.media-overlay .media-heading { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 12px 10px; + margin: 0; + background-color: #000; + background-color: rgba(0, 0, 0, 0.8); + font-size: 13px; + color: #fff; + z-index: 1; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -.icon-fire:before { - content: "\f06d"; +.media-overlay .media-image { + float: none; + display: block; + margin-right: 0; } -.icon-eye-open:before { - content: "\f06e"; +.media-item.is-expander .truncator-link { + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; + position: absolute; + z-index: 10; + left: 15px; + bottom: 15px; + opacity: 0; } -.icon-eye-close:before { - content: "\f070"; +.media-item.is-expander:hover { + padding-bottom: 35px; } -.icon-warning-sign:before { - content: "\f071"; +.media-item.is-expander:hover .truncator-link { + opacity: 1; } -.icon-plane:before { - content: "\f072"; +.wide .media-item { + width: 186px; } -.icon-calendar:before { - content: "\f073"; +.nav-simple, +.nav-aside { + *zoom: 1; + margin: 0; + list-style: none; + padding-bottom: 0; } -.icon-random:before { - content: "\f074"; +.nav-simple:before, +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { + display: table; + content: ""; + line-height: 0; } -.icon-comment:before { - content: "\f075"; +.nav-simple:after, +.nav-aside:after { + clear: both; } -.icon-magnet:before { - content: "\f076"; +.nav-simple > li, +.nav-aside > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-chevron-up:before { - content: "\f077"; +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { + border-bottom: 0; } -.icon-chevron-down:before { - content: "\f078"; +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { + position: relative; + top: 0px; } -.icon-retweet:before { - content: "\f079"; +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; } -.icon-shopping-cart:before { - content: "\f07a"; +.nav-item > a, +.nav-aside li a { + color: #333333; + font-size: 14px; + line-height: 20px; + margin: -7px -25px; + padding: 7px 25px; } -.icon-folder-close:before { - content: "\f07b"; +.nav-item.active, +.nav-aside li.active { + background-color: #f6f6f6; } -.icon-folder-open:before { - content: "\f07c"; +.nav-item.active > a, +.nav-aside li.active a { + position: relative; + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-vertical:before { - content: "\f07d"; +.nav-item.active > a:hover, +.nav-aside li.active a:hover { + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-horizontal:before { - content: "\f07e"; +.nav-item.active > a:before, +.nav-aside li.active a:before { + content: ' '; + position: absolute; + top: 0; + right: -6px; + width: 6px; + height: 34px; + background-image: url("../../../base/images/nav-active.png?1"); } -.icon-bar-chart:before { - content: "\f080"; +.nav-item.active > a span, +.nav-aside li.active a span { + white-space: nowrap; + overflow: hidden; + display: block; } -.icon-twitter-sign:before { - content: "\f081"; +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-facebook-sign:before { - content: "\f082"; +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { + position: relative; } -.icon-camera-retro:before { - content: "\f083"; +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { + padding-left: 42px; + padding-right: 42px; } -.icon-key:before { - content: "\f084"; +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { + position: absolute; + top: 50%; + left: 15px; + width: 20px; + height: 20px; + margin-top: -10px; + z-index: 2; } -.icon-cogs:before { - content: "\f085"; +.nav-facet .nav-item > a:hover:after, +.nav-facet .nav-item.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-comments:before { - content: "\f086"; +.nav-facet .nav-item > a:hover:after { + width: 17px; + height: 17px; + background-position: -17px -16px; } -.icon-thumbs-up:before { - content: "\f087"; +.nav-facet .nav-item.active > a:after { + width: 17px; + height: 17px; + background-position: 0px -16px; + right: 3px; } -.icon-thumbs-down:before { - content: "\f088"; +.user-list { + margin: 0; + list-style: none; } -.icon-star-half:before { - content: "\f089"; +.user-list li { + margin: 0 0 10px 0; } -.icon-heart-empty:before { - content: "\f08a"; +.user-list .gravatar { + vertical-align: -4px; + margin-right: 3px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-signout:before { - content: "\f08b"; +.nav-facet-tertiary { + margin: 10px 0; } -.icon-linkedin-sign:before { - content: "\f08c"; +.nav-facet-tertiary .module-heading { + margin-bottom: 5px; + padding: 8px 12px; + border-bottom-width: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.icon-pushpin:before { - content: "\f08d"; +.nav-facet-tertiary .module-heading i { + display: none; } -.icon-external-link:before { - content: "\f08e"; +.nav-facet-tertiary .module-footer { + padding: 8px 12px; + border-top-width: 0; } -.icon-signin:before { - content: "\f090"; +.nav-facet-tertiary .module-footer a { + font-weight: normal; + color: #8C8C8C; } -.icon-trophy:before { - content: "\f091"; +.nav-facet-tertiary .nav { + margin-bottom: 0; } -.icon-github-sign:before { - content: "\f092"; +.nav-facet-tertiary .module-content.empty { + padding: 8px 12px; + margin-top: 0; } -.icon-upload-alt:before { - content: "\f093"; +.nav-facet-tertiary .nav li.active { + position: relative; } -.icon-lemon:before { - content: "\f094"; +.nav-facet-tertiary .nav li.active > a:hover:after, +.nav-facet-tertiary .nav li.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 17px; + height: 17px; + background-position: 0px -16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-phone:before { - content: "\f095"; +.nav-simple > .nav-btn { + padding-left: 0; + padding-right: 0; + text-align: center; } -.icon-check-empty:before { - content: "\f096"; +.nav-simple > .nav-btn .btn { + display: inline-block; } -.icon-bookmark-empty:before { - content: "\f097"; +.js .js-hide { + display: none; } -.icon-phone-sign:before { - content: "\f098"; +.js .js-hide.active { + display: block; } -.icon-twitter:before { - content: "\f099"; +.btn, +label { + font-weight: bold; } -.icon-facebook:before { - content: "\f09a"; +.btn-rounded { + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + padding-left: 15px; + padding-right: 15px; } -.icon-github:before { - content: "\f09b"; +label { + cursor: pointer; + font-size: 14px; } -.icon-unlock:before { - content: "\f09c"; +label:after { + content: ":"; } -.icon-credit-card:before { - content: "\f09d"; +label.radio:after, +label.checkbox:after { + content: ""; } -.icon-rss:before { - content: "\f09e"; +input[type=radio], +input[type=checkbox] { + position: relative; + top: 7px; + padding: 0; + margin: 0; } -.icon-hdd:before { - content: "\f0a0"; +input[type=radio].checkbox-onown, +input[type=checkbox].checkbox-onown { + top: 0; } -.icon-bullhorn:before { - content: "\f0a1"; +select { + padding: 4px; } -.icon-bell:before { - content: "\f0a2"; +textarea { + max-width: 100%; } -.icon-certificate:before { - content: "\f0a3"; +.control-group .btn { + position: relative; + top: -2px; } -.icon-hand-right:before { - content: "\f0a4"; +.control-full input, +.control-full select, +.control-full textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: auto; + width: 100%; } -.icon-hand-left:before { - content: "\f0a5"; +.control-medium input, +.control-medium select, +.control-medium textarea { + width: 320px; } -.icon-hand-up:before { - content: "\f0a6"; +.control-large input, +.control-large .control-label { + font-size: 17.5px; + line-height: 30px; } -.icon-hand-down:before { - content: "\f0a7"; +.control-large input { + height: 41px; } -.icon-circle-arrow-left:before { - content: "\f0a8"; +.form-actions { + background: none; + margin-left: -25px; + margin-right: -25px; + margin-bottom: 0; + padding-bottom: 0; + text-align: right; } -.icon-circle-arrow-right:before { - content: "\f0a9"; +.form-actions .action-info { + float: left; + width: 50%; + line-height: 2; + text-align: left; + color: #707070; + margin: 0; } -.icon-circle-arrow-up:before { - content: "\f0aa"; +.form-actions .action-info.small { + font-size: 11px; + line-height: 1.2; } -.icon-circle-arrow-down:before { - content: "\f0ab"; +.form-horizontal .control-label { + width: 120px; } -.icon-globe:before { - content: "\f0ac"; +.form-horizontal .controls { + margin-left: 130px; } -.icon-wrench:before { - content: "\f0ad"; +.form-horizontal .info-block { + position: relative; + display: block; + font-size: 11px; + color: #aaaaaa; + line-height: 1.3; + padding: 6px 0 6px 25px; + margin-top: 6px; } -.icon-tasks:before { - content: "\f0ae"; +.form-horizontal .info-help { + padding: 6px 0; } -.icon-filter:before { - content: "\f0b0"; +.form-horizontal .info-help:before { + display: none; } -.icon-briefcase:before { - content: "\f0b1"; +.form-horizontal .info-help-tight { + margin-top: -10px; } -.icon-fullscreen:before { - content: "\f0b2"; +.form-horizontal .info-inline { + float: right; + width: 265px; + margin-top: 0; + padding-bottom: 0; } -.icon-group:before { - content: "\f0c0"; +.form-horizontal .control-medium .info-block.info-inline { + width: 165px; } -.icon-link:before { - content: "\f0c1"; +.form-horizontal .info-block:before { + font-size: 2.2em; + position: absolute; + left: 0; + top: 2px; } -.icon-cloud:before { - content: "\f0c2"; +.form-horizontal .info-inline:before { + top: 8px; } -.icon-beaker:before { - content: "\f0c3"; +.info-block .icon-large, +.info-inline .icon-large { + float: left; + font-size: 22px; + margin-right: 15px; } -.icon-cut:before { - content: "\f0c4"; +.form-horizontal .info-block a { + color: #aaaaaa; + text-decoration: underline; } -.icon-copy:before { - content: "\f0c5"; +.form-horizontal .form-actions { + padding-left: 25px; + padding-right: 25px; } -.icon-paper-clip:before { - content: "\f0c6"; +.form-inline input { + padding-bottom: 9px; } -.icon-save:before { - content: "\f0c7"; +.form-inline select { + margin-top: 0; } -.icon-sign-blank:before { - content: "\f0c8"; +.form-inline .btn { + margin-left: 5px; } -.icon-reorder:before { - content: "\f0c9"; +.form-narrow label { + margin-bottom: 0; } -.icon-list-ul:before { - content: "\f0ca"; +.form-narrow select { + width: 100%; } -.icon-list-ol:before { - content: "\f0cb"; +.form-narrow .form-actions { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px 0; } -.icon-strikethrough:before { - content: "\f0cc"; +.form-select label { + margin-right: 5px; } -.icon-underline:before { - content: "\f0cd"; +.simple-input label, +.simple-input button { + display: none; } -.icon-table:before { - content: "\f0ce"; +.simple-input .field { + position: relative; } -.icon-magic:before { - content: "\f0d0"; +.simple-input .field-bordered { + border-bottom: 1px dotted #dddddd; } -.icon-truck:before { - content: "\f0d1"; +.simple-input .field input { + width: 100%; + height: auto; + margin: 0 -7px; + padding: 7px 5px; } -.icon-pinterest:before { - content: "\f0d2"; +.simple-input .field .btn-search { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + background-position: -51px -16px; + position: absolute; + display: block; + height: 17px; + width: 17px; + top: 50%; + right: 0; + margin-top: -8px; + background-color: transparent; + border: none; + text-indent: -999em; } -.icon-pinterest-sign:before { - content: "\f0d3"; +.editor textarea { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: none; } -.icon-google-plus-sign:before { - content: "\f0d4"; +.editor .editor-info-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + float: none; + padding: 4px 10px; + background: #ebebeb; + width: auto; + border: 1px solid #cccccc; + border-top: none; + font-size: 11px; + color: #282828; } -.icon-google-plus:before { - content: "\f0d5"; +.editor .editor-info-block a { + color: #810606; + text-decoration: none; } -.icon-money:before { - content: "\f0d6"; +.control-custom { + font-size: 0; } -.icon-caret-down:before { - content: "\f0d7"; +.control-custom label { + margin-bottom: 0; } -.icon-caret-up:before { - content: "\f0d8"; +.control-custom input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + width: 140px; } -.icon-caret-left:before { - content: "\f0d9"; +.control-custom input:last-of-type { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } -.icon-caret-right:before { - content: "\f0da"; +.control-custom .checkbox { + display: inline-block; + margin-left: 5px; } -.icon-columns:before { - content: "\f0db"; +.control-custom .checkbox input { + width: auto; } -.icon-sort:before { - content: "\f0dc"; +.control-custom.disabled label, +.control-custom.disabled input { + color: #aaaaaa; + text-decoration: line-through; + text-shadow: none; } -.icon-sort-down:before { - content: "\f0dd"; +.control-custom.disabled input { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f3f3f3; } -.icon-sort-up:before { - content: "\f0de"; +.control-custom.disabled .checkbox { + color: #444444; + text-decoration: none; } -.icon-envelope-alt:before { - content: "\f0e0"; +.control-custom .checkbox.btn { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + position: relative; + top: 0; + left: 5px; + height: 1px; + width: 9px; + padding: 3px 8px; + line-height: 18px; } -.icon-linkedin:before { - content: "\f0e1"; +.control-custom .checkbox.btn span { + display: none; + width: 30px; } -.icon-undo:before { - content: "\f0e2"; +.control-custom .checkbox.btn:before { + position: relative; + top: 1px; + left: -1px; + color: #fff; } -.icon-legal:before { - content: "\f0e3"; +.control-custom .checkbox.btn input { + display: none; } -.icon-dashboard:before { - content: "\f0e4"; +.control-custom.disabled .checkbox.btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #9e0707; + background-image: -moz-linear-gradient(top, #b20808, #810606); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b20808), to(#810606)); + background-image: -webkit-linear-gradient(top, #b20808, #810606); + background-image: -o-linear-gradient(top, #b20808, #810606); + background-image: linear-gradient(to bottom, #b20808, #810606); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb20808', endColorstr='#ff810606', GradientType=0); + border-color: #810606 #810606 #380303; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #810606; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.icon-comment-alt:before { - content: "\f0e5"; +.control-custom.disabled .checkbox.btn:hover, +.control-custom.disabled .checkbox.btn:focus, +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active, +.control-custom.disabled .checkbox.btn.disabled, +.control-custom.disabled .checkbox.btn[disabled] { + color: #ffffff; + background-color: #810606; + *background-color: #690505; } -.icon-comments-alt:before { - content: "\f0e6"; +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active { + background-color: #500404 \9; } -.icon-bolt:before { - content: "\f0e7"; +.control-custom.disabled .checkbox.btn .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.icon-sitemap:before { - content: "\f0e8"; +.alert-danger a, +.alert-error a { + color: #b55457; } -.icon-umbrella:before { - content: "\f0e9"; +.control-group.error input, +.control-group.error select, +.control-group.error textarea, +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { + border-color: #c6898b; } -.icon-paste:before { - content: "\f0ea"; +.error-inline { + color: #b55457; } -.icon-user-md:before { - content: "\f200"; +.error-block, +.error-inline { + font-size: 12px; } -.pill { - background-color: #cccccc; +.error-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + padding: 6px 8px 3px; + background: #c6898b; + margin: -3px 0 0; color: #ffffff; - padding: 1px 5px 1px 8px; - margin-right: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + width: 208px; } -.pill a { - color: #ffffff; +.control-medium .error-block { + width: 318px; } -.pill a.remove { - font-size: 11px; +.control-full .error-block { + width: auto; } -.tag { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; - position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #5b0404; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; +.control-group.error .input-prepend .error-block, +.control-custom.error .error-block { + width: auto; } -.tag:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; +.control-custom.error .error-block { + width: 401px; } -.unstyled { +.control-select.error .error-block { + width: 196px; +} +.stages { margin: 0; list-style: none; + *zoom: 1; + color: #aeaeae; + counter-reset: stage; + margin: -20px -25px 20px; + overflow: hidden; } -.simple-item { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; -} -.simple-item:last-of-type { - border-bottom: 0; -} -.simple-list { - *zoom: 1; - margin: 0; - list-style: none; -} -.simple-list:before, -.simple-list:after { +.stages:before, +.stages:after { display: table; content: ""; + line-height: 0; } -.simple-list:after { +.stages:after { clear: both; } -.simple-list > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.stages li { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 27px; + counter-increment: stage; + width: 33.33%; + background-color: #ededed; + float: left; + padding: 10px 20px; + position: relative; + z-index: 0; } -.simple-list > li:last-of-type { - border-bottom: 0; +.stages li:before { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + content: counter(stage); + display: inline-block; + width: 27px; + height: 27px; + margin-right: 5px; + font-weight: bold; + text-align: center; + color: #ffffff; + background-color: #aeaeae; + z-index: 1; } -.simple-list .ckan-icon { - position: relative; - top: 0px; +.stages li:after { + left: 0; + border: solid rgba(237, 237, 237, 0); + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: #ededed; + border-bottom-color: #ededed; + border-width: 29px; + top: 50%; + margin-top: -29px; + margin-left: -30px; } -.module-narrow .simple-list > li { - padding-left: 15px; - padding-right: 15px; +.stages li.last { position: relative; + right: -1px; } -.listing li { - text-align: right; - margin-bottom: 5px; -} -.listing .key { - clear: right; - font-weight: bold; +.stages li.last, +.stages li.last .highlight { + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; } -.js .tab-content { - display: none; +.stages li.first:after { + content: none; + border: none; } -.js .tab-content.active { - display: block; +.stages li.active:after { + border-color: rgba(140, 198, 138, 0); + border-top-color: #8cc68a; + border-bottom-color: #8cc68a; } -.module { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - background-color: #ffffff; - margin-bottom: 20px; +.stages li.complete:after { + border-color: rgba(197, 226, 196, 0); + border-top-color: #c5e2c4; + border-bottom-color: #c5e2c4; } -.module-heading { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - font-size: 14px; - line-height: 1.3; - padding: 7px 25px; - border-bottom: 1px solid #d0d0d0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.stages.stage-3 li.complete:first-child:after { + content: none; } -.module-heading-secondary { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border-top: 1px solid #d0d0d0; +.stages li.active, +.stages li.complete { + background: none; } -.module-heading [class^=icon]:before { - font-size: 1.2em; - line-height: 1; - position: relative; - top: 1px; - margin-right: 0.1em; +.stages li.active:before { + color: #8cc68a; + background: #ffffff; } -.module-heading .action { - float: right; - color: #8c8c8c; - font-size: 11px; - text-decoration: underline; +.stages li.complete:before { + color: #c5e2c4; + background: #eef6ed; } -.module-content { - padding: 0 25px; - margin: 20px 0; +.stages li .highlight { + display: block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + padding: 10px 52px; + border: none; + text-align: left; + text-decoration: none; + line-height: 27px; + z-index: -1; } -.module-content:first-child { - margin-top: 0; - padding-top: 20px; +.stages li.active .highlight { + color: #ffffff; + background: #8cc68a; } -.module-content:last-child { - margin-bottom: 0; - padding-bottom: 20px; +.stages li.complete .highlight { + color: #eef6ed; + background: #c5e2c4; } -.module-content > :last-child { +.alert > :last-child { margin-bottom: 0; } -.module-border-top { - border-top: 1px dotted #cccccc; +.slug-preview { + font-size: 14px; + line-height: 1.5; + margin-top: 5px; + margin-left: 10px; } -.module-border-bottom { - border-bottom: 1px dotted #cccccc; +.slug-preview-value { + background-color: #faedcf; + margin-right: 3px; } -.module-footer { - padding: 7px 25px 7px; - border-top: 1px dotted #cccccc; +.resource-upload-field { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: bottom; } -.module .read-more { - font-weight: bold; - color: #000000; +.resource-upload-field label { + z-index: 0; } -.module .pagination { - height: 34px; - margin-bottom: 0; - border-top: 1px solid #d0d0d0; +.resource-upload-field input { + opacity: 0; + filter: alpha(opacity=0); + position: absolute; + top: 0; + right: 0; + z-index: 1; + margin: 0; + border: solid transparent; + border-width: 100px 0 0 200px; + cursor: pointer; + direction: ltr; + -moz-transform: translate(-300px, 0) scale(4); } -.module .pagination > ul { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0; +.resource-upload-field.loading { + display: inline-block; + background: url("../../../base/images/loading-spinner.gif") no-repeat center right; + padding-right: 5px; } -.module .pagination li a { - border-top: none; - border-bottom: none; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + font-size: 14px; } -.module .pagination li:first-child a, -.module .pagination li:last-child a { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.select2-container-multi .select2-choices .select2-search-field input { + height: 29px; } -.module .pagination li:first-child a { - border-left-width: 0; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + padding-left: 10px; } -.module .pagination li:last-child a { - border-right-width: 0; +.select2-container { + margin-top: 1px; } -.module .pagination li.active a { - border-left-width: 1px; - border-right-width: 1px; +.select2-container-multi { + margin-top: 0; } -.module .action { - text-align: center; +.select2-container-multi .select2-choices .select2-search-choice { + padding: 5px 8px 5px 22px; } -.module-shallow .module-content { - padding: 10px; - margin: 0; +.select2-container-multi.select2-container .select2-choices { + padding-top: 3px; + padding-bottom: 3px; } -.module-shallow .module-content:first-child { - padding-top: 10px; +.select2-search-choice-close, +.select2-container-multi .select2-search-choice-close { + top: 6px; + left: 5px; } -.module-shallow .module-content:last-child { - padding-bottom: 10px; -} -.module-shallow small { - font-size: 11px; - display: block; +.select2-container-multi .select2-choices { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -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); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; } -.module-narrow .module-heading, -.module-narrow .module-content, -.module-narrow .module-footer { - padding-left: 15px; - padding-right: 15px; +.select2-container-active .select2-choices, +.select2-container-multi.select2-container-active .select2-choices { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -.module-grid { - margin: 0; - list-style: none; - margin: 0; - list-style: none; - *zoom: 1; - margin-left: -20px; - padding: 0; +.select2-container-multi .select2-drop { + margin-top: -2px; } -.module-grid:before, -.module-grid:after { - display: table; - content: ""; +.select2-container .select2-results li { + line-height: 18px; + padding-top: 4px; + padding-bottom: 4px; } -.module-grid:after { - clear: both; +.control-full .select2-container { + width: 520px !important; } -.module-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; - float: left; - margin-left: 20px; - width: 460px; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 50px; - overflow: hidden; - position: relative; +.control-group.error .select2-container input:focus, +.control-group.error .select2-container select:focus, +.control-group.error .select2-container textarea:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.module-item.first { - clear: left; +.dataset-item { + border-bottom: 1px dotted #dddddd; + padding-bottom: 20px; + margin-bottom: 20px; } -.group .content img { - margin: 0 -5px 5px; - max-width: initial; +.dataset-item:last-of-type { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } -.group .content h3 { - font-size: 14px; +.dataset-heading { + font-size: 16px; + margin-top: 0; + margin-bottom: 8px; line-height: 1.3; } -.group-listing { - margin-left: -20px; +.dataset-heading a { + color: #333333; } -.ckanext-datapreview { +.dataset-heading .label { position: relative; + top: -1px; } -.ckanext-datapreview > iframe { - min-height: 400px; -} -.ckanext-datapreview > img { - max-height: 500px; - max-width: 100%; - overflow: hidden; +.dataset-private { + margin-right: 10px; + text-transform: uppercase; } -.package-info h4 { - margin-bottom: 10px; +.dataset-private .icon-lock { + width: 9px; } -.media { - position: relative; - overflow: hidden; +.dataset-private.pull-right { + margin-right: 0; } -.media-content > :last-child { - margin-bottom: 0; +.dataset-resources { + margin-top: 8px; } -.media-heading { - font-size: 14px; - line-height: 1.3em; - margin: 5px 0; +.dataset-resources li { + display: inline; } -.media-image, -.media .gravatar { - position: relative; - float: left; - margin-right: 10px; - overflow: hidden; +.dataset-resources li a { + background-color: #aaaaaa; } -.media-image:after { - -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - content: ""; - position: absolute; +.dataset-heading .popular { top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1; -} -.media-image img { - display: block; - margin: 0 auto; -} -.media-vertical .media-image, -.media-vertical .media-content { - float: none; - display: block; -} -.media-vertical .media-image { - margin-right: 0; - max-height: 125px; } -.media-grid, -ul.media-grid, -ol.media-grid { +.resource-list { margin: 0; list-style: none; - *zoom: 1; - margin-left: -20px; + margin: -10px -10px 10px -10px; } -.media-grid:before, -ul.media-grid:before, -ol.media-grid:before, -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - display: table; - content: ""; +.resource-item { + position: relative; + padding: 10px 10px 10px 60px; + margin-bottom: 0px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - clear: both; +.resource-item:hover { + background-color: #eeeeee; } -.media-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; +.resource-item .heading { + color: #000000; + font-size: 14px; + font-weight: bold; } -.media-item.first { - clear: left; +.resource-item .format-label { + position: absolute; + top: 10px; + left: 10px; } -.media-item .media-content { - min-height: 63px; +.resource-item .description { + font-size: 12px; + margin-bottom: 0; } -.related-item.expanded { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #ffffff; - background-color: rgba(255, 255, 255, 0.9); - z-index: 2; +.resource-item .btn-group { + position: absolute; + top: 14px; + right: 10px; } -.media-wide { - padding: 0; +.dataset-resource-form .dataset-form-resource-types { + margin-bottom: 5px; } -.media-wide .media { - float: left; - margin-left: 20px; - width: 460px; +.dataset-form-resource-types .ckan-icon { + position: relative; + top: 3px; } -.media-overlay { +.dataset-form-resource-types .radio { + font-weight: normal; + padding-left: 0; + padding-right: 18px; +} +.dataset-form-resource-types label { position: relative; - min-height: 35px; } -.media-overlay .media-heading { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 12px 10px; - margin: 0; - background-color: #000; - background-color: rgba(0, 0, 0, 0.8); - font-size: 13px; - color: #fff; - z-index: 1; +.dataset-form-resource-types input[type=radio]:checked + label { + font-weight: bold; } -.media-overlay .media-image { - float: none; +.dataset-form-resource-types input[type=radio]:checked + label:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 16px; + height: 16px; + background-position: -192px 0; display: block; - margin-right: 0; -} -.banner { - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-transform-origin: center center; - -moz-transform-origin: center center; - -ms-transform-origin: center center; - -o-transform-origin: center center; - transform-origin: center center; + content: ""; position: absolute; - top: 15px; - right: -35px; - width: 80px; - color: #ffffff; - background: #707070; - padding: 1px 20px; - font-size: 11px; - text-align: center; - text-transform: uppercase; + top: auto; + left: 0; + bottom: -12px; } -.nav-simple { - *zoom: 1; +.dataset-form-resource-types input[type=radio] { + display: none; +} +.tag-list { margin: 0; list-style: none; - padding-bottom: 0; + padding: 10px 10px 5px 10px; } -.nav-simple:before, -.nav-simple:after { - display: table; - content: ""; +.tag-list li { + display: inline-block; + margin-right: 5px; } -.nav-simple:after { - clear: both; +.tag-list li:last-child { + margin-right: 0; } -.nav-simple > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.additional-info td, +.additional-info th { + width: 50%; } -.nav-simple > li:last-of-type { - border-bottom: 0; +.label[data-format=html], +.label[data-format*=html] { + background-color: #55a1ce; } -.nav-simple .ckan-icon { - position: relative; - top: 0px; +.label[data-format=json], +.label[data-format*=json] { + background-color: #ef7100; } -.nav-item > a { - color: #333333; - margin: -7px -25px; - padding: 7px 25px; +.label[data-format=xml], +.label[data-format*=xml] { + background-color: #ef7100; } -.nav-item.active { - background-color: #f2f2f2; +.label[data-format=text], +.label[data-format*=text] { + background-color: #74cbec; } -.nav-item.active > a span { - white-space: nowrap; - overflow: hidden; - display: block; +.label[data-format=csv], +.label[data-format*=csv] { + background-color: #dfb100; +} +.label[data-format=xls], +.label[data-format*=xls] { + background-color: #2db55d; +} +.label[data-format=zip], +.label[data-format*=zip] { + background-color: #686868; +} +.label[data-format=api], +.label[data-format*=api] { + background-color: #ec96be; +} +.label[data-format=pdf], +.label[data-format*=pdf] { + background-color: #e0051e; +} +.label[data-format=rdf], +.label[data-format*=rdf], +.label[data-format*=nquad], +.label[data-format*=ntriples], +.label[data-format*=turtle] { + background-color: #0b4498; } -.nav-item.active > a { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #5b0404; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; + margin-bottom: 20px; +} +.search-form .search-input input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; - font-size: 12px; - font-weight: bold; - position: relative; - left: 4px; - margin-left: -25px; - margin-right: -20px; - padding-left: 10px; - padding-right: 0px; - padding: 1px 22px; + margin: 0; + width: 100%; + height: auto; } -.nav-item.active > a:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; +.search-form .search-input button { + cursor: pointer; + display: block; position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; +} +.search-form .search-input button span { + display: none; +} +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; +} +.search-form .search-input button:hover i { + color: #000000; +} +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; +} +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; +} +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; +} +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; +} +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; +} +.search-form .control-order-by select { + width: 160px; + margin: 0; +} +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; +} +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; +} +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; } -.nav-item [class^=icon] { - font-size: 1.2em; - margin: -1px 0 -1px -1px; +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; } -.module-narrow .nav-item > a { - padding-left: 15px; - padding-right: 15px; +.tertiary .search-input { + margin-bottom: 10px; +} +.group .media-vertical .image { + margin: 0 -5px 5px; +} +.group-list:nth-child(odd) { + clear: left; +} +.group-list .module-heading { + padding-top: 15px; + padding-bottom: 15px; +} +.group-list .dataset-content { + min-height: 54px; +} +.group-list .module-heading h3 { + margin-bottom: 2px; +} +.group-list .module-heading h3 a { + color: #333333; +} +.group-list .module-heading .media-image { + overflow: hidden; + max-height: 60px; +} +.group-list .module-heading .media-image img { + max-width: 85px; +} +.toolbar { + *zoom: 1; position: relative; + margin-bottom: 10px; + padding: 5px 0; } -.module-narrow .nav-item.active > a { - padding-left: 12px; - padding-right: 12px; +.toolbar:before, +.toolbar:after { + display: table; + content: ""; + line-height: 0; } -.module-narrow .nav-item.image { +.toolbar:after { + clear: both; +} +.page_primary_action { + margin-bottom: 20px; +} +.toolbar .breadcrumb { + *zoom: 1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; position: relative; + float: left; + margin: 0; + padding: 0; + border: none; + background: none; + font-size: 20px; + line-height: 1.3; } -.module-narrow .nav-item.image > a { - padding-left: 42px; - padding-right: 42px; +.toolbar .breadcrumb:before, +.toolbar .breadcrumb:after { + display: table; + content: ""; + line-height: 0; +} +.toolbar .breadcrumb:after { + clear: both; +} +.toolbar .breadcrumb li:after { + content: " / "; +} +.toolbar .breadcrumb li.active:after { + content: ""; +} +.toolbar .breadcrumb li:last-of-type:after { + content: ""; +} +.toolbar .home a { + text-decoration: none; +} +.toolbar .home span { + display: none; +} +.toolbar .breadcrumb a { + color: #505050; +} +.toolbar .breadcrumb .active a, +.toolbar .breadcrumb a.active { + font-weight: bold; } -.module-narrow .nav-item.image > img { +.actions { + margin: 0; + list-style: none; position: absolute; - top: 50%; - left: 15px; - width: 20px; - height: 20px; - margin-top: -10px; - z-index: 2; + top: 10px; + right: 10px; + z-index: 1; +} +.actions li { + display: inline-block; + margin-right: 5px; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.actions li:last-of-type { + margin-right: 0; +} +.hide-heading { + display: none; +} +.page-header { + *zoom: 1; + border-bottom: 1px solid #dddddd; + background-color: #f6f6f6; + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; +} +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} +.page-header .nav-tabs { + float: left; + margin-bottom: -1px; +} +.page-header .nav-tabs li.active a, +.page-header .nav-tabs a:hover { + background-color: #ffffff; +} +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; +} +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; +} +h1 { + font-size: 28px; +} +h2 { + font-size: 21px; +} +h3 { + font-size: 18px; +} +h4 { + font-size: 14px; +} +h1, +h2, +h3, +h4 { + line-height: 1.5; +} +h1 small, +h2 small, +h3 small, +h4 small { + font-size: 14px; +} +.prose h1, +.prose heading-1 h2, +.prose heading-2 { + margin-bottom: 15px; +} +.prose h3, +.prose heading-3 { + margin-bottom: 10px; +} +.table-chunky td, +.table-chunky th { + padding: 12px 15px; + font-size: 12px; +} +.table-chunky thead th, +.table-chunky thead td { + color: #ffffff; + background-color: #aaaaaa; + padding-top: 10px; + padding-bottom: 10px; +} +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { + background-color: transparent; +} +.table-striped tbody tr:nth-child(even) td, +.table-striped tbody tr:nth-child(even) th { + background-color: #f2f2f2; +} +.table-chunky.table-bordered { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topleft: 2px; + border-top-left-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topright: 2px; + border-top-right-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 2px; + -moz-border-radius: 0 0 0 2px; + border-radius: 0 0 0 2px; + -webkit-border-bottom-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + border-bottom-left-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + border-bottom-right-radius: 2px; +} +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.ckan-icon { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; +} +.ckan-icon-fb { + width: 16px; + height: 16px; + background-position: 0px 0; +} +.ckan-icon-gplus { + width: 16px; + height: 16px; + background-position: -16px 0; +} +.ckan-icon-twitter { + width: 16px; + height: 16px; + background-position: -32px 0; +} +.ckan-icon-email { + width: 16px; + height: 16px; + background-position: -48px 0; +} +.ckan-icon-share { + width: 16px; + height: 16px; + background-position: -64px 0; +} +.ckan-icon-feed { + width: 16px; + height: 16px; + background-position: -80px 0; +} +.ckan-icon-calendar { + width: 16px; + height: 16px; + background-position: -96px 0; +} +.ckan-icon-file { + width: 16px; + height: 16px; + background-position: -112px 0; +} +.ckan-icon-lock { + width: 16px; + height: 16px; + background-position: -128px 0; +} +.ckan-icon-link-file { + width: 16px; + height: 16px; + background-position: -144px 0; +} +.ckan-icon-link-plugin { + width: 16px; + height: 16px; + background-position: -160px 0; +} +.ckan-icon-upload-file { + width: 16px; + height: 16px; + background-position: -176px 0; +} +.ckan-icon-callout { + width: 16px; + height: 16px; + background-position: -192px 0; +} +.ckan-icon-circle-cross { + width: 17px; + height: 17px; + background-position: 0px -16px; +} +.ckan-icon-circle-add { + width: 17px; + height: 17px; + background-position: -17px -16px; +} +.ckan-icon-flame { + width: 17px; + height: 17px; + background-position: -34px -16px; +} +.ckan-icon-search { + width: 17px; + height: 17px; + background-position: -51px -16px; +} +.ckan-icon-large-lock { + width: 20px; + height: 20px; + background-position: 0px -33px; +} +.ckan-icon-photo { + width: 20px; + height: 20px; + background-position: -20px -33px; +} +.ckan-icon-add { + width: 20px; + height: 20px; + background-position: -40px -33px; +} +.ckan-icon-home { + width: 20px; + height: 20px; + background-position: -60px -33px; +} +.ckan-icon-rewind { + width: 20px; + height: 20px; + background-position: -80px -33px; +} +.ckan-icon-tools { + width: 20px; + height: 20px; + background-position: -100px -33px; +} +.ckan-icon-flag { + width: 20px; + height: 20px; + background-position: -120px -33px; +} +.ckan-icon-clipboard { + width: 20px; + height: 20px; + background-position: -140px -33px; +} +.ckan-icon-share { + width: 20px; + height: 20px; + background-position: -160px -33px; +} +.ckan-icon-info { + width: 20px; + height: 20px; + background-position: -180px -33px; +} +.ckan-icon-download { + width: 20px; + height: 20px; + background-position: -200px -33px; +} +.ckan-icon-star { + width: 20px; + height: 20px; + background-position: -220px -33px; +} +.ckan-icon-info-flat { + width: 20px; + height: 20px; + background-position: -240px -33px; +} +.ckan-icon-tag { + width: 20px; + height: 20px; + background-position: -260px -33px; +} +.ckan-icon-plus { + width: 20px; + height: 20px; + background-position: -280px -33px; + width: 16px; +} +.ckan-icon-head { + width: 20px; + height: 20px; + background-position: -300px -33px; +} +.ckan-icon-arrow-e { + width: 20px; + height: 20px; + background-position: -320px -33px; + width: 16px; +} +.ckan-icon-bookmark { + width: 25px; + height: 25px; + background-position: 0px -53px; } -.nav-facet .nav-item > a:hover:after, -.nav-facet .nav-item.active > a:after { +.format-label { *margin-right: .3em; display: inline-block; vertical-align: text-bottom; @@ -4988,1745 +6836,1147 @@ ol.media-grid:after { background-image: url("../../../base/images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; - content: ""; - position: absolute; - top: 50%; - right: 5px; - margin-top: -8px; -} -.nav-facet .nav-item > a:hover:after:last-child, -.nav-facet .nav-item.active > a:after:last-child { - *margin-left: 0; -} -.nav-facet .nav-item > a:hover:after { - width: 17px; - height: 17px; - background-position: -17px -16px; -} -.nav-facet .nav-item.active > a:after { - width: 17px; - height: 17px; - background-position: 0px -16px; - right: 3px; -} -.js .js-hide { - display: none; + text-indent: -900em; + background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; } -.js .js-hide.active { - display: block; +.format-label { + width: 32px; + height: 35px; + background-position: 0px -62px; } -.btn, -label { - font-weight: bold; +.format-label[data-format=rdf], +.format-label[data-format*=rdf] { + width: 32px; + height: 35px; + background-position: -32px -62px; } -label { - cursor: pointer; - font-size: 14px; - line-height: 2; +.format-label[data-format=pdf], +.format-label[data-format*=pdf] { + width: 32px; + height: 35px; + background-position: -64px -62px; } -label:after { - content: ":"; +.format-label[data-format=api], +.format-label[data-format*=api] { + width: 32px; + height: 35px; + background-position: -96px -62px; } -label.radio:after, -label.checkbox:after { - content: ""; +.format-label[data-format=zip], +.format-label[data-format*=zip] { + width: 32px; + height: 35px; + background-position: -128px -62px; } -input, -textarea, -select, -.uneditable-input { - font-size: 14px; - padding: 8px 10px; +.format-label[data-format=xls], +.format-label[data-format*=xls] { + width: 32px; + height: 35px; + background-position: -160px -62px; } -input[type=radio], -input[type=checkbox] { - position: relative; - top: 7px; - padding: 0; - margin: 0; +.format-label[data-format=csv], +.format-label[data-format*=csv] { + width: 32px; + height: 35px; + background-position: -192px -62px; } -input[type=radio].checkbox-onown, -input[type=checkbox].checkbox-onown { - top: 0; +.format-label[data-format=txt], +.format-label[data-format*=txt] { + width: 32px; + height: 35px; + background-position: -224px -62px; } -select { - margin-top: 6px; - padding: 4px; +.format-label[data-format=xml], +.format-label[data-format*=xml] { + width: 32px; + height: 35px; + background-position: -256px -62px; } -textarea { - max-width: 100%; +.format-label[data-format=json], +.format-label[data-format*=json] { + width: 32px; + height: 35px; + background-position: -288px -62px; } -.input-prepend .add-on { - padding: 8px 8px; - font-size: 14px; +.format-label[data-format=html], +.format-label[data-format*=html] { + width: 32px; + height: 35px; + background-position: -320px -62px; } -.control-group .btn { - position: relative; - top: -2px; +/* This is a modified version of the font-awesome core less document. */ +@font-face { + font-family: 'FontAwesome'; + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + font-weight: normal; + font-style: normal; } -.control-full input, -.control-full select, -.control-full textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + display: inline; + width: auto; height: auto; - width: 100%; -} -.control-medium input, -.control-medium select, -.control-medium textarea { - width: 320px; -} -.control-large input, -.control-large .control-label { - font-size: 18px; -} -.form-actions { - background: none; - margin-left: -25px; - margin-right: -25px; - margin-bottom: 0; - padding-bottom: 0; - text-align: right; -} -.form-actions .action-info { - float: left; - width: 50%; - line-height: 2; - text-align: left; - color: #707070; - margin: 0; -} -.form-actions .action-info.small { - font-size: 11px; - line-height: 1.2; -} -.form-horizontal .control-label { - width: 120px; - line-height: 1.3; - padding-top: 9px; -} -.form-horizontal .control-large input, -.form-horizontal .control-large .control-label { - font-size: 18px; - line-height: 2; -} -.form-horizontal .control-large .control-label { - padding-top: 10px; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; } -.form-horizontal .controls { - margin-left: 130px; +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } -.form-horizontal .info-block { - position: relative; - display: block; - font-size: 11px; - color: #aeaeae; - line-height: 1.3; - padding: 6px 0 6px 25px; - margin-top: 6px; +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } -.form-horizontal .info-inline { - float: right; - width: 265px; - margin-top: 0; +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } -.form-horizontal .control-medium .info-block.info-inline { - width: 165px; +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } } -.form-horizontal .info-block:before { - font-size: 2.2em; - position: absolute; - left: 0; - top: 2px; +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } } -.form-horizontal .info-inline:before { - top: 8px; +@-moz-document url-prefix() { + .icon-spin { + height: .9em; + } + .btn .icon-spin { + height: auto; + } + .icon-spin.icon-large { + height: 1.25em; + } + .btn .icon-spin.icon-large { + height: .75em; + } } -.info-block .icon-large, -.info-inline .icon-large { - float: left; - font-size: 22px; - margin-right: 15px; +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; } -.form-horizontal .info-block a { - color: #aeaeae; - text-decoration: underline; +.icon-music:before { + content: "\f001"; } -.form-horizontal .form-actions { - padding-left: 25px; - padding-right: 25px; +.icon-search:before { + content: "\f002"; } -.form-inline input { - padding-bottom: 9px; +.icon-envelope:before { + content: "\f003"; } -.form-inline select { - margin-top: 0; +.icon-heart:before { + content: "\f004"; } -.form-inline .btn { - margin-left: 5px; +.icon-star:before { + content: "\f005"; } -.form-narrow label { - margin-bottom: 0; +.icon-star-empty:before { + content: "\f006"; } -.form-narrow select { - width: 100%; +.icon-user:before { + content: "\f007"; } -.form-narrow .form-actions { - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px 0; +.icon-film:before { + content: "\f008"; } -.form-select label { - margin-right: 5px; +.icon-th-large:before { + content: "\f009"; } -.simple-input label, -.simple-input button { - display: none; +.icon-th:before { + content: "\f00a"; } -.simple-input .field { - position: relative; +.icon-th-list:before { + content: "\f00b"; } -.simple-input .field-bordered { - border-bottom: 1px dotted #cccccc; +.icon-ok:before { + content: "\f00c"; } -.simple-input .field input { - width: 100%; - height: auto; - margin: 0 -7px; - padding: 7px 5px; +.icon-remove:before { + content: "\f00d"; } -.simple-input .field .btn-search { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 17px; - height: 17px; - background-position: -51px -16px; - position: absolute; - display: block; - height: 17px; - width: 17px; - top: 50%; - right: 0; - margin-top: -8px; - background-color: transparent; - border: none; - text-indent: -999em; +.icon-zoom-in:before { + content: "\f00e"; } -.simple-input .field .btn-search:last-child { - *margin-left: 0; +.icon-zoom-out:before { + content: "\f010"; } -.editor textarea { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: none; +.icon-off:before { + content: "\f011"; } -.editor .editor-info-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - float: none; - padding: 4px 10px; - background: #ebebeb; - width: auto; - border: 1px solid #cccccc; - border-top: none; - font-size: 11px; - color: #282828; +.icon-signal:before { + content: "\f012"; } -.editor .editor-info-block a { - color: #5b0404; - text-decoration: none; +.icon-cog:before { + content: "\f013"; } -.control-custom { - font-size: 0; +.icon-trash:before { + content: "\f014"; } -.control-custom label { - margin-bottom: 0; +.icon-home:before { + content: "\f015"; } -.control-custom input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - width: 140px; +.icon-file:before { + content: "\f016"; } -.control-custom input:last-of-type { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.icon-time:before { + content: "\f017"; } -.control-custom .checkbox { - display: inline-block; - margin-left: 5px; +.icon-road:before { + content: "\f018"; } -.control-custom .checkbox input { - width: auto; +.icon-download-alt:before { + content: "\f019"; } -.control-custom.disabled label, -.control-custom.disabled input { - color: #aaaaaa; - text-decoration: line-through; - text-shadow: none; +.icon-download:before { + content: "\f01a"; } -.control-custom.disabled input { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #f3f3f3; +.icon-upload:before { + content: "\f01b"; } -.control-custom.disabled .checkbox { - color: #4d4d4d; - text-decoration: none; +.icon-inbox:before { + content: "\f01c"; } -.control-custom .checkbox.btn { - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - position: relative; - top: 0; - left: 5px; - height: 3px; - width: 8px; - padding: 3px 8px; +.icon-play-circle:before { + content: "\f01d"; } -.control-custom .checkbox.btn span { - display: none; - width: 30px; +.icon-repeat:before { + content: "\f01e"; } -.control-custom .checkbox.btn:before { - position: relative; - top: 1px; - left: -1px; - color: #fff; +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; } -.control-custom .checkbox.btn input { - display: none; +.icon-list-alt:before { + content: "\f022"; } -.control-custom.disabled .checkbox.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #dd0c0c; - background-image: -moz-linear-gradient(top, #cf0a0a, #f21010); - background-image: -ms-linear-gradient(top, #cf0a0a, #f21010); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cf0a0a), to(#f21010)); - background-image: -webkit-linear-gradient(top, #cf0a0a, #f21010); - background-image: -o-linear-gradient(top, #cf0a0a, #f21010); - background-image: linear-gradient(top, #cf0a0a, #f21010); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf0a0a', endColorstr='#f21010', GradientType=0); - border-color: #f21010 #f21010 #ac0909; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f21010; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-lock:before { + content: "\f023"; } -.control-custom.disabled .checkbox.btn:hover, -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active, -.control-custom.disabled .checkbox.btn.disabled, -.control-custom.disabled .checkbox.btn[disabled] { - background-color: #f21010; - *background-color: #dd0c0c; +.icon-flag:before { + content: "\f024"; } -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active { - background-color: #c40b0b \9; +.icon-headphones:before { + content: "\f025"; } -.control-custom.disabled .checkbox.btn .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-volume-off:before { + content: "\f026"; } -.alert-danger a, -.alert-error a { - color: #b55457; +.icon-volume-down:before { + content: "\f027"; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea, -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - border-color: #c6898b; +.icon-volume-up:before { + content: "\f028"; } -.error-inline { - color: #b55457; +.icon-qrcode:before { + content: "\f029"; } -.error-block, -.error-inline { - font-size: 12px; +.icon-barcode:before { + content: "\f02a"; } -.error-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - padding: 6px 8px 3px; - background: #c6898b; - margin: -3px 0 0; - color: #ffffff; - width: 216px; +.icon-tag:before { + content: "\f02b"; } -.control-medium .error-block { - width: 326px; +.icon-tags:before { + content: "\f02c"; } -.control-full .error-block { - width: auto; +.icon-book:before { + content: "\f02d"; } -.control-group.error .input-prepend .error-block, -.control-custom.error .error-block { - margin-left: -1px; - width: auto; +.icon-bookmark:before { + content: "\f02e"; } -.control-custom.error .error-block { - width: 409px; +.icon-print:before { + content: "\f02f"; } -.control-select.error .error-block { - width: 204px; +.icon-camera:before { + content: "\f030"; } -.stages { - margin: 0; - list-style: none; - *zoom: 1; - color: #aeaeae; - counter-reset: stage; - margin: -20px -25px 20px; - overflow: hidden; +.icon-font:before { + content: "\f031"; } -.stages:before, -.stages:after { - display: table; - content: ""; +.icon-bold:before { + content: "\f032"; } -.stages:after { - clear: both; +.icon-italic:before { + content: "\f033"; } -.stages li { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - line-height: 27px; - counter-increment: stage; - width: 33.33%; - background-color: #ededed; - float: left; - padding: 10px 20px; - position: relative; - z-index: 0; +.icon-text-height:before { + content: "\f034"; } -.stages li:before { - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; - content: counter(stage); - display: inline-block; - width: 27px; - height: 27px; - margin-right: 5px; - font-weight: bold; - text-align: center; - color: #ffffff; - background-color: #aeaeae; - z-index: 1; +.icon-text-width:before { + content: "\f035"; } -.stages li:after { - left: 0; - border: solid rgba(237, 237, 237, 0); - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #ededed; - border-bottom-color: #ededed; - border-width: 29px; - top: 50%; - margin-top: -29px; - margin-left: -30px; +.icon-align-left:before { + content: "\f036"; } -.stages li.first, -.stages li.first .highlight { - -webkit-border-radius: 3px 0 0 0; - -moz-border-radius: 3px 0 0 0; - border-radius: 3px 0 0 0; +.icon-align-center:before { + content: "\f037"; } -.stages li.last { - position: relative; - right: -1px; +.icon-align-right:before { + content: "\f038"; } -.stages li.last, -.stages li.last .highlight { - -webkit-border-radius: 0 3px 0 0; - -moz-border-radius: 0 3px 0 0; - border-radius: 0 3px 0 0; +.icon-align-justify:before { + content: "\f039"; } -.stages li.first:after { - content: none; - border: none; +.icon-list:before { + content: "\f03a"; } -.stages li.active:after { - border-color: rgba(140, 198, 138, 0); - border-top-color: #8cc68a; - border-bottom-color: #8cc68a; +.icon-indent-left:before { + content: "\f03b"; } -.stages li.complete:after { - border-color: rgba(197, 226, 196, 0); - border-top-color: #c5e2c4; - border-bottom-color: #c5e2c4; +.icon-indent-right:before { + content: "\f03c"; } -.stages.stage-3 li.complete:first-child:after { - content: none; +.icon-facetime-video:before { + content: "\f03d"; } -.stages li.active, -.stages li.complete { - background: none; +.icon-picture:before { + content: "\f03e"; } -.stages li.active:before { - color: #8cc68a; - background: #ffffff; +.icon-pencil:before { + content: "\f040"; } -.stages li.complete:before { - color: #c5e2c4; - background: #eef6ed; +.icon-map-marker:before { + content: "\f041"; } -.stages li .highlight { - display: block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - padding: 10px 52px; - border: none; - text-align: left; - text-decoration: none; - line-height: 27px; - z-index: -1; +.icon-adjust:before { + content: "\f042"; } -.stages li.active .highlight { - color: #ffffff; - background: #8cc68a; +.icon-tint:before { + content: "\f043"; } -.stages li.complete .highlight { - color: #eef6ed; - background: #c5e2c4; +.icon-edit:before { + content: "\f044"; } -.alert > :last-child { - margin-bottom: 0; +.icon-share:before { + content: "\f045"; } -.slug-preview { - font-size: 14px; - line-height: 1.5; - margin-top: 5px; - margin-left: 10px; +.icon-check:before { + content: "\f046"; } -.slug-preview-value { - background-color: #faedcf; - margin-right: 3px; +.icon-move:before { + content: "\f047"; } -.slug-preview .btn { - padding-top: 3px; - padding-bottom: 3px; +.icon-step-backward:before { + content: "\f048"; } -.resource-upload-field { - position: relative; - overflow: hidden; - display: inline-block; - vertical-align: bottom; +.icon-fast-backward:before { + content: "\f049"; } -.resource-upload-field label { - z-index: 0; +.icon-backward:before { + content: "\f04a"; } -.resource-upload-field input { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - right: 0; - z-index: 1; - margin: 0; - border: solid transparent; - border-width: 100px 0 0 200px; - cursor: pointer; - direction: ltr; - -moz-transform: translate(-300px, 0) scale(4); +.icon-play:before { + content: "\f04b"; } -.resource-upload-field.loading { - display: inline-block; - background: url("../../../base/images/loading-spinner.gif") no-repeat center right; - padding-right: 5px; +.icon-pause:before { + content: "\f04c"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - font-size: 14px; +.icon-stop:before { + content: "\f04d"; } -.select2-container-multi .select2-choices .select2-search-field input { - height: 29px; +.icon-forward:before { + content: "\f04e"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - padding-left: 10px; +.icon-fast-forward:before { + content: "\f050"; } -.select2-container { - margin-top: 5px; +.icon-step-forward:before { + content: "\f051"; } -.select2-container-multi { - margin-top: 0; +.icon-eject:before { + content: "\f052"; } -.select2-container-multi .select2-choices .select2-search-choice { - padding: 5px 8px 5px 22px; +.icon-chevron-left:before { + content: "\f053"; } -.select2-container-multi.select2-container .select2-choices { - padding-top: 3px; - padding-bottom: 3px; +.icon-chevron-right:before { + content: "\f054"; } -.select2-search-choice-close, -.select2-container-multi .select2-search-choice-close { - top: 6px; - left: 5px; +.icon-plus-sign:before { + content: "\f055"; } -.select2-container-multi .select2-choices { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - background-color: #ffffff; - border: 1px solid #cccccc; +.icon-minus-sign:before { + content: "\f056"; } -.select2-container-active .select2-choices, -.select2-container-multi.select2-container-active .select2-choices { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +.icon-remove-sign:before { + content: "\f057"; } -.select2-container-multi .select2-drop { - margin-top: -2px; +.icon-ok-sign:before { + content: "\f058"; } -.select2-container .select2-results li { - line-height: 18px; - padding-top: 4px; - padding-bottom: 4px; +.icon-question-sign:before { + content: "\f059"; } -.control-full .select2-container { - width: 520px !important; +.icon-info-sign:before { + content: "\f05a"; } -.dataset-item { - border-bottom: 1px dotted #cccccc; - padding-bottom: 20px; - margin-bottom: 20px; +.icon-screenshot:before { + content: "\f05b"; } -.dataset-item:last-of-type { - border-bottom: none; - margin-bottom: 0; - padding-bottom: 0; +.icon-remove-circle:before { + content: "\f05c"; } -.dataset-heading { - font-size: 14px; - line-height: 1.3; +.icon-ok-circle:before { + content: "\f05d"; } -.dataset-heading a { - color: #333333; +.icon-ban-circle:before { + content: "\f05e"; } -.dataset-heading .label { - position: relative; - top: -1px; +.icon-arrow-left:before { + content: "\f060"; } -.dataset-content { - font-size: 12px; +.icon-arrow-right:before { + content: "\f061"; } -.dataset-resources { - font-size: 10px; - line-height: 14px; - margin-top: 5px; +.icon-arrow-up:before { + content: "\f062"; } -.dataset-resources li { - display: inline; +.icon-arrow-down:before { + content: "\f063"; } -.dataset-resources li a { - background-color: #aaaaaa; +.icon-share-alt:before { + content: "\f064"; } -.dataset-heading .popular { - top: 0; +.icon-resize-full:before { + content: "\f065"; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #cccccc; +.icon-resize-small:before { + content: "\f066"; } -.results strong { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; +.icon-plus:before { + content: "\f067"; } -.results strong:before { - float: right; - content: " "; - width: 280px; - white-space: pre; +.icon-minus:before { + content: "\f068"; } -.filter-list { - color: #4d4d4d; - font-weight: bold; +.icon-asterisk:before { + content: "\f069"; } -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; +.icon-exclamation-sign:before { + content: "\f06a"; } -.dataset-search { - position: relative; +.icon-gift:before { + content: "\f06b"; } -.search-giant { - position: relative; +.icon-leaf:before { + content: "\f06c"; } -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; +.icon-fire:before { + content: "\f06d"; } -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; +.icon-eye-open:before { + content: "\f06e"; } -.control-order-by { - position: absolute; - bottom: -65px; - right: 0; +.icon-eye-close:before { + content: "\f070"; } -.control-order-by label, -.control-order-by select { - display: inline; +.icon-warning-sign:before { + content: "\f071"; } -.control-order-by select { - width: 160px; +.icon-plane:before { + content: "\f072"; } -.resource-list { - margin: 0; - list-style: none; - margin: -10px -10px 10px -10px; +.icon-calendar:before { + content: "\f073"; } -.resource-item { - position: relative; - padding: 10px 110px 10px 60px; - margin-bottom: 0px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-random:before { + content: "\f074"; } -.resource-item:hover { - background-color: #efefef; +.icon-comment:before { + content: "\f075"; } -.resource-item .heading { - color: #000000; - font-size: 14px; - font-weight: bold; +.icon-magnet:before { + content: "\f076"; } -.resource-item .format-label { - position: absolute; - top: 10px; - left: 10px; +.icon-chevron-up:before { + content: "\f077"; } -.resource-item .description { - font-size: 12px; - margin-bottom: 0; +.icon-chevron-down:before { + content: "\f078"; } -.resource-item .btn-group { - position: absolute; - top: 13px; - right: 10px; +.icon-retweet:before { + content: "\f079"; } -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; +.icon-shopping-cart:before { + content: "\f07a"; } -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; +.icon-folder-close:before { + content: "\f07b"; } -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; +.icon-folder-open:before { + content: "\f07c"; } -.dataset-form-resource-types label { - position: relative; +.icon-resize-vertical:before { + content: "\f07d"; } -.dataset-form-resource-types input[type=radio]:checked + label { - font-weight: bold; +.icon-resize-horizontal:before { + content: "\f07e"; } -.dataset-form-resource-types input[type=radio]:checked + label:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 16px; - height: 16px; - background-position: -192px 0; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; +.icon-bar-chart:before { + content: "\f080"; } -.dataset-form-resource-types input[type=radio]:checked + label:after:last-child { - *margin-left: 0; +.icon-twitter-sign:before { + content: "\f081"; } -.dataset-form-resource-types input[type=radio] { - display: none; +.icon-facebook-sign:before { + content: "\f082"; } -.tag-list { - margin: 0; - list-style: none; - padding: 10px; +.icon-camera-retro:before { + content: "\f083"; } -.tag-list li { - display: inline-block; - margin-right: 5px; +.icon-key:before { + content: "\f084"; } -.tag-list li:last-child { - margin-right: 0; +.icon-cogs:before { + content: "\f085"; } -.additional-info td, -.additional-info th { - width: 50%; +.icon-comments:before { + content: "\f086"; } -.label[data-format=html], -.label[data-format*=html] { - background-color: #55a1ce; +.icon-thumbs-up:before { + content: "\f087"; } -.label[data-format=json], -.label[data-format*=json] { - background-color: #ef7100; +.icon-thumbs-down:before { + content: "\f088"; } -.label[data-format=xml], -.label[data-format*=xml] { - background-color: #ef7100; +.icon-star-half:before { + content: "\f089"; } -.label[data-format=text], -.label[data-format*=text] { - background-color: #74cbec; +.icon-heart-empty:before { + content: "\f08a"; } -.label[data-format=csv], -.label[data-format*=csv] { - background-color: #dfb100; +.icon-signout:before { + content: "\f08b"; } -.label[data-format=xls], -.label[data-format*=xls] { - background-color: #2db55d; +.icon-linkedin-sign:before { + content: "\f08c"; } -.label[data-format=zip], -.label[data-format*=zip] { - background-color: #686868; +.icon-pushpin:before { + content: "\f08d"; } -.label[data-format=api], -.label[data-format*=api] { - background-color: #ec96be; +.icon-external-link:before { + content: "\f08e"; } -.label[data-format=pdf], -.label[data-format*=pdf] { - background-color: #e0051e; +.icon-signin:before { + content: "\f090"; } -.label[data-format=rdf], -.label[data-format*=rdf], -.label[data-format*=nquad], -.label[data-format*=ntriples], -.label[data-format*=turtle] { - background-color: #0b4498; +.icon-trophy:before { + content: "\f091"; } -.group .media-vertical .image { - margin: 0 -5px 5px; +.icon-github-sign:before { + content: "\f092"; } -.group-list:nth-child(odd) { - clear: left; +.icon-upload-alt:before { + content: "\f093"; } -.group-list .module-heading { - padding-top: 15px; - padding-bottom: 15px; +.icon-lemon:before { + content: "\f094"; } -.group-list .dataset-content { - min-height: 54px; +.icon-phone:before { + content: "\f095"; } -.group-list .module-heading h3 { - margin-bottom: 2px; +.icon-check-empty:before { + content: "\f096"; } -.group-list .module-heading h3 a { - color: #333333; +.icon-bookmark-empty:before { + content: "\f097"; } -.toolbar { - *zoom: 1; - margin-top: -10px; - margin-bottom: 10px; - padding: 5px 0; +.icon-phone-sign:before { + content: "\f098"; } -.toolbar:before, -.toolbar:after { - display: table; - content: ""; +.icon-twitter:before { + content: "\f099"; } -.toolbar:after { - clear: both; +.icon-facebook:before { + content: "\f09a"; } -.toolbar .breadcrumb { - *zoom: 1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - position: relative; - float: left; - margin: 0; - padding: 0; - border: none; - background: none; - font-size: 20px; +.icon-github:before { + content: "\f09b"; } -.toolbar .breadcrumb:before, -.toolbar .breadcrumb:after { - display: table; - content: ""; +.icon-unlock:before { + content: "\f09c"; } -.toolbar .breadcrumb:after { - clear: both; +.icon-credit-card:before { + content: "\f09d"; } -.toolbar li [class^=icon]:before { - width: auto; +.icon-rss:before { + content: "\f09e"; } -.toolbar .breadcrumb li:after { - content: " / "; +.icon-hdd:before { + content: "\f0a0"; } -.toolbar .breadcrumb li.active:after { - content: ""; +.icon-bullhorn:before { + content: "\f0a1"; } -.toolbar .breadcrumb li:last-of-type:after { - content: ""; +.icon-bell:before { + content: "\f0a2"; } -.toolbar .home a { - text-decoration: none; +.icon-certificate:before { + content: "\f0a3"; } -.toolbar .home span { - display: none; +.icon-hand-right:before { + content: "\f0a4"; } -.toolbar .breadcrumb a { - color: #505050; - line-height: 28px; +.icon-hand-left:before { + content: "\f0a5"; } -.toolbar .breadcrumb .active a { - font-weight: bold; +.icon-hand-up:before { + content: "\f0a6"; } -.toolbar .actions { - margin: 0; - list-style: none; +.icon-hand-down:before { + content: "\f0a7"; } -.toolbar .actions li { - display: inline-block; - margin-right: 5px; +.icon-circle-arrow-left:before { + content: "\f0a8"; } -.toolbar .actions li { - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.icon-circle-arrow-right:before { + content: "\f0a9"; } -.toolbar .actions li:last-of-type { - margin-right: 0; +.icon-circle-arrow-up:before { + content: "\f0aa"; } -.toolbar .btn { - padding: 0 10px 0 8px; - border-color: #b7b7b7; - line-height: 27px; +.icon-circle-arrow-down:before { + content: "\f0ab"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - 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); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-globe:before { + content: "\f0ac"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-wrench:before { + content: "\f0ad"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-tasks:before { + content: "\f0ae"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-filter:before { + content: "\f0b0"; } -.toolbar .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #dd0c0c; - background-image: -moz-linear-gradient(top, #cf0a0a, #f21010); - background-image: -ms-linear-gradient(top, #cf0a0a, #f21010); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cf0a0a), to(#f21010)); - background-image: -webkit-linear-gradient(top, #cf0a0a, #f21010); - background-image: -o-linear-gradient(top, #cf0a0a, #f21010); - background-image: linear-gradient(top, #cf0a0a, #f21010); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf0a0a', endColorstr='#f21010', GradientType=0); - border-color: #f21010 #f21010 #ac0909; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f21010; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-briefcase:before { + content: "\f0b1"; } -.toolbar .btn-primary:hover, -.toolbar .btn-primary:active, -.toolbar .btn-primary.active, -.toolbar .btn-primary.disabled, -.toolbar .btn-primary[disabled] { - background-color: #f21010; - *background-color: #dd0c0c; +.icon-fullscreen:before { + content: "\f0b2"; } -.toolbar .btn-primary:active, -.toolbar .btn-primary.active { - background-color: #c40b0b \9; +.icon-group:before { + content: "\f0c0"; } -.toolbar .btn-primary .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-link:before { + content: "\f0c1"; } -.toolbar .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - 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); - *background-color: #f89406; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-cloud:before { + content: "\f0c2"; } -.toolbar .btn-warning:hover, -.toolbar .btn-warning:active, -.toolbar .btn-warning.active, -.toolbar .btn-warning.disabled, -.toolbar .btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; +.icon-beaker:before { + content: "\f0c3"; } -.toolbar .btn-warning:active, -.toolbar .btn-warning.active { - background-color: #c67605 \9; +.icon-cut:before { + content: "\f0c4"; } -.toolbar .btn-warning .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-copy:before { + content: "\f0c5"; } -.toolbar .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - 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); - *background-color: #bd362f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-paper-clip:before { + content: "\f0c6"; } -.toolbar .btn-danger:hover, -.toolbar .btn-danger:active, -.toolbar .btn-danger.active, -.toolbar .btn-danger.disabled, -.toolbar .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; +.icon-save:before { + content: "\f0c7"; } -.toolbar .btn-danger:active, -.toolbar .btn-danger.active { - background-color: #942a25 \9; +.icon-sign-blank:before { + content: "\f0c8"; } -.toolbar .btn-danger .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-reorder:before { + content: "\f0c9"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - 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); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-list-ul:before { + content: "\f0ca"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-list-ol:before { + content: "\f0cb"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-strikethrough:before { + content: "\f0cc"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-underline:before { + content: "\f0cd"; } -.toolbar .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - 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); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-table:before { + content: "\f0ce"; } -.toolbar .btn-info:hover, -.toolbar .btn-info:active, -.toolbar .btn-info.active, -.toolbar .btn-info.disabled, -.toolbar .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; +.icon-magic:before { + content: "\f0d0"; } -.toolbar .btn-info:active, -.toolbar .btn-info.active { - background-color: #24748c \9; +.icon-truck:before { + content: "\f0d1"; } -.toolbar .btn-info .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-pinterest:before { + content: "\f0d2"; } -.toolbar .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - 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); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-pinterest-sign:before { + content: "\f0d3"; } -.toolbar .btn-inverse:hover, -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active, -.toolbar .btn-inverse.disabled, -.toolbar .btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; +.icon-google-plus-sign:before { + content: "\f0d4"; } -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active { - background-color: #080808 \9; +.icon-google-plus:before { + content: "\f0d5"; } -.toolbar .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-money:before { + content: "\f0d6"; } -.hide-heading { - display: none; +.icon-caret-down:before { + content: "\f0d7"; } -.page-header { - position: relative; - border-bottom: 1px solid #d0d0d0; - height: 30px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.icon-caret-up:before { + content: "\f0d8"; } -.page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; +.icon-caret-left:before { + content: "\f0d9"; } -.page-header .nav-tabs i { - margin-right: 10px; - font-size: 14px; +.icon-caret-right:before { + content: "\f0da"; } -.page-header .nav-tabs a:hover { - background-color: #ffffff; +.icon-columns:before { + content: "\f0db"; } -.prose h1, -.prose heading-1 h2, -.prose heading-2 { - margin-bottom: 15px; +.icon-sort:before { + content: "\f0dc"; } -.prose h3, -.prose heading-3 { - margin-bottom: 10px; +.icon-sort-down:before { + content: "\f0dd"; } -.table-chunky td, -.table-chunky th { - padding: 12px 15px; - font-size: 12px; +.icon-sort-up:before { + content: "\f0de"; } -.table-chunky thead th, -.table-chunky thead td { - color: #ffffff; - background-color: #aaaaaa; - padding-top: 10px; - padding-bottom: 10px; +.icon-envelope-alt:before { + content: "\f0e0"; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: transparent; +.icon-linkedin:before { + content: "\f0e1"; } -.table-striped tbody tr:nth-child(even) td, -.table-striped tbody tr:nth-child(even) th { - background-color: #f2f2f2; +.icon-undo:before { + content: "\f0e2"; } -.table-chunky.table-bordered { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-legal:before { + content: "\f0e3"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; +.icon-dashboard:before { + content: "\f0e4"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +.icon-comment-alt:before { + content: "\f0e5"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 2px; - -moz-border-radius: 0 0 0 2px; - border-radius: 0 0 0 2px; - -webkit-border-bottom-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - border-bottom-left-radius: 2px; +.icon-comments-alt:before { + content: "\f0e6"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - border-bottom-right-radius: 2px; +.icon-bolt:before { + content: "\f0e7"; } -.ckan-icon { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; +.icon-sitemap:before { + content: "\f0e8"; } -.ckan-icon:last-child { - *margin-left: 0; +.icon-umbrella:before { + content: "\f0e9"; } -.ckan-icon-fb { - width: 16px; - height: 16px; - background-position: 0px 0; +.icon-paste:before { + content: "\f0ea"; } -.ckan-icon-gplus { - width: 16px; - height: 16px; - background-position: -16px 0; +.icon-lightbulb:before { + content: "\f0eb"; } -.ckan-icon-twitter { - width: 16px; - height: 16px; - background-position: -32px 0; +.icon-exchange:before { + content: "\f0ec"; } -.ckan-icon-email { - width: 16px; - height: 16px; - background-position: -48px 0; +.icon-cloud-download:before { + content: "\f0ed"; } -.ckan-icon-share { - width: 16px; - height: 16px; - background-position: -64px 0; +.icon-cloud-upload:before { + content: "\f0ee"; } -.ckan-icon-feed { - width: 16px; - height: 16px; - background-position: -80px 0; +.icon-user-md:before { + content: "\f0f0"; } -.ckan-icon-calendar { - width: 16px; - height: 16px; - background-position: -96px 0; +.icon-stethoscope:before { + content: "\f0f1"; } -.ckan-icon-file { - width: 16px; - height: 16px; - background-position: -112px 0; +.icon-suitcase:before { + content: "\f0f2"; } -.ckan-icon-lock { - width: 16px; - height: 16px; - background-position: -128px 0; +.icon-bell-alt:before { + content: "\f0f3"; } -.ckan-icon-link-file { - width: 16px; - height: 16px; - background-position: -144px 0; +.icon-coffee:before { + content: "\f0f4"; } -.ckan-icon-link-plugin { - width: 16px; - height: 16px; - background-position: -160px 0; +.icon-food:before { + content: "\f0f5"; } -.ckan-icon-upload-file { - width: 16px; - height: 16px; - background-position: -176px 0; +.icon-file-alt:before { + content: "\f0f6"; } -.ckan-icon-callout { - width: 16px; - height: 16px; - background-position: -192px 0; +.icon-building:before { + content: "\f0f7"; } -.ckan-icon-circle-cross { - width: 17px; - height: 17px; - background-position: 0px -16px; +.icon-hospital:before { + content: "\f0f8"; } -.ckan-icon-circle-add { - width: 17px; - height: 17px; - background-position: -17px -16px; +.icon-ambulance:before { + content: "\f0f9"; } -.ckan-icon-flame { - width: 17px; - height: 17px; - background-position: -34px -16px; +.icon-medkit:before { + content: "\f0fa"; } -.ckan-icon-search { - width: 17px; - height: 17px; - background-position: -51px -16px; +.icon-fighter-jet:before { + content: "\f0fb"; } -.ckan-icon-large-lock { - width: 20px; - height: 20px; - background-position: 0px -33px; +.icon-beer:before { + content: "\f0fc"; } -.ckan-icon-photo { - width: 20px; - height: 20px; - background-position: -20px -33px; +.icon-h-sign:before { + content: "\f0fd"; } -.ckan-icon-add { - width: 20px; - height: 20px; - background-position: -40px -33px; +.icon-plus-sign-alt:before { + content: "\f0fe"; } -.ckan-icon-home { - width: 20px; - height: 20px; - background-position: -60px -33px; +.icon-double-angle-left:before { + content: "\f100"; } -.ckan-icon-rewind { - width: 20px; - height: 20px; - background-position: -80px -33px; +.icon-double-angle-right:before { + content: "\f101"; } -.ckan-icon-tools { - width: 20px; - height: 20px; - background-position: -100px -33px; +.icon-double-angle-up:before { + content: "\f102"; } -.ckan-icon-flag { - width: 20px; - height: 20px; - background-position: -120px -33px; +.icon-double-angle-down:before { + content: "\f103"; } -.ckan-icon-clipboard { - width: 20px; - height: 20px; - background-position: -140px -33px; +.icon-angle-left:before { + content: "\f104"; } -.ckan-icon-share { - width: 20px; - height: 20px; - background-position: -160px -33px; +.icon-angle-right:before { + content: "\f105"; } -.ckan-icon-info { - width: 20px; - height: 20px; - background-position: -180px -33px; +.icon-angle-up:before { + content: "\f106"; } -.ckan-icon-download { - width: 20px; - height: 20px; - background-position: -200px -33px; +.icon-angle-down:before { + content: "\f107"; } -.ckan-icon-star { - width: 20px; - height: 20px; - background-position: -220px -33px; +.icon-desktop:before { + content: "\f108"; } -.ckan-icon-info-flat { - width: 20px; - height: 20px; - background-position: -240px -33px; +.icon-laptop:before { + content: "\f109"; } -.ckan-icon-tag { - width: 20px; - height: 20px; - background-position: -260px -33px; +.icon-tablet:before { + content: "\f10a"; } -.ckan-icon-plus { - width: 20px; - height: 20px; - background-position: -280px -33px; - width: 16px; +.icon-mobile-phone:before { + content: "\f10b"; } -.ckan-icon-head { - width: 20px; - height: 20px; - background-position: -300px -33px; +.icon-circle-blank:before { + content: "\f10c"; } -.ckan-icon-arrow-e { - width: 20px; - height: 20px; - background-position: -320px -33px; - width: 16px; +.icon-quote-left:before { + content: "\f10d"; } -.ckan-icon-bookmark { - width: 25px; - height: 25px; - background-position: 0px -53px; +.icon-quote-right:before { + content: "\f10e"; } -.format-label { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - text-indent: -900em; - background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +.icon-spinner:before { + content: "\f110"; } -.format-label:last-child { - *margin-left: 0; +.icon-circle:before { + content: "\f111"; } -.format-label { - width: 32px; - height: 35px; - background-position: 0px -62px; +.icon-reply:before { + content: "\f112"; } -.format-label[data-format=rdf], -.format-label[data-format*=rdf] { - width: 32px; - height: 35px; - background-position: -32px -62px; +.icon-github-alt:before { + content: "\f113"; } -.format-label[data-format=pdf], -.format-label[data-format*=pdf] { - width: 32px; - height: 35px; - background-position: -64px -62px; +.icon-folder-close-alt:before { + content: "\f114"; } -.format-label[data-format=api], -.format-label[data-format*=api] { - width: 32px; - height: 35px; - background-position: -96px -62px; +.icon-folder-open-alt:before { + content: "\f115"; } -.format-label[data-format=zip], -.format-label[data-format*=zip] { - width: 32px; - height: 35px; - background-position: -128px -62px; +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + text-align: right; + font-size: 14px; + line-height: 1; + width: 14px; } -.format-label[data-format=xls], -.format-label[data-format*=xls] { - width: 32px; - height: 35px; - background-position: -160px -62px; +.btn [class^="icon-"], +.nav [class^="icon-"], +.module-heading [class^="icon-"], +.dropdown [class^="icon-"], +.btn [class*=" icon-"], +.nav [class*=" icon-"], +.module-heading [class*=" icon-"], +.dropdown [class*=" icon-"] { + margin-right: 4px; } -.format-label[data-format=csv], -.format-label[data-format*=csv] { - width: 32px; - height: 35px; - background-position: -192px -62px; +.info-block [class^="icon-"], +.info-block [class*=" icon-"] { + float: left; + font-size: 28px; + width: 28px; + margin-right: 5px; + margin-top: 2px; } -.format-label[data-format=txt], -.format-label[data-format*=txt] { - width: 32px; - height: 35px; - background-position: -224px -62px; +.breadcrumb .home .icon-home { + font-size: 24px; + width: 24px; + vertical-align: -1px; } -.format-label[data-format=xml], -.format-label[data-format*=xml] { - width: 32px; - height: 35px; - background-position: -256px -62px; +.info-block-small [class^="icon-"], +.info-block-small [class*=" icon-"] { + font-size: 14px; + width: 14px; + margin-top: 1px; } -.format-label[data-format=json], -.format-label[data-format*=json] { - width: 32px; - height: 35px; - background-position: -288px -62px; +.wrapper { + *zoom: 1; + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + position: relative; + background: #ffffff url("../../../base/images/nav.png") 0 0 repeat-y; + margin-bottom: 20px; } -.format-label[data-format=html], -.format-label[data-format*=html] { - width: 32px; - height: 35px; - background-position: -320px -62px; +.wrapper:before, +.wrapper:after { + display: table; + content: ""; + line-height: 0; } -li [class^="icon-"], -li [class*=" icon-"] { - width: auto; +.wrapper:after { + clear: both; } -li .icon-large:before, -li .icon-large:before { - width: auto; +.wrapper.no-nav { + background-image: none; } [role=main], .main { position: relative; - padding-top: 27px; - padding-bottom: 27px; - background-color: #efefef; + padding-top: 10px; + padding-bottom: 20px; + background: #eeeeee url("../../../base/images/bg.png"); } [role=main] { min-height: 350px; } .main:after, -.main:before, -[role=main]:after, -[role=main]:before { - content: ""; - position: absolute; - left: 0; - right: 0; - height: 7px; - background: #ffffff; - border-color: #c9c9c9; - border-style: solid; - border-width: 0; -} -.main:before, -[role=main]:before { - top: 0; - border-bottom-width: 1px; -} -.main:after, [role=main]:after { bottom: 0; border-top-width: 1px; } [role=main] .primary { - float: left; - margin-left: 20px; - width: 700px; + width: 717px; float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; float: left; } -.primary > :last-child, -.secondary > :last-child { - margin-bottom: 0; +.primary > :last-child, +.secondary > :last-child { + margin-bottom: 0; +} +.primary .primary { + float: left; + width: 467px; + margin-left: 0; + margin-bottom: 20px; +} +.primary .primary h1:first-child, +.primary .primary h2:first-child, +.primary .primary h3:first-child, +.primary .primary h4:first-child { + margin-top: 0; +} +.primary .tertiary { + float: left; + width: 180px; + margin-left: 20px; + margin-bottom: 20px; +} +.hero { + background: url("../../../base/images/background-tile.png"); +} +.hero:after { + background-color: rgba(0, 0, 0, 0.09); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-repeat: repeat-x; + background-color: #f6f6f6; + border-bottom: 1px solid #d0d0d0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + -moz-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); +} +.hero:after .back:hover { + text-decoration: none; +} +.hero:after .back:hover span { + text-decoration: underline; +} +.context-info .module-content { + padding: 15px; +} +.context-info .image { + margin-bottom: 10px; +} +.context-info .image img, +.context-info .image a { + display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.context-info p { + overflow: auto; +} +.context-info code { + display: block; + font-weight: normal; + padding: 0; + margin: 0; + overflow: auto; +} +.context-info h1.heading { + margin: 0 0 5px 0; + font-size: 18px; + line-height: 1.3; +} +.context-info .info { + margin-top: 15px; + padding-top: 10px; + border-top: 1px dotted #DDD; +} +.context-info .info dl dd { + margin-top: 3px; + margin-left: 0; +} +.context-info .nums { + *zoom: 1; + margin-top: 15px; + padding-top: 10px; + padding-bottom: 0; + border-top: 1px dotted #DDD; +} +.context-info .nums:before, +.context-info .nums:after { + display: table; + content: ""; + line-height: 0; +} +.context-info .nums:after { + clear: both; +} +.context-info .nums dl { + float: left; + width: 50%; + margin: 5px 0 0 0; + color: #444444; +} +.context-info .nums dl dt { + display: block; + font-size: 13px; + font-weight: 300; +} +.context-info .nums dl dd { + display: block; + font-size: 30px; + font-weight: 700; + line-height: 36px; + margin-left: 0; +} +.context-info .nums dl dd .smallest { + font-size: 13px; +} +.context-info .nums dl dd .smaller { + font-size: 16px; +} +.context-info .nums dl dd .small { + font-size: 21px; } -.hero { - background: url("../../../base/images/background-tile.png"); +.context-info .follow_button { + margin-top: 15px; } -.hero:after { - background-color: rgba(0, 0, 0, 0.09); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-repeat: repeat-x; - background-color: transparent; - top: 7px; - bottom: auto; - height: 5px; +.context-info.editing .module-content { + margin-top: 0; } .hero { - padding-bottom: 0; + background: url("../../../base/images/background-tile.png"); + padding: 20px 0; min-height: 0; } .hero > .container { position: relative; padding-bottom: 0; } -.hero-primary, -.hero-secondary { - float: left; - margin-left: 20px; - width: 460px; -} -.hero-primary { - margin-left: 0; -} -.hero-primary { - margin-left: 0; - margin-bottom: 0; -} -.hero-secondary { - position: absolute; - bottom: 0; - right: 0; -} -.hero-secondary-inner { - bottom: 0; - left: 0; - right: 0; -} -.hero .module-popup { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - margin-top: 50px; +.hero .search-giant { + margin-bottom: 10px; } -.hero .module-popup .module-content { - padding-bottom: 2px; +.hero .search-giant input { + border-color: #003f52; } .hero .page-heading { font-size: 18px; @@ -6734,290 +7984,339 @@ li .icon-large:before { } .hero .module-dark { padding: 5px; - margin-bottom: 10px; + margin-bottom: 0; color: #ffffff; background: #ffffff; } .hero .module-dark .module-content { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; background-color: #810606; + border-bottom: none; } .hero .module-dark .module-content .heading { + margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { - margin-bottom: 9px; -} -.hero .tags .tag, -.hero .tags .tag-list { - display: inline-block; -} -.hero .tags .tag-list { - padding: 0; -} -.hero .tags .tag { - margin-right: 15px; -} -header.masthead { *zoom: 1; - color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #910707; - background-image: -moz-linear-gradient(top, #810606, #a80808); - background-image: -ms-linear-gradient(top, #810606, #a80808); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#810606), to(#a80808)); - background-image: -webkit-linear-gradient(top, #810606, #a80808); - background-image: -o-linear-gradient(top, #810606, #a80808); - background-image: linear-gradient(top, #810606, #a80808); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#810606', endColorstr='#a80808', GradientType=0); + padding: 5px 10px 10px 10px; + background-color: #500404; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -header.masthead:before, -header.masthead:after { +.hero .tags:before, +.hero .tags:after { display: table; content: ""; + line-height: 0; } -header.masthead:after { +.hero .tags:after { clear: both; } -header.masthead .container { - position: relative; +.hero .tags h3, +.hero .tags .tag { + display: block; + float: left; + margin: 5px 10px 0 0; } -header.masthead a { - color: #ffffff; +.hero .tags h3 { + font-size: 14px; + line-height: 20px; + padding: 2px 8px; } -header.masthead hgroup h1, -header.masthead hgroup h2 { +.hero-primary, +.hero-secondary { float: left; - font-size: 34px; - line-height: 1.5; -} -header.masthead hgroup h1 { - font-weight: 900; - letter-spacing: -1px; + margin-left: 20px; + width: 460px; } -header.masthead hgroup h2 { - position: absolute; - bottom: -3px; - left: 0; - margin: 0; - font-size: 15px; - font-weight: normal; - line-height: 1.2; - white-space: nowrap; +.hero-primary { + margin-left: 0; + margin-bottom: 0; } -header.masthead .content { +.hero-secondary { position: absolute; - top: 10px; + bottom: 0; right: 0; } -header.masthead .section { - float: left; +.hero-secondary .hero-secondary-inner { + bottom: 0; + left: 0; + right: 0; } -header.masthead .navigation { - margin-right: 20px; +.main.homepage { + padding-top: 20px; + padding-bottom: 20px; + border-top: 1px solid #cccccc; } -header.masthead .navigation ul.unstyled { - *zoom: 1; - margin: 5px 0; +.main.homepage .module-heading .media-image { + margin-right: 15px; + max-height: 53px; + -webkit-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); } -header.masthead .navigation ul.unstyled:before, -header.masthead .navigation ul.unstyled:after { - display: table; - content: ""; +.main.homepage .group-listing .box { + min-height: 275px; } -header.masthead .navigation ul.unstyled:after { - clear: both; +.main.homepage .group-list { + margin-bottom: 0; } -header.masthead .navigation ul.unstyled li { - display: block; - float: left; +.main.homepage .group-list .dataset-content { + min-height: 70px; } -header.masthead .navigation ul.unstyled li a { - display: block; - font-size: 12px; - font-weight: bold; - padding: 4px 10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.main.homepage .box .module { + margin-top: 0; } -header.masthead .navigation ul.unstyled li a.active { - background-color: #871212; - box-shadow: 0 -1px 0 #5a0c0c, 0 1px 0 #942b2b; +.account-masthead { + *zoom: 1; + min-height: 30px; + color: #ffffff; + background: #500404 url("../../../base/images/bg.png"); } -header.masthead .site-search { - margin: 3px 0; +.account-masthead:before, +.account-masthead:after { + display: table; + content: ""; + line-height: 0; } -header.masthead .site-search input { - width: 190px; - font-size: 11px; - padding: 4px; +.account-masthead:after { + clear: both; } -header.masthead .account { - background: #900707; - padding: 3px 5px; - margin: 2px 0 2px 30px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 2px 4px #770606; - -moz-box-shadow: inset 0 2px 4px #770606; - box-shadow: inset 0 2px 4px #770606; +.account-masthead .account { + float: right; } -header.masthead .account ul.unstyled { +.account-masthead .account ul { *zoom: 1; } -header.masthead .account ul.unstyled:before, -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:before, +.account-masthead .account ul:after { display: table; content: ""; + line-height: 0; } -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:after { clear: both; } -header.masthead .account ul.unstyled li { +.account-masthead .account ul li { display: block; float: left; + border-left: 1px solid #380303; } -header.masthead .account ul.unstyled li a { +.account-masthead .account ul li a { display: block; - font-size: 12px; + color: #e0c1c1; + font-size: 13px; font-weight: bold; - padding: 4px 10px; + padding: 0 10px; + line-height: 31px; +} +.account-masthead .account ul li a span.username { + margin: 0 2px 0 4px; +} +.account-masthead .account ul li a:hover { + color: #ecdada; + background-color: #380303; + text-decoration: none; } -header.masthead .account ul.unstyled li a.sub { +.account-masthead .account ul li a.sub { font-weight: 300; - border-left: 1px solid #770606; } -header.masthead .account .dropdown { - float: left; +.account-masthead .account ul li a .btn { + vertical-align: 1px; + margin-left: 3px; } -header.masthead .account .button { - display: block; - text-decoration: none; - background-color: #810606; - color: #c08383; - text-shadow: 0 1px 1px #500404; +.account-masthead .account .notifications a span { + font-size: 12px; + margin-left: 3px; + padding: 1px 6px; + background-color: #380303; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 #990707; - -moz-box-shadow: inset 0 1px 0 #990707; - box-shadow: inset 0 1px 0 #990707; } -header.masthead .account .image { - margin: 2px 0; - padding: 0 4px 0 0; - overflow: hidden; - font-size: 10px; +.account-masthead .account .notifications a:hover span { + color: #ffffff; + background-color: #200101; +} +.account-masthead .account .notifications.notifications-important a span { + color: #ffffff; + background-color: #c9403a; +} +.account-masthead .account.authed .image { + padding: 0 6px; +} +.account-masthead .account.authed .image img { + vertical-align: -6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -header.masthead .account .image i { - vertical-align: -1px; +.masthead { + *zoom: 1; + min-height: 55px; + color: #ffffff; + background: #810606 url("../../../base/images/bg.png"); } -header.masthead .account .image img { - opacity: 0.7; - border-right: 1px solid #a80808; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.masthead:before, +.masthead:after { + display: table; + content: ""; + line-height: 0; +} +.masthead:after { + clear: both; } -header.masthead .account .notifications { - padding: 4px 8px 3px 8px; - margin: 2px 5px 2px 0; +.masthead .container { + position: relative; } -header.masthead .account .notifications.notifications-important { +.masthead a { color: #ffffff; - background-color: #c9403a; - text-shadow: 0 1px 1px #a3322d; - -webkit-box-shadow: inset 0 1px 0 #ce534e; - -moz-box-shadow: inset 0 1px 0 #ce534e; - box-shadow: inset 0 1px 0 #ce534e; } -header.masthead .account .dropdown.open .image img, -header.masthead .account .dropdown .image:hover img { - opacity: 1; - border-right-color: #d90a0a; +.masthead hgroup h1, +.masthead hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; } -header.masthead .account .dropdown.open .button, -header.masthead .account .dropdown .button:hover { - color: #ffffff; - background-color: #b36a6a; - -webkit-box-shadow: inset 0 1px 0 #c08383; - -moz-box-shadow: inset 0 1px 0 #c08383; - box-shadow: inset 0 1px 0 #c08383; - text-decoration: none; +.masthead hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.masthead hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.masthead .content { + position: absolute; + top: 10px; + right: 0; } -header.masthead .account .dropdown.open .notifications-important, -header.masthead .account .dropdown .notifications-important:hover { - background-color: #d46762; - text-shadow: 0 1px 1px #c9403a; - -webkit-box-shadow: inset 0 1px 0 #d97a76; - -moz-box-shadow: inset 0 1px 0 #d97a76; - box-shadow: inset 0 1px 0 #d97a76; +.masthead .section { + float: left; } -header.masthead .account.authed { - margin: 0 0 0 30px; +.masthead input[type="text"] { + border-color: #690505; } -header.masthead .account.not-authed { - padding-top: 2px; - padding-bottom: 2px; +.masthead .navigation { + margin-right: 20px; } -header.masthead .dropdown-menu { - margin-top: -1px; +.masthead .navigation .nav-pills { + margin-bottom: 0; } -header.masthead .user-dropdown-menu a { - color: #810606; +.masthead .navigation .nav-pills li a:hover, +.masthead .navigation .nav-pills li.active a { + background-color: #500404; } -header.masthead .user-dropdown-menu a:hover { - color: #ffffff; +.masthead .site-search { + margin: 2px 8px 2px 0; +} +.masthead .site-search input { + width: 200px; + padding: 4px 10px; } -header.masthead .debug { +.masthead .debug { position: absolute; - bottom: 10px; + top: 37px; left: 10px; - font-size: 11px; color: rgba(255, 255, 255, 0.5); - line-height: 1.2; } .site-footer { *zoom: 1; + min-height: 55px; color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #910707; - background-image: -moz-linear-gradient(top, #810606, #a80808); - background-image: -ms-linear-gradient(top, #810606, #a80808); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#810606), to(#a80808)); - background-image: -webkit-linear-gradient(top, #810606, #a80808); - background-image: -o-linear-gradient(top, #810606, #a80808); - background-image: linear-gradient(top, #810606, #a80808); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#810606', endColorstr='#a80808', GradientType=0); - font-size: 12px; + background: #810606 url("../../../base/images/bg.png"); padding: 20px 0; } .site-footer:before, .site-footer:after { display: table; content: ""; + line-height: 0; } .site-footer:after { clear: both; } +.site-footer .container { + position: relative; +} +.site-footer a { + color: #ffffff; +} +.site-footer hgroup h1, +.site-footer hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; +} +.site-footer hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.site-footer hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.site-footer .content { + position: absolute; + top: 10px; + right: 0; +} +.site-footer .section { + float: left; +} +.site-footer input[type="text"] { + border-color: #690505; +} +.site-footer .navigation { + margin-right: 20px; +} +.site-footer .navigation .nav-pills { + margin-bottom: 0; +} +.site-footer .navigation .nav-pills li a:hover, +.site-footer .navigation .nav-pills li.active a { + background-color: #500404; +} +.site-footer .site-search { + margin: 2px 8px 2px 0; +} +.site-footer .site-search input { + width: 200px; + padding: 4px 10px; +} +.site-footer .debug { + position: absolute; + top: 37px; + left: 10px; + color: rgba(255, 255, 255, 0.5); +} .site-footer, .site-footer label, .site-footer small { - color: #ccdee3; + color: #cd9b9b; } .site-footer a { - color: #ccdee3; + color: #cd9b9b; } .footer-links, .attribution { @@ -7028,19 +8327,24 @@ header.masthead .debug { .footer-links { margin-left: 0; } -.footer-links li { - display: inline-block; - width: 40%; - margin-right: 5%; +.footer-links ul { + float: left; + margin-left: 20px; + width: 220px; +} +.footer-links ul:first-child { + margin-left: 0; +} +.footer-links ul li { margin-bottom: 5px; } .attribution small { - color: #ccdee3; + color: #cd9b9b; font-size: 12px; } .attribution .ckan-footer-logo { display: block; - width: 65px; + width: 68px; height: 21px; margin-top: 2px; background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left; @@ -7053,6 +8357,7 @@ header.masthead .debug { .lang-select:after { display: table; content: ""; + line-height: 0; } .lang-select:after { clear: both; @@ -7069,153 +8374,66 @@ header.masthead .debug { .lang-dropdown li { width: auto; } -.lang-dropdown .select2-result-label[data-value]:before { - content: ""; - display: inline-block; - background-image: url("../../../base/images/flags.png"); - background-repeat: no-repeat; - background-position: 0 11px; - width: 17px; - height: 11px; - position: relative; - top: 1px; -} -.lang-dropdown .select2-result-label[data-value*="/en/"]:before { - background-position: 0 0; -} -.lang-dropdown .select2-result-label[data-value*="/de/"]:before { - background-position: 0 -11px; -} -.lang-dropdown .select2-result-label[data-value*="/fr/"]:before { - background-position: 0 -22px; -} -.lang-dropdown .select2-result-label[data-value*="/it/"]:before { - background-position: 0 -33px; -} -.lang-dropdown .select2-result-label[data-value*="/es/"]:before { - background-position: 0 -44px; -} -.lang-dropdown .select2-result-label[data-value*="/pl/"]:before { - background-position: 0 -55px; +.table-selected td { + background-color: #f5f5f5; } -.lang-dropdown .select2-result-label[data-value*="/ru/"]:before { - background-position: 0 -66px; +.table-selected td .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/nl/"]:before { - background-position: 0 -77px; +.table-bulk-edit th input { + top: -5px; } -.lang-dropdown .select2-result-label[data-value*="/sv/"]:before { - background-position: 0 -88px; +.table-bulk-edit .table-actions .btn-group { + float: left; + margin: 0 10px 0 0; } -.lang-dropdown .select2-result-label[data-value*="/no/"]:before { - background-position: 0 -99px; +.table-bulk-edit .context p { + margin-bottom: 0; } -.lang-dropdown .select2-result-label[data-value*="/cs/"]:before, -.lang-dropdown .select2-result-label[data-value*="/cs_CZ/"]:before { - background-position: 0 -110px; +.table-header thead th { + background-color: #f6f6f6; } -.lang-dropdown .select2-result-label[data-value*="/hu/"]:before { - background-position: 0 -121px; +.table-edit-hover .edit { + display: none; + float: right; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.table-edit-hover tr:hover .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/fi/"]:before { - background-position: 0 -143px; +.js .table-toggle-more .toggle-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/bg/"]:before { - background-position: 0 -154px; +.js .table-toggle-more .show-more { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/ca/"]:before { - background-position: 0 -165px; +.js .table-toggle-more .show-less { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/sq/"]:before { - background-position: 0 -176px; +.js .table-toggle-more .toggle-seperator { + display: table-row; } -.lang-dropdown .select2-result-label[data-value*="/sr/"]:before, -.lang-dropdown .select2-result-label[data-value*="/sr_Latn/"]:before { - background-position: 0 -187px; +.js .table-toggle-more .toggle-seperator td { + height: 11px; + padding: 0; + background-image: url("../../../base/images/table-seperator.png"); } -.lang-dropdown .select2-result-label[data-value*="/zh_TW/"]:before { - background-position: 0 -198px; +.js .table .toggle-show td { + background: none; + text-align: center; } -.lang-dropdown .select2-result-label[data-value*="/lv/"]:before { - background-position: 0 -209px; +.js .table-toggle-less .show-less { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/sk/"]:before { - background-position: 0 -220px; +.js .table-toggle-less .show-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.js .table-toggle-less .toggle-seperator { + display: none; } .profile .empty, .profile .dataset-list { margin-bottom: 20px; } -.profile-info .module-content { - padding: 15px; -} -.profile-info .avatar { - border: 1px solid #DDD; - padding: 5px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.profile-info .avatar img, -.profile-info .avatar a { - display: block; -} -.profile-info code { - font-weight: normal; - padding: 0; - margin: 0; -} -.profile-info h1.heading { - margin: 10px 0 5px 0; - font-size: 21px; -} -.profile-info .info { - margin-top: 15px; - padding-top: 10px; - border-top: 1px dotted #DDD; -} -.profile-info .info dl dd { - margin-top: 3px; - margin-left: 0; -} -.profile-info .nums { - *zoom: 1; - margin-top: 15px; - padding-top: 10px; - padding-bottom: 0; - border-top: 1px dotted #DDD; -} -.profile-info .nums:before, -.profile-info .nums:after { - display: table; - content: ""; -} -.profile-info .nums:after { - clear: both; -} -.profile-info .nums dl { - float: left; - width: 33%; - margin: 5px 0 0 0; - color: #4d4d4d; -} -.profile-info .nums dl dt { - display: block; - font-weight: 300; -} -.profile-info .nums dl dd { - display: block; - font-size: 30px; - font-weight: 700; - line-height: 1.2; - margin-left: 0; -} .activity { margin: 10px 0; padding: 0; @@ -7232,13 +8450,16 @@ header.masthead .debug { .activity .item:after { display: table; content: ""; + line-height: 0; } .activity .item:after { clear: both; } -.activity .item i { +.activity .item .icon { display: block; - float: left; + position: absolute; + top: 0; + left: 0; width: 30px; height: 30px; line-height: 30px; @@ -7246,7 +8467,6 @@ header.masthead .debug { color: #ffffff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); font-weight: normal; - font-size: 16px; margin-right: 10px; -webkit-border-radius: 100px; -moz-border-radius: 100px; @@ -7261,20 +8481,19 @@ header.masthead .debug { border-radius: 100px; } .activity .item .actor .gravatar { - float: left; - margin-top: -5px; - margin-right: 10px; + position: absolute; + top: 0; + left: 40px; } .activity .item p { font-size: 14px; line-height: 1.5; - margin: 5px 0 0 0; + margin: 5px 0 0 80px; } .activity .item .date { color: #999; font-size: 12px; white-space: nowrap; - margin-left: 5px; } .activity .item .new { display: block; @@ -7294,106 +8513,278 @@ header.masthead .debug { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.popover .about { - margin-bottom: 10px; +.activity .load-less { + margin-bottom: 15px; +} +.popover { + width: 300px; +} +.popover .popover-title { + font-weight: bold; + margin-bottom: 0; +} +.popover p.about { + margin: 0 0 10px 0; } .popover .popover-close { float: right; text-decoration: none; } -.activity .item i { - background-color: #767dce; +.activity .item .icon { + background-color: #999999; } -.activity .item.added-tag i { +.activity .item.added-tag .icon { background-color: #6995a6; } -.activity .item.changed-group i { +.activity .item.changed-group .icon { background-color: #767dce; } -.activity .item.changed-package i { +.activity .item.changed-package .icon { background-color: #8c76ce; } -.activity .item.changed-package_extra i { +.activity .item.changed-package_extra .icon { background-color: #769ace; } -.activity .item.changed-resource i { +.activity .item.changed-resource .icon { background-color: #aa76ce; } -.activity .item.changed-user i { +.activity .item.changed-user .icon { background-color: #76b8ce; } -.activity .item.deleted-group i { +.activity .item.changed-organization .icon { + background-color: #699fa6; +} +.activity .item.deleted-group .icon { background-color: #b95252; } -.activity .item.deleted-package i { +.activity .item.deleted-package .icon { background-color: #b97452; } -.activity .item.deleted-package_extra i { +.activity .item.deleted-package_extra .icon { background-color: #b95274; } -.activity .item.deleted-resource i { +.activity .item.deleted-resource .icon { background-color: #b99752; } -.activity .item.new-group i { +.activity .item.deleted-organization .icon { + background-color: #b95297; +} +.activity .item.new-group .icon { background-color: #69a67a; } -.activity .item.new-package i { +.activity .item.new-package .icon { background-color: #69a68e; } -.activity .item.new-package_extra i { +.activity .item.new-package_extra .icon { background-color: #6ca669; } -.activity .item.new-resource i { +.activity .item.new-resource .icon { background-color: #81a669; } -.activity .item.new-user i { +.activity .item.new-user .icon { background-color: #69a6a3; } -.activity .item.removed-tag i { +.activity .item.new-organization .icon { + background-color: #81a669; +} +.activity .item.removed-tag .icon { background-color: #b95297; } -.activity .item.deleted-related-item i { +.activity .item.deleted-related-item .icon { background-color: #b9b952; } -.activity .item.follow-dataset i { +.activity .item.follow-dataset .icon { background-color: #767dce; } -.activity .item.follow-user i { +.activity .item.follow-user .icon { background-color: #8c76ce; } -.activity .item.new-related-item i { +.activity .item.new-related-item .icon { background-color: #95a669; } -.activity .item.follow-group i { +.activity .item.follow-group .icon { background-color: #8ba669; } -.popover-context-loading .popover-title { +.dropdown:hover .dropdown-menu { + display: block; +} +.js .dropdown .dropdown-menu, +.js .dropdown:hover .dropdown-menu { + display: none; +} +.js .dropdown.open .dropdown-menu { + display: block; +} +#followee-filter .btn { + *zoom: 1; +} +#followee-filter .btn:before, +#followee-filter .btn:after { + display: table; + content: ""; + line-height: 0; +} +#followee-filter .btn:after { + clear: both; +} +#followee-filter .btn span, +#followee-filter .btn strong { + display: block; + float: left; + line-height: 1.5; +} +#followee-filter .btn span { + font-weight: normal; +} +#followee-filter .btn strong { + margin: 0 5px; + white-space: nowrap; + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; +} +.dashboard-context { + position: relative; + margin-bottom: 20px; + padding: 20px; + border-bottom: 1px solid #DCDCDC; + background-color: #f6f6f6; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; +} +.dashboard-context h2 { + margin-bottom: 10px; +} +.dashboard-context .arrow { + position: absolute; + content: ' '; + top: 30px; + right: -10px; + width: 10px; + height: 21px; + background: transparent url("../../../base/images/dashboard-followee-related.png"); +} +.popover-followee .popover-title { display: none; } -.popover-context-loading .popover-content { +.popover-followee .popover-content { + padding: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -.popover-context-loading .popover-content img { - vertical-align: -3px; - margin-right: 10px; +.popover-followee .empty { + padding: 10px; } -.follower-list li { - margin: 0 0 15px 0; +.popover-followee .popover-header { + *zoom: 1; + background-color: whiteSmoke; + padding: 5px; + border-bottom: 1px solid #cccccc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.follower-list .gravatar { - vertical-align: -4px; - margin-right: 3px; +.popover-followee .popover-header:before, +.popover-followee .popover-header:after { + display: table; + content: ""; + line-height: 0; +} +.popover-followee .popover-header:after { + clear: both; +} +.popover-followee .popover-header .input-prepend { + margin-bottom: 0; +} +.popover-followee .popover-header .add-on, +.popover-followee .popover-header input { + float: left; + margin: 0; +} +.popover-followee .popover-header .add-on { + padding: 4px 8px 4px 12px; + border-right-width: 0; + -webkit-border-radius: 100px 0 0 100px; + -moz-border-radius: 100px 0 0 100px; + border-radius: 100px 0 0 100px; +} +.popover-followee .popover-header input { + padding: 4px 12px 4px 8px; + font-size: 13px; + width: 207px; + -webkit-border-radius: 0 100px 100px 0; + -moz-border-radius: 0 100px 100px 0; + border-radius: 0 100px 100px 0; +} +.popover-followee .nav { + padding: 0; + margin: 0; + max-height: 205px; + overflow: auto; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.popover-followee .nav li a { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: 7px 10px 7px 15px; + margin: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.popover-followee .nav li a i { + background-color: #810606; + color: #ffffff; + margin-right: 11px; + padding: 3px 5px; + line-height: 1; -webkit-border-radius: 100px; -moz-border-radius: 100px; border-radius: 100px; + -webkit-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); } -.module-my-datasets .empty { - padding: 10px; +.popover-followee .nav li a:hover i { + background-color: #000; +} +.popover-followee .nav li.active a i { + color: #810606; + background-color: #ffffff; +} +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; } body { - background-color: #a80808; + background: #810606 url("../../../base/images/bg.png"); } [hidden] { display: none; @@ -7412,11 +8803,10 @@ table .metric { width: 140px; } code { - padding: 2px 2px; color: #000000; - font-weight: bold; border: none; background: none; + white-space: normal; } pre { border: none; @@ -7446,10 +8836,11 @@ iframe { text-indent: -999em; } .empty { - color: #aeaeae; + color: #aaaaaa; font-style: italic; } .page-heading { + margin-top: 0; margin-bottom: 16px; } .m-top { @@ -7492,10 +8883,6 @@ iframe { position: relative; top: -20px; } -.ie .module, -.ie .media-image { - border: 1px solid #cccccc; -} .ie .module-popup { border-bottom: none; } @@ -7519,24 +8906,19 @@ iframe { .ie9 .control-large input { height: 56px; } -.ie9 .module { - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +.ie8 .account-masthead a.image, +.ie8 .account-masthead .username { + white-space: nowrap; } -.ie7 .masthead nav ul li a.active, -.ie8 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #8b0606; - border-top: 1px solid #720505; - border-bottom: 1px solid #990707; +.ie9 .homepage .media.module-heading .media-image img, +.ie8 .homepage .media.module-heading .media-image img, +.ie7 .homepage .media.module-heading .media-image img { + width: 85px !important; } -.ie8 .masthead .account a.image { - display: block; - width: 25px; - padding-right: 10px; - white-space: nowrap; +.ie8 .hero .hero-primary.module-popup .box, +.ie7 .hero .hero-primary.module-popup .box { + padding-bottom: 20px !important; + margin-bottom: 0 !important; } .ie7 .alert { position: relative; @@ -7556,6 +8938,7 @@ iframe { .ie7 .tags .tag-list:after { display: table; content: ""; + line-height: 0; } .ie7 .tags .tag-list:after { clear: both; @@ -7569,8 +8952,6 @@ iframe { } .ie7 .tags .tag { display: block; - border: 1px solid #d0d0d0; - background: #f5f5f5; } .ie7 .search-giant input { width: 95%; @@ -7621,6 +9002,9 @@ iframe { .ie7 .stages li .highlight { width: auto; } +.ie7 .account-masthead .account a i { + line-height: 31px; +} .ie7 .masthead { position: relative; z-index: 1; @@ -7632,39 +9016,12 @@ iframe { *zoom: 1; } -.ie7 .masthead nav ul { - margin-top: 5px; -} -.ie7 .masthead nav ul li { - float: left; -} -.ie7 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #8b0606; - border-top: 1px solid #720505; - border-bottom: 1px solid #990707; -} .ie7 .masthead .header-image { display: block; } .ie7 .masthead .account .dropdown-menu { z-index: 10000; } -.ie7 .footer-links { - *zoom: 1; -} -.ie7 .footer-links:before, -.ie7 .footer-links:after { - display: table; - content: ""; -} -.ie7 .footer-links:after { - clear: both; -} -.ie7 .footer-links li { - float: left; -} .ie7 .module-narrow .nav-item.image { *zoom: 1; } @@ -7672,6 +9029,7 @@ iframe { .ie7 .module-narrow .nav-item.image:after { display: table; content: ""; + line-height: 0; } .ie7 .module-narrow .nav-item.image:after { clear: both; @@ -7689,11 +9047,13 @@ iframe { } .ie7 .module-heading { *zoom: 1; + position: relative; } .ie7 .module-heading:before, .ie7 .module-heading:after { display: table; content: ""; + line-height: 0; } .ie7 .module-heading:after { clear: both; @@ -7713,3 +9073,22 @@ iframe { position: relative; zoom: 1; } +.ie7 .resource-item { + position: static; + padding-bottom: 1px; +} +.ie7 .resource-item .heading { + position: relative; +} +.ie7 .resource-item .format-label { + left: -48px; +} +.ie7 .resource-item .btn-group { + position: relative; + float: right; + top: -35px; + right: 0; +} +.ie7 .media-overlay .media-heading { + background-color: #000; +} diff --git a/ckan/public/base/css/red.css b/ckan/public/base/css/red.css index c9d4b17974b..26f22422970 100644 --- a/ckan/public/base/css/red.css +++ b/ckan/public/base/css/red.css @@ -48,11 +48,25 @@ sub { bottom: -0.25em; } img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; + /* Part 1: Set a maxium relative to the parent */ + + width: auto\9; + /* IE7-8 need help adjusting responsive images */ + + height: auto; + /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img, +.google-maps img { + max-width: none; +} button, input, select, @@ -72,11 +86,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +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; @@ -92,6 +116,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !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; } @@ -99,6 +174,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -113,28 +189,47 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } body { margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #4d4d4d; - background-color: #efefef; + font-size: 14px; + line-height: 20px; + color: #444444; + background-color: #eeeeee; } a { - color: #b50909; + color: #c14531; text-decoration: none; } -a:hover { - color: #6c0505; +a:hover, +a:focus { + color: #842f22; text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} .row { margin-left: -20px; *zoom: 1; @@ -143,15 +238,18 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -236,6 +334,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -243,65 +342,171 @@ a:hover { .row-fluid [class*="span"] { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; +} +.row-fluid .offset12 { + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; +} +.row-fluid .offset12:first-child { + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; +} +.row-fluid .offset11 { + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; +} +.row-fluid .offset11:first-child { + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; +} +.row-fluid .offset10 { + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; +} +.row-fluid .offset10:first-child { + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; +} +.row-fluid .offset9 { + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; +} +.row-fluid .offset9:first-child { + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; +} +.row-fluid .offset8 { + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; +} +.row-fluid .offset8:first-child { + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; +} +.row-fluid .offset7 { + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; +} +.row-fluid .offset7:first-child { + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; +} +.row-fluid .offset6 { + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; +} +.row-fluid .offset6:first-child { + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; +} +.row-fluid .offset5 { + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; +} +.row-fluid .offset5:first-child { + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; +} +.row-fluid .offset4 { + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; +} +.row-fluid .offset4:first-child { + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; +} +.row-fluid .offset3 { + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; +} +.row-fluid .offset3:first-child { + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; +} +.row-fluid .offset2 { + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; +} +.row-fluid .offset2:first-child { + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; +} +.row-fluid .offset1 { + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; +} +.row-fluid .offset1:first-child { + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; +} +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; } .container { margin-right: auto; @@ -312,6 +517,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -325,25 +531,75 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; - font-size: 20px; + margin-bottom: 20px; + font-size: 21px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; +} +a.muted:hover, +a.muted:focus { + color: #808080; +} +.text-warning { + color: #c09853; +} +a.text-warning:hover, +a.text-warning:focus { + color: #a47e3c; +} +.text-error { + color: #b55457; +} +a.text-error:hover, +a.text-error:focus { + color: #954143; +} +.text-info { + color: #3a87ad; +} +a.text-info:hover, +a.text-info:focus { + color: #2d6987; +} +.text-success { + color: #468847; +} +a.text-success:hover, +a.text-success:focus { + color: #356635; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; } h1, h2, @@ -351,9 +607,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -364,60 +621,53 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } -h1 { - font-size: 30px; - line-height: 36px; +h1, +h2, +h3 { + line-height: 40px; } -h1 small { - font-size: 18px; +h1 { + font-size: 38.5px; } h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; + font-size: 31.5px; } h3 { - font-size: 18px; - line-height: 27px; + font-size: 24.5px; } -h3 small { +h4 { + font-size: 17.5px; +} +h5 { font-size: 14px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 11.9px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24.5px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 17.5px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -425,37 +675,57 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding-left: 5px; + padding-right: 5px; +} dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; } dd { - margin-left: 9px; + margin-left: 10px; +} +.dl-horizontal { + *zoom: 1; +} +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: ""; + line-height: 0; +} +.dl-horizontal:after { + clear: both; } .dl-horizontal dt { float: left; - width: 120px; + width: 160px; clear: left; text-align: right; overflow: hidden; @@ -463,26 +733,18 @@ dd { white-space: nowrap; } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -490,18 +752,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 22.5px; + line-height: 1.25; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -518,6 +780,12 @@ blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} q:before, q:after, blockquote:before, @@ -526,20 +794,14 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} -small { - font-size: 100%; -} -cite { + margin-bottom: 20px; font-style: normal; + line-height: 20px; } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; @@ -551,13 +813,14 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -570,11 +833,13 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -583,7 +848,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -594,15 +859,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -610,9 +875,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -623,116 +888,181 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + vertical-align: middle; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +input, +textarea, +.uneditable-input { + width: 206px; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; +textarea { height: auto; - padding: 0; - margin: 3px 0; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: #ffffff; + border: 1px solid #cccccc; + -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); + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ + margin-top: 1px \9; + /* IE8-9 */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + line-height: normal; } -input[type="button"], +input[type="file"], +input[type="image"], +input[type="submit"], input[type="reset"], -input[type="submit"] { +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - height: auto; } select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; + line-height: 30px; } select { width: 220px; + border: 1px solid #cccccc; background-color: #ffffff; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -textarea { +.uneditable-input, +.uneditable-textarea { + color: #999999; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} +.uneditable-textarea { + width: auto; height: auto; } -input[type="hidden"] { - display: none; +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; } .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, .controls > .checkbox:first-child { @@ -749,39 +1079,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -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); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -811,46 +1108,105 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { margin-left: 0; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 926px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 846px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 766px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 686px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 606px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 526px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 446px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 366px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 286px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 206px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 126px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 46px; +} +.controls-row { + *zoom: 1; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +.controls-row:before, +.controls-row:after { + display: table; + content: ""; + line-height: 0; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +.controls-row:after { + clear: both; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { + float: left; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } input[disabled], select[disabled], @@ -860,7 +1216,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -868,24 +1223,33 @@ input[type="radio"][readonly], 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; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .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 input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -893,24 +1257,33 @@ input[type="checkbox"][readonly] { background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b55457; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b55457; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b55457; + -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 input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #954143; - -webkit-box-shadow: 0 0 6px #d49b9d; - -moz-box-shadow: 0 0 6px #d49b9d; - box-shadow: 0 0 6px #d49b9d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -918,24 +1291,33 @@ input[type="checkbox"][readonly] { background-color: #f8f0f0; border-color: #b55457; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .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 input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -943,59 +1325,78 @@ input[type="checkbox"][readonly] { background-color: #dff0d8; 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; box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} .help-block, .help-inline { - color: #555555; + color: #6a6a6a; } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1006,62 +1407,76 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { - margin-bottom: 5px; +.input-append, +.input-prepend { + display: inline-block; + margin-bottom: 10px; + vertical-align: middle; + font-size: 0; + white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-append .dropdown-menu, +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, +.input-prepend .add-on, +.input-append .btn, .input-prepend .btn, -.input-append .btn { - margin-left: -1px; +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,12 +1497,21 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; +.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 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 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 { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1099,6 +1523,13 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; 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 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; @@ -1113,7 +1544,10 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; +} +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1121,9 +1555,36 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, .form-inline input, @@ -1152,6 +1613,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1159,7 +1621,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1185,45 +1649,53 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; } .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } .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: 9px; 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 { max-width: 100%; @@ -1233,12 +1705,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1260,6 +1732,9 @@ table { .table tbody + tbody { border-top: 2px solid #dddddd; } +.table .table { + background-color: #eeeeee; +} .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1267,7 +1742,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1288,160 +1763,175 @@ table { .table-bordered tbody:first-child tr:first-child td { 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, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 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, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody: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 tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 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 thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; +} +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 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, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; +} +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; +} +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } -table .span1 { +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 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 tbody tr.success > td { + background-color: #dff0d8; } -table .span18 { - float: none; - width: 1404px; - margin-left: 0; +.table tbody tr.error > td { + background-color: #f8f0f0; } -table .span19 { - float: none; - width: 1484px; - margin-left: 0; +.table tbody tr.warning > td { + background-color: #fcf8e3; } -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.info > td { + background-color: #d9edf7; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table-hover tbody tr.error:hover > td { + background-color: #f0dfe0; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } .dropup, .dropdown { @@ -1463,18 +1953,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1483,17 +1966,17 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; + padding: 5px 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1508,35 +1991,71 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu > li > a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + text-decoration: none; + color: #ffffff; + background-color: #b9422f; + background-image: -moz-linear-gradient(top, #c14531, #ad3e2c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#c14531), to(#ad3e2c)); + background-image: -webkit-linear-gradient(top, #c14531, #ad3e2c); + background-image: -o-linear-gradient(top, #c14531, #ad3e2c); + background-image: linear-gradient(to bottom, #c14531, #ad3e2c); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc14531', endColorstr='#ffad3e2c', GradientType=0); +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #b50909; + outline: 0; + background-color: #b9422f; + background-image: -moz-linear-gradient(top, #c14531, #ad3e2c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#c14531), to(#ad3e2c)); + background-image: -webkit-linear-gradient(top, #c14531, #ad3e2c); + background-image: -o-linear-gradient(top, #c14531, #ad3e2c); + background-image: linear-gradient(to bottom, #c14531, #ad3e2c); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc14531', endColorstr='#ffad3e2c', GradientType=0); +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: default; } .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -1544,7 +2063,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -1552,7 +2071,62 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.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; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + 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-left: 20px; + padding-right: 20px; +} .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1563,8 +2137,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1590,16 +2163,13 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -1607,7 +2177,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -1618,13 +2187,14 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } -.close:hover { +.close:hover, +.close:focus { color: #000000; text-decoration: none; cursor: pointer; @@ -1644,25 +2214,23 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 12px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; + font-size: 14px; + line-height: 20px; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); border-color: #eaeaea #eaeaea #c4c4c4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; @@ -1681,10 +2249,12 @@ button.close { box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, +.btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #eaeaea; *background-color: #dddddd; } @@ -1695,17 +2265,13 @@ button.close { .btn:first-child { *margin-left: 0; } -.btn:hover { +.btn:hover, +.btn:focus { 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; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -1716,8 +2282,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,.15), 0 1px 2px rgba(0,0,0,.05); @@ -1727,7 +2291,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -1736,43 +2299,54 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 15px; - 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: 1px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; } .btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.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: 14px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + 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, @@ -1782,49 +2356,49 @@ button.close { .btn-inverse.active { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn-primary { - background-color: #f65454; - background-image: -moz-linear-gradient(top, #f54444, #f76b6b); - background-image: -ms-linear-gradient(top, #f54444, #f76b6b); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f54444), to(#f76b6b)); - background-image: -webkit-linear-gradient(top, #f54444, #f76b6b); - background-image: -o-linear-gradient(top, #f54444, #f76b6b); - background-image: linear-gradient(top, #f54444, #f76b6b); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #cc5845; + background-image: -moz-linear-gradient(top, #d36452, #c14531); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d36452), to(#c14531)); + background-image: -webkit-linear-gradient(top, #d36452, #c14531); + background-image: -o-linear-gradient(top, #d36452, #c14531); + background-image: linear-gradient(to bottom, #d36452, #c14531); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f54444', endColorstr='#f76b6b', GradientType=0); - border-color: #f76b6b #f76b6b #f32222; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd36452', endColorstr='#ffc14531', GradientType=0); + border-color: #c14531 #c14531 #842f22; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76b6b; + *background-color: #c14531; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, +.btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #f76b6b; - *background-color: #f65353; + color: #ffffff; + background-color: #c14531; + *background-color: #ad3e2c; } .btn-primary:active, .btn-primary.active { - background-color: #f43b3b \9; + background-color: #983627 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); 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); *background-color: #f89406; @@ -1833,10 +2407,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, +.btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -1845,15 +2421,16 @@ button.close { background-color: #c67605 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); 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); *background-color: #bd362f; @@ -1862,10 +2439,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, +.btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -1874,15 +2453,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); 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); *background-color: #51a351; @@ -1891,10 +2471,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, +.btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -1903,15 +2485,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); 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); *background-color: #2f96b4; @@ -1920,10 +2503,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, +.btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -1932,15 +2517,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + 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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); 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); *background-color: #222222; @@ -1949,10 +2535,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, +.btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -1962,8 +2550,8 @@ button.close { } button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { @@ -1985,19 +2573,46 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #c14531; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover, +.btn-link:focus { + color: #842f22; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { + color: #333333; + text-decoration: none; +} .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + *zoom: 1; + font-size: 0; + vertical-align: middle; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2005,24 +2620,38 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } -.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 { + margin-left: 5px; } .btn-group > .btn { position: relative; - float: left; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu, +.btn-group > .popover { + font-size: 14px; +} +.btn-group > .btn-mini { + font-size: 10.5px; +} +.btn-group > .btn-small { + font-size: 11.9px; +} +.btn-group > .btn-large { + font-size: 17.5px; +} .btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; @@ -2069,26 +2698,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2100,7 +2733,7 @@ input[type="submit"].btn.btn-mini { background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #f76b6b; + background-color: #c14531; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #f89406; @@ -2118,29 +2751,23 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -2150,45 +2777,95 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +} +.btn-group-vertical { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group-vertical > .btn { + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group-vertical > .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.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 { + -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 { + -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 { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.alert, +.alert h4 { color: #c09853; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #468847; } +.alert-success h4 { + color: #468847; +} .alert-danger, .alert-error { background-color: #f8f0f0; border-color: #c6898b; color: #b55457; } +.alert-danger h4, +.alert-error h4 { + color: #b55457; +} .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #3a87ad; } +.alert-info h4 { + color: #3a87ad; +} .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -2202,25 +2879,29 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} .nav > .pull-right { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2243,18 +2924,20 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #b50909; + background-color: #c14531; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2270,6 +2953,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2295,19 +2979,21 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-tabs > li > a:hover { +.nav-tabs > li > a:hover, +.nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: #555555; - background-color: #ffffff; + background-color: #eeeeee; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -2322,9 +3008,10 @@ input[type="submit"].btn.btn-mini { border-radius: 5px; } .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: #ffffff; - background-color: #b50909; + background-color: #c14531; } .nav-stacked > li { float: none; @@ -2342,16 +3029,23 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -2362,51 +3056,60 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #b50909; - border-bottom-color: #b50909; +.nav .dropdown-toggle .caret { + border-top-color: #c14531; + border-bottom-color: #c14531; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #6c0505; - border-bottom-color: #6c0505; +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { + border-top-color: #842f22; + border-bottom-color: #842f22; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; } -.nav > .dropdown.active > a:hover { - color: #000000; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: #ffffff; background-color: #999999; border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: #999999; } .tabbable { @@ -2416,6 +3119,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2448,12 +3152,14 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below > .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover, +.tabs-below > .nav-tabs > li > a:focus { border-bottom-color: transparent; border-top-color: #ddd; } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, @@ -2477,11 +3183,13 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2496,78 +3204,110 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.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); + *zoom: 1; +} +.navbar-inner:before, +.navbar-inner:after { + display: table; + content: ""; + line-height: 0; +} +.navbar-inner:after { + clear: both; } .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; + overflow: visible; } .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #777777; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .brand:hover, +.navbar .brand:focus { + text-decoration: none; } -.navbar .navbar-text { +.navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #777777; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover, +.navbar-link:focus { + color: #333333; +} +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #f2f2f2; + border-right: 1px solid #ffffff; } .navbar .btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { + margin-top: 0; } .navbar-form { margin-bottom: 0; @@ -2577,6 +3317,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -2588,7 +3329,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -2599,7 +3341,7 @@ input[type="submit"].btn.btn-mini { } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } .navbar-form .input-append input, @@ -2609,44 +3351,28 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; +.navbar-static-top { + position: static; + margin-bottom: 0; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -2657,6 +3383,13 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -2664,6 +3397,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -2671,9 +3405,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); +} .navbar-fixed-bottom { bottom: 0; } +.navbar-fixed-bottom .navbar-inner { + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -2683,51 +3428,36 @@ input[type="submit"].btn.btn-mini { } .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #777777; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; + text-shadow: 0 1px 0 #ffffff; } -.navbar .btn-group { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #ffffff; + color: #333333; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #555555; text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { display: none; @@ -2735,18 +3465,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + 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-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + 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); - *background-color: #222222; + *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2755,16 +3486,18 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -2781,7 +3514,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -2792,7 +3525,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -2802,142 +3535,293 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + background-color: #e5e5e5; + color: #555555; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + border-color: #252525; } -.breadcrumb .divider { - padding: 0 5px; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover, +.navbar-inverse .brand:focus, +.navbar-inverse .nav > li > a:focus { + color: #ffffff; } -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); +.navbar-inverse .brand { + color: #999999; } -.pagination li { - display: inline; +.navbar-inverse .navbar-text { + color: #999999; } -.pagination a { +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + background-color: transparent; + color: #ffffff; +} +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover, +.navbar-inverse .navbar-link:focus { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #111111; + border-right-color: #222222; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111111; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > a:hover .caret, +.navbar-inverse .nav li.dropdown > a:focus .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; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + 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-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + 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); + *background-color: #040404; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:focus, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} +.breadcrumb { + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb > li > .divider { + padding: 0 5px; + color: #ccc; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + margin: 20px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -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 ul > li { + display: inline; +} +.pagination ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 34px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination ul > li > a:hover, +.pagination ul > li > a:focus, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a { +.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, +.pagination ul > .disabled > a:focus { color: #999999; background-color: transparent; cursor: default; } -.pagination li:first-child a { +.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-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.pagination li:last-child a { - -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; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -2945,9 +3829,63 @@ input[type="submit"].btn.btn-mini { .pagination-right { 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-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 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-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 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; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 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-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -2956,6 +3894,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -2963,7 +3902,8 @@ input[type="submit"].btn.btn-mini { .pager li { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -2972,34 +3912,27 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 15px; border-radius: 15px; } -.pager a:hover { +.pager li > a:hover, +.pager li > a:focus { 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 > a:focus, +.pager .disabled > span { color: #999999; background-color: #fff; cursor: default; } -.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: 2070; -} .modal-backdrop { position: fixed; top: 0; @@ -3019,12 +3952,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -3040,17 +3972,17 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -3059,7 +3991,12 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { + position: relative; overflow-y: auto; max-height: 400px; padding: 15px; @@ -3085,6 +4022,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3096,13 +4034,16 @@ input[type="submit"].btn.btn-mini { .modal-footer .btn-group .btn + .btn { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -3111,52 +4052,24 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .tooltip.top { - margin-top: -2px; + margin-top: -3px; + padding: 5px 0; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; + padding: 5px 0; } .tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: #ffffff; text-align: center; text-decoration: none; @@ -3169,100 +4082,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; } -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + border-width: 5px 5px 0; + border-top-color: #000000; } -.popover.right .arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + border-width: 5px 5px 5px 0; + border-right-color: #000000; } -.popover.left .arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -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); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + border-width: 5px 0 5px 5px; + border-left-color: #000000; } -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .thumbnails { margin-left: -20px; @@ -3273,6 +4122,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3282,23 +4132,28 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #b50909; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #c14531; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -3311,10 +4166,13 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3324,19 +4182,25 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, -a.badge:hover { +a.label:focus, +a.badge:hover, +a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; @@ -3381,9 +4245,18 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; } to { background-position: 0 0; @@ -3423,17 +4296,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', 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); @@ -3443,41 +4315,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', 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); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3490,88 +4364,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -3596,7 +4470,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -3604,47 +4478,47 @@ a.badge:hover { width: 100%; position: relative; } -.carousel .item { +.carousel-inner > .item { display: none; position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > 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%; } .carousel-control { @@ -3671,28 +4545,62 @@ a.badge:hover { left: auto; right: 15px; } -.carousel-control:hover { +.carousel-control:hover, +.carousel-control:focus { color: #ffffff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} +.carousel-indicators .active { + background-color: #fff; +} .carousel-caption { position: absolute; left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .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; @@ -3705,1500 +4613,2030 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; +.hero-unit li { + line-height: 30px; } -.hide { +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; } -.show { - display: block; +.popover.top { + margin-top: -10px; } -.invisible { - visibility: hidden; +.popover.right { + margin-left: 10px; } -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot'); - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; +.popover.bottom { + margin-top: 10px; } -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: FontAwesome; +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; +.popover-title:empty { + display: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: middle; - font-size: 1.3333333333333333em; +.popover-content { + padding: 9px 14px; } -.btn [class^="icon-"], -.nav-tabs [class^="icon-"], -.btn [class*=" icon-"], -.nav-tabs [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -li [class^="icon-"], -li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.popover .arrow { + border-width: 11px; } -li .icon-large:before, -li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; +.popover .arrow:after { + border-width: 10px; + content: ""; } -ul.icons { - list-style-type: none; - margin-left: 2em; - text-indent: -0.8em; +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .8em; +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); } -ul.icons li .icon-large:before, -ul.icons li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - vertical-align: initial; +.popover.right .arrow:after { + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } -.icon-music:before { - content: "\f001"; +.popover.bottom .arrow:after { + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; } -.icon-search:before { - content: "\f002"; +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); } -.icon-envelope:before { - content: "\f003"; +.popover.left .arrow:after { + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; } -.icon-heart:before { - content: "\f004"; +.pull-right { + float: right; } -.icon-star:before { - content: "\f005"; +.pull-left { + float: left; } -.icon-star-empty:before { - content: "\f006"; +.hide { + display: none; } -.icon-user:before { - content: "\f007"; +.show { + display: block; } -.icon-film:before { - content: "\f008"; +.invisible { + visibility: hidden; } -.icon-th-large:before { - content: "\f009"; +.affix { + position: fixed; } -.icon-th:before { - content: "\f00a"; +.tag { + display: inline-block; + margin-bottom: 4px; + color: #111111; + background-color: #f6f6f6; + padding: 1px 10px; + border: 1px solid #dddddd; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.icon-th-list:before { - content: "\f00b"; +a.tag:hover { + text-decoration: none; + color: #fff; + background-color: #d36452; + border: 1px solid #c14531; + -webkit-box-shadow: inset 0 1px 0 #dd887b; + -moz-box-shadow: inset 0 1px 0 #dd887b; + box-shadow: inset 0 1px 0 #dd887b; } -.icon-ok:before { - content: "\f00c"; +.pill { + display: inline-block; + background-color: #6f8890; + color: #ffffff; + padding: 2px 10px 1px 10px; + margin-right: 5px; + font-weight: normal; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-remove:before { - content: "\f00d"; +.pill a { + color: #ffffff; } -.icon-zoom-in:before { - content: "\f00e"; +.pill a.remove { + font-size: 11px; } -.icon-zoom-out:before { - content: "\f010"; +.unstyled { + margin: 0; + list-style: none; } -.icon-off:before { - content: "\f011"; +.simple-item { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-signal:before { - content: "\f012"; +.simple-item:last-of-type { + border-bottom: 0; } -.icon-cog:before { - content: "\f013"; +.simple-list { + *zoom: 1; + margin: 0; + list-style: none; } -.icon-trash:before { - content: "\f014"; +.simple-list:before, +.simple-list:after { + display: table; + content: ""; + line-height: 0; } -.icon-home:before { - content: "\f015"; +.simple-list:after { + clear: both; } -.icon-file:before { - content: "\f016"; +.simple-list > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-time:before { - content: "\f017"; +.simple-list > li:last-of-type { + border-bottom: 0; } -.icon-road:before { - content: "\f018"; +.simple-list .ckan-icon { + position: relative; + top: 0px; } -.icon-download-alt:before { - content: "\f019"; +.module-narrow .simple-list > li { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-download:before { - content: "\f01a"; +.listing li { + text-align: right; + margin-bottom: 5px; } -.icon-upload:before { - content: "\f01b"; +.listing .key { + clear: right; + font-weight: bold; } -.icon-inbox:before { - content: "\f01c"; +.js .tab-content { + display: none; } -.icon-play-circle:before { - content: "\f01d"; +.js .tab-content.active { + display: block; } -.icon-repeat:before { - content: "\f01e"; +.box { + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); } -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; +.module { + margin: 20px 0; } -.icon-list-alt:before { - content: "\f022"; +.module-heading { + *zoom: 1; + margin: 0; + padding: 7px 25px; + font-size: 14px; + line-height: 1.3; + background-color: #f6f6f6; + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } -.icon-lock:before { - content: "\f023"; +.module-heading:before, +.module-heading:after { + display: table; + content: ""; + line-height: 0; } -.icon-flag:before { - content: "\f024"; +.module-heading:after { + clear: both; } -.icon-headphones:before { - content: "\f025"; +.module-heading .action { + float: right; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; } -.icon-volume-off:before { - content: "\f026"; +.module-heading .action:hover { + color: #444444; } -.icon-volume-down:before { - content: "\f027"; +.module-content { + padding: 0 25px; + margin: 20px 0; } -.icon-volume-up:before { - content: "\f028"; +.module-content:first-child { + margin-top: 0; + padding-top: 20px; } -.icon-qrcode:before { - content: "\f029"; +.module-content:last-child { + margin-bottom: 0; + padding-bottom: 20px; } -.icon-barcode:before { - content: "\f02a"; +.module-content > :last-child { + margin-bottom: 0; } -.icon-tag:before { - content: "\f02b"; +.module:first-child .module-heading { + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; + border-top-width: 0; } -.icon-tags:before { - content: "\f02c"; +.module:last-child { + margin-bottom: 20px; } -.icon-book:before { - content: "\f02d"; +.module-footer { + padding: 7px 25px 7px; + margin: 0; + border-top: 1px dotted #dddddd; } -.icon-bookmark:before { - content: "\f02e"; +.module .read-more { + font-weight: bold; + color: #000000; } -.icon-print:before { - content: "\f02f"; +.module .pagination { + height: 34px; + margin-bottom: 0; + border-top: 1px solid #dddddd; } -.icon-camera:before { - content: "\f030"; +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; } -.icon-font:before { - content: "\f031"; +.module .pagination > ul { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: 0; } -.icon-bold:before { - content: "\f032"; +.module .pagination li a { + border-top: none; + border-bottom: none; + padding-top: 7px; + padding-bottom: 7px; } -.icon-italic:before { - content: "\f033"; +.module .pagination li:first-child a, +.module .pagination li:last-child a { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.icon-text-height:before { - content: "\f034"; +.module .pagination li:first-child a { + border-left-width: 0; } -.icon-text-width:before { - content: "\f035"; +.module .pagination li:last-child a { + border-right-width: 0; } -.icon-align-left:before { - content: "\f036"; +.module .pagination li.active a { + border-left-width: 1px; + border-right-width: 1px; } -.icon-align-center:before { - content: "\f037"; +.module-content-shallow { + padding: 0; + margin-top: 10px; + padding-bottom: 10px; } -.icon-align-right:before { - content: "\f038"; +.module h1 { + margin-bottom: 20px; } -.icon-align-justify:before { - content: "\f039"; +.module-shallow .module-content { + padding: 10px; + margin: 0; } -.icon-list:before { - content: "\f03a"; +.module-shallow .module-tags { + margin-top: 0; + margin-bottom: 0; } -.icon-indent-left:before { - content: "\f03b"; +.module-shallow .module-content:first-child { + padding-top: 10px; } -.icon-indent-right:before { - content: "\f03c"; +.module-shallow .module-content:last-child { + padding-bottom: 10px; } -.icon-facetime-video:before { - content: "\f03d"; +.module-narrow .module-heading, +.module-narrow .module-content, +.module-narrow .module-footer { + padding-left: 15px; + padding-right: 15px; } -.icon-picture:before { - content: "\f03e"; +.module-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-pencil:before { - content: "\f040"; +.module-grid:before, +.module-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-map-marker:before { - content: "\f041"; +.module-grid:after { + clear: both; } -.icon-adjust:before { - content: "\f042"; +.module-item { + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + float: left; + margin-left: 20px; + width: 460px; + padding-top: 10px; + padding-bottom: 10px; + padding-right: 50px; + overflow: hidden; + position: relative; } -.icon-tint:before { - content: "\f043"; +.module-item span.count { + color: #999; } -.icon-edit:before { - content: "\f044"; +.module-item .media-image { + margin-bottom: 5px; } -.icon-share:before { - content: "\f045"; +.module-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-check:before { - content: "\f046"; +.module-item:hover { + z-index: 1; } -.icon-move:before { - content: "\f047"; +.module-item:hover .media-edit { + opacity: 1; } -.icon-step-backward:before { - content: "\f048"; +.module-item.first { + clear: left; } -.icon-fast-backward:before { - content: "\f049"; +.group .content img { + margin: 0 -5px 5px; + max-width: initial; } -.icon-backward:before { - content: "\f04a"; +.group .content h3 { + font-size: 14px; + line-height: 1.3; } -.icon-play:before { - content: "\f04b"; +.group-listing { + margin-left: -20px; } -.icon-pause:before { - content: "\f04c"; +.ckanext-datapreview { + position: relative; } -.icon-stop:before { - content: "\f04d"; +.ckanext-datapreview > iframe { + min-height: 400px; } -.icon-forward:before { - content: "\f04e"; +.ckanext-datapreview > img { + max-height: 500px; + max-width: 100%; + overflow: hidden; } -.icon-fast-forward:before { - content: "\f050"; +.package-info h4 { + margin-bottom: 10px; } -.icon-step-forward:before { - content: "\f051"; +.module-resource { + background-color: #ffffff; + border-bottom: 1px solid #dddddd; + margin-top: 0; + margin-bottom: 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.icon-eject:before { - content: "\f052"; +.module-resource .actions { + position: relative; + float: right; + top: -10px; + right: -15px; } -.icon-chevron-left:before { - content: "\f053"; +.module .module-tags { + padding-bottom: 8px; } -.icon-chevron-right:before { - content: "\f054"; +.secondary .module:first-child, +.primary .module:first-child { + margin-top: 0; } -.icon-plus-sign:before { - content: "\f055"; +.no-nav .module:last-child { + margin-top: 0; } -.icon-minus-sign:before { - content: "\f056"; +.module-image { + float: left; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + margin-right: 15px; } -.icon-remove-sign:before { - content: "\f057"; +.module-image img { + max-width: 50px; + max-height: 50px; + vertical-align: middle; } -.icon-ok-sign:before { - content: "\f058"; +.banner { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center; + position: absolute; + top: 15px; + right: -35px; + width: 80px; + color: #ffffff; + background-color: #c14531; + padding: 1px 20px; + font-size: 11px; + text-align: center; + text-transform: uppercase; } -.icon-question-sign:before { - content: "\f059"; +.media-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-info-sign:before { - content: "\f05a"; +.media-grid:before, +.media-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-screenshot:before { - content: "\f05b"; +.media-grid:after { + clear: both; } -.icon-remove-circle:before { - content: "\f05c"; +.media-item { + position: relative; + float: left; + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-ok-circle:before { - content: "\f05d"; +.media-item span.count { + color: #999; } -.icon-ban-circle:before { - content: "\f05e"; +.media-item .media-image { + margin-bottom: 5px; } -.icon-arrow-left:before { - content: "\f060"; +.media-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-arrow-right:before { - content: "\f061"; +.media-item:hover { + z-index: 1; } -.icon-arrow-up:before { - content: "\f062"; +.media-item:hover .media-edit { + opacity: 1; } -.icon-arrow-down:before { - content: "\f063"; +.media-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 1px solid #dddddd; + overflow: hidden; + -webkit-transition: all 0.2s ease-in; + -moz-transition: all 0.2s ease-in; + -o-transition: all 0.2s ease-in; + transition: all 0.2s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-share-alt:before { - content: "\f064"; +.media-view:hover, +.media-view.hovered { + border-color: #c14531; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); } -.icon-resize-full:before { - content: "\f065"; +.media-view:hover .banner, +.media-view.hovered .banner { + background-color: #c14531; } -.icon-resize-small:before { - content: "\f066"; +.media-view span { + display: none; } -.icon-plus:before { - content: "\f067"; +.media-view .banner { + display: block; + background-color: #b7b7b7; + -webkit-transition: background-color 0.2s ease-in; + -moz-transition: background-color 0.2s ease-in; + -o-transition: background-color 0.2s ease-in; + transition: background-color 0.2s ease-in; } -.icon-minus:before { - content: "\f068"; +.media-image { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.icon-asterisk:before { - content: "\f069"; +.media-heading { + font-size: 18px; + line-height: 1.3; + margin: 5px 0; } -.icon-exclamation-sign:before { - content: "\f06a"; +.media-overlay { + position: relative; + min-height: 35px; } -.icon-gift:before { - content: "\f06b"; +.media-overlay .media-heading { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 12px 10px; + margin: 0; + background-color: #000; + background-color: rgba(0, 0, 0, 0.8); + font-size: 13px; + color: #fff; + z-index: 1; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -.icon-leaf:before { - content: "\f06c"; +.media-overlay .media-image { + float: none; + display: block; + margin-right: 0; } -.icon-fire:before { - content: "\f06d"; +.media-item.is-expander .truncator-link { + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; + position: absolute; + z-index: 10; + left: 15px; + bottom: 15px; + opacity: 0; } -.icon-eye-open:before { - content: "\f06e"; +.media-item.is-expander:hover { + padding-bottom: 35px; } -.icon-eye-close:before { - content: "\f070"; +.media-item.is-expander:hover .truncator-link { + opacity: 1; } -.icon-warning-sign:before { - content: "\f071"; +.wide .media-item { + width: 186px; } -.icon-plane:before { - content: "\f072"; +.nav-simple, +.nav-aside { + *zoom: 1; + margin: 0; + list-style: none; + padding-bottom: 0; } -.icon-calendar:before { - content: "\f073"; +.nav-simple:before, +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { + display: table; + content: ""; + line-height: 0; } -.icon-random:before { - content: "\f074"; +.nav-simple:after, +.nav-aside:after { + clear: both; } -.icon-comment:before { - content: "\f075"; +.nav-simple > li, +.nav-aside > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-magnet:before { - content: "\f076"; +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { + border-bottom: 0; } -.icon-chevron-up:before { - content: "\f077"; +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { + position: relative; + top: 0px; } -.icon-chevron-down:before { - content: "\f078"; +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; } -.icon-retweet:before { - content: "\f079"; +.nav-item > a, +.nav-aside li a { + color: #333333; + font-size: 14px; + line-height: 20px; + margin: -7px -25px; + padding: 7px 25px; } -.icon-shopping-cart:before { - content: "\f07a"; +.nav-item.active, +.nav-aside li.active { + background-color: #f6f6f6; } -.icon-folder-close:before { - content: "\f07b"; +.nav-item.active > a, +.nav-aside li.active a { + position: relative; + color: #ffffff; + background-color: #8ca0a6; } -.icon-folder-open:before { - content: "\f07c"; +.nav-item.active > a:hover, +.nav-aside li.active a:hover { + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-vertical:before { - content: "\f07d"; +.nav-item.active > a:before, +.nav-aside li.active a:before { + content: ' '; + position: absolute; + top: 0; + right: -6px; + width: 6px; + height: 34px; + background-image: url("../../../base/images/nav-active.png?1"); } -.icon-resize-horizontal:before { - content: "\f07e"; +.nav-item.active > a span, +.nav-aside li.active a span { + white-space: nowrap; + overflow: hidden; + display: block; } -.icon-bar-chart:before { - content: "\f080"; +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-twitter-sign:before { - content: "\f081"; +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { + position: relative; } -.icon-facebook-sign:before { - content: "\f082"; +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { + padding-left: 42px; + padding-right: 42px; } -.icon-camera-retro:before { - content: "\f083"; +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { + position: absolute; + top: 50%; + left: 15px; + width: 20px; + height: 20px; + margin-top: -10px; + z-index: 2; } -.icon-key:before { - content: "\f084"; +.nav-facet .nav-item > a:hover:after, +.nav-facet .nav-item.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-cogs:before { - content: "\f085"; +.nav-facet .nav-item > a:hover:after { + width: 17px; + height: 17px; + background-position: -17px -16px; } -.icon-comments:before { - content: "\f086"; +.nav-facet .nav-item.active > a:after { + width: 17px; + height: 17px; + background-position: 0px -16px; + right: 3px; } -.icon-thumbs-up:before { - content: "\f087"; +.user-list { + margin: 0; + list-style: none; } -.icon-thumbs-down:before { - content: "\f088"; +.user-list li { + margin: 0 0 10px 0; } -.icon-star-half:before { - content: "\f089"; +.user-list .gravatar { + vertical-align: -4px; + margin-right: 3px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-heart-empty:before { - content: "\f08a"; +.nav-facet-tertiary { + margin: 10px 0; } -.icon-signout:before { - content: "\f08b"; +.nav-facet-tertiary .module-heading { + margin-bottom: 5px; + padding: 8px 12px; + border-bottom-width: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.icon-linkedin-sign:before { - content: "\f08c"; +.nav-facet-tertiary .module-heading i { + display: none; } -.icon-pushpin:before { - content: "\f08d"; +.nav-facet-tertiary .module-footer { + padding: 8px 12px; + border-top-width: 0; } -.icon-external-link:before { - content: "\f08e"; +.nav-facet-tertiary .module-footer a { + font-weight: normal; + color: #8C8C8C; } -.icon-signin:before { - content: "\f090"; +.nav-facet-tertiary .nav { + margin-bottom: 0; } -.icon-trophy:before { - content: "\f091"; +.nav-facet-tertiary .module-content.empty { + padding: 8px 12px; + margin-top: 0; } -.icon-github-sign:before { - content: "\f092"; +.nav-facet-tertiary .nav li.active { + position: relative; } -.icon-upload-alt:before { - content: "\f093"; +.nav-facet-tertiary .nav li.active > a:hover:after, +.nav-facet-tertiary .nav li.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 17px; + height: 17px; + background-position: 0px -16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-lemon:before { - content: "\f094"; +.nav-simple > .nav-btn { + padding-left: 0; + padding-right: 0; + text-align: center; } -.icon-phone:before { - content: "\f095"; +.nav-simple > .nav-btn .btn { + display: inline-block; } -.icon-check-empty:before { - content: "\f096"; +.js .js-hide { + display: none; } -.icon-bookmark-empty:before { - content: "\f097"; +.js .js-hide.active { + display: block; } -.icon-phone-sign:before { - content: "\f098"; +.btn, +label { + font-weight: bold; } -.icon-twitter:before { - content: "\f099"; +.btn-rounded { + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + padding-left: 15px; + padding-right: 15px; } -.icon-facebook:before { - content: "\f09a"; +label { + cursor: pointer; + font-size: 14px; } -.icon-github:before { - content: "\f09b"; +label:after { + content: ":"; } -.icon-unlock:before { - content: "\f09c"; +label.radio:after, +label.checkbox:after { + content: ""; } -.icon-credit-card:before { - content: "\f09d"; +input[type=radio], +input[type=checkbox] { + position: relative; + top: 7px; + padding: 0; + margin: 0; } -.icon-rss:before { - content: "\f09e"; +input[type=radio].checkbox-onown, +input[type=checkbox].checkbox-onown { + top: 0; } -.icon-hdd:before { - content: "\f0a0"; +select { + padding: 4px; } -.icon-bullhorn:before { - content: "\f0a1"; +textarea { + max-width: 100%; } -.icon-bell:before { - content: "\f0a2"; +.control-group .btn { + position: relative; + top: -2px; } -.icon-certificate:before { - content: "\f0a3"; +.control-full input, +.control-full select, +.control-full textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: auto; + width: 100%; } -.icon-hand-right:before { - content: "\f0a4"; +.control-medium input, +.control-medium select, +.control-medium textarea { + width: 320px; } -.icon-hand-left:before { - content: "\f0a5"; +.control-large input, +.control-large .control-label { + font-size: 17.5px; + line-height: 30px; } -.icon-hand-up:before { - content: "\f0a6"; +.control-large input { + height: 41px; } -.icon-hand-down:before { - content: "\f0a7"; +.form-actions { + background: none; + margin-left: -25px; + margin-right: -25px; + margin-bottom: 0; + padding-bottom: 0; + text-align: right; } -.icon-circle-arrow-left:before { - content: "\f0a8"; +.form-actions .action-info { + float: left; + width: 50%; + line-height: 2; + text-align: left; + color: #707070; + margin: 0; } -.icon-circle-arrow-right:before { - content: "\f0a9"; +.form-actions .action-info.small { + font-size: 11px; + line-height: 1.2; } -.icon-circle-arrow-up:before { - content: "\f0aa"; +.form-horizontal .control-label { + width: 120px; } -.icon-circle-arrow-down:before { - content: "\f0ab"; +.form-horizontal .controls { + margin-left: 130px; } -.icon-globe:before { - content: "\f0ac"; +.form-horizontal .info-block { + position: relative; + display: block; + font-size: 11px; + color: #aaaaaa; + line-height: 1.3; + padding: 6px 0 6px 25px; + margin-top: 6px; } -.icon-wrench:before { - content: "\f0ad"; +.form-horizontal .info-help { + padding: 6px 0; } -.icon-tasks:before { - content: "\f0ae"; +.form-horizontal .info-help:before { + display: none; } -.icon-filter:before { - content: "\f0b0"; +.form-horizontal .info-help-tight { + margin-top: -10px; } -.icon-briefcase:before { - content: "\f0b1"; +.form-horizontal .info-inline { + float: right; + width: 265px; + margin-top: 0; + padding-bottom: 0; } -.icon-fullscreen:before { - content: "\f0b2"; +.form-horizontal .control-medium .info-block.info-inline { + width: 165px; } -.icon-group:before { - content: "\f0c0"; +.form-horizontal .info-block:before { + font-size: 2.2em; + position: absolute; + left: 0; + top: 2px; } -.icon-link:before { - content: "\f0c1"; +.form-horizontal .info-inline:before { + top: 8px; } -.icon-cloud:before { - content: "\f0c2"; +.info-block .icon-large, +.info-inline .icon-large { + float: left; + font-size: 22px; + margin-right: 15px; } -.icon-beaker:before { - content: "\f0c3"; +.form-horizontal .info-block a { + color: #aaaaaa; + text-decoration: underline; } -.icon-cut:before { - content: "\f0c4"; +.form-horizontal .form-actions { + padding-left: 25px; + padding-right: 25px; } -.icon-copy:before { - content: "\f0c5"; +.form-inline input { + padding-bottom: 9px; } -.icon-paper-clip:before { - content: "\f0c6"; -} -.icon-save:before { - content: "\f0c7"; +.form-inline select { + margin-top: 0; } -.icon-sign-blank:before { - content: "\f0c8"; +.form-inline .btn { + margin-left: 5px; } -.icon-reorder:before { - content: "\f0c9"; +.form-narrow label { + margin-bottom: 0; } -.icon-list-ul:before { - content: "\f0ca"; +.form-narrow select { + width: 100%; } -.icon-list-ol:before { - content: "\f0cb"; +.form-narrow .form-actions { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px 0; } -.icon-strikethrough:before { - content: "\f0cc"; +.form-select label { + margin-right: 5px; } -.icon-underline:before { - content: "\f0cd"; +.simple-input label, +.simple-input button { + display: none; } -.icon-table:before { - content: "\f0ce"; +.simple-input .field { + position: relative; } -.icon-magic:before { - content: "\f0d0"; +.simple-input .field-bordered { + border-bottom: 1px dotted #dddddd; } -.icon-truck:before { - content: "\f0d1"; +.simple-input .field input { + width: 100%; + height: auto; + margin: 0 -7px; + padding: 7px 5px; } -.icon-pinterest:before { - content: "\f0d2"; +.simple-input .field .btn-search { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + background-position: -51px -16px; + position: absolute; + display: block; + height: 17px; + width: 17px; + top: 50%; + right: 0; + margin-top: -8px; + background-color: transparent; + border: none; + text-indent: -999em; } -.icon-pinterest-sign:before { - content: "\f0d3"; +.editor textarea { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: none; } -.icon-google-plus-sign:before { - content: "\f0d4"; +.editor .editor-info-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + float: none; + padding: 4px 10px; + background: #ebebeb; + width: auto; + border: 1px solid #cccccc; + border-top: none; + font-size: 11px; + color: #282828; } -.icon-google-plus:before { - content: "\f0d5"; +.editor .editor-info-block a { + color: #c14531; + text-decoration: none; } -.icon-money:before { - content: "\f0d6"; +.control-custom { + font-size: 0; } -.icon-caret-down:before { - content: "\f0d7"; +.control-custom label { + margin-bottom: 0; } -.icon-caret-up:before { - content: "\f0d8"; +.control-custom input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + width: 140px; } -.icon-caret-left:before { - content: "\f0d9"; +.control-custom input:last-of-type { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } -.icon-caret-right:before { - content: "\f0da"; +.control-custom .checkbox { + display: inline-block; + margin-left: 5px; } -.icon-columns:before { - content: "\f0db"; +.control-custom .checkbox input { + width: auto; } -.icon-sort:before { - content: "\f0dc"; +.control-custom.disabled label, +.control-custom.disabled input { + color: #aaaaaa; + text-decoration: line-through; + text-shadow: none; } -.icon-sort-down:before { - content: "\f0dd"; +.control-custom.disabled input { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f3f3f3; } -.icon-sort-up:before { - content: "\f0de"; +.control-custom.disabled .checkbox { + color: #444444; + text-decoration: none; } -.icon-envelope-alt:before { - content: "\f0e0"; +.control-custom .checkbox.btn { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + position: relative; + top: 0; + left: 5px; + height: 1px; + width: 9px; + padding: 3px 8px; + line-height: 18px; } -.icon-linkedin:before { - content: "\f0e1"; +.control-custom .checkbox.btn span { + display: none; + width: 30px; } -.icon-undo:before { - content: "\f0e2"; +.control-custom .checkbox.btn:before { + position: relative; + top: 1px; + left: -1px; + color: #fff; } -.icon-legal:before { - content: "\f0e3"; +.control-custom .checkbox.btn input { + display: none; } -.icon-dashboard:before { - content: "\f0e4"; +.control-custom.disabled .checkbox.btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #cc5845; + background-image: -moz-linear-gradient(top, #d36452, #c14531); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d36452), to(#c14531)); + background-image: -webkit-linear-gradient(top, #d36452, #c14531); + background-image: -o-linear-gradient(top, #d36452, #c14531); + background-image: linear-gradient(to bottom, #d36452, #c14531); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd36452', endColorstr='#ffc14531', GradientType=0); + border-color: #c14531 #c14531 #842f22; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #c14531; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.icon-comment-alt:before { - content: "\f0e5"; +.control-custom.disabled .checkbox.btn:hover, +.control-custom.disabled .checkbox.btn:focus, +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active, +.control-custom.disabled .checkbox.btn.disabled, +.control-custom.disabled .checkbox.btn[disabled] { + color: #ffffff; + background-color: #c14531; + *background-color: #ad3e2c; } -.icon-comments-alt:before { - content: "\f0e6"; +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active { + background-color: #983627 \9; } -.icon-bolt:before { - content: "\f0e7"; +.control-custom.disabled .checkbox.btn .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.icon-sitemap:before { - content: "\f0e8"; +.alert-danger a, +.alert-error a { + color: #b55457; } -.icon-umbrella:before { - content: "\f0e9"; +.control-group.error input, +.control-group.error select, +.control-group.error textarea, +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { + border-color: #c6898b; } -.icon-paste:before { - content: "\f0ea"; +.error-inline { + color: #b55457; } -.icon-user-md:before { - content: "\f200"; +.error-block, +.error-inline { + font-size: 12px; } -.pill { - background-color: #cccccc; +.error-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + padding: 6px 8px 3px; + background: #c6898b; + margin: -3px 0 0; color: #ffffff; - padding: 1px 5px 1px 8px; - margin-right: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + width: 208px; } -.pill a { - color: #ffffff; +.control-medium .error-block { + width: 318px; } -.pill a.remove { - font-size: 11px; +.control-full .error-block { + width: auto; } -.tag { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; - position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #b50909; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; +.control-group.error .input-prepend .error-block, +.control-custom.error .error-block { + width: auto; } -.tag:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; +.control-custom.error .error-block { + width: 401px; } -.unstyled { - margin: 0; - list-style: none; -} -.simple-item { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; -} -.simple-item:last-of-type { - border-bottom: 0; +.control-select.error .error-block { + width: 196px; } -.simple-list { - *zoom: 1; +.stages { margin: 0; list-style: none; + *zoom: 1; + color: #aeaeae; + counter-reset: stage; + margin: -20px -25px 20px; + overflow: hidden; } -.simple-list:before, -.simple-list:after { +.stages:before, +.stages:after { display: table; content: ""; + line-height: 0; } -.simple-list:after { +.stages:after { clear: both; } -.simple-list > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.stages li { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 27px; + counter-increment: stage; + width: 33.33%; + background-color: #ededed; + float: left; + padding: 10px 20px; + position: relative; + z-index: 0; } -.simple-list > li:last-of-type { - border-bottom: 0; +.stages li:before { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + content: counter(stage); + display: inline-block; + width: 27px; + height: 27px; + margin-right: 5px; + font-weight: bold; + text-align: center; + color: #ffffff; + background-color: #aeaeae; + z-index: 1; } -.simple-list .ckan-icon { - position: relative; - top: 0px; +.stages li:after { + left: 0; + border: solid rgba(237, 237, 237, 0); + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: #ededed; + border-bottom-color: #ededed; + border-width: 29px; + top: 50%; + margin-top: -29px; + margin-left: -30px; } -.module-narrow .simple-list > li { - padding-left: 15px; - padding-right: 15px; +.stages li.last { position: relative; + right: -1px; } -.listing li { - text-align: right; - margin-bottom: 5px; -} -.listing .key { - clear: right; - font-weight: bold; +.stages li.last, +.stages li.last .highlight { + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; } -.js .tab-content { - display: none; +.stages li.first:after { + content: none; + border: none; } -.js .tab-content.active { - display: block; +.stages li.active:after { + border-color: rgba(140, 198, 138, 0); + border-top-color: #8cc68a; + border-bottom-color: #8cc68a; } -.module { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - background-color: #ffffff; - margin-bottom: 20px; +.stages li.complete:after { + border-color: rgba(197, 226, 196, 0); + border-top-color: #c5e2c4; + border-bottom-color: #c5e2c4; } -.module-heading { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - font-size: 14px; - line-height: 1.3; - padding: 7px 25px; - border-bottom: 1px solid #d0d0d0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.stages.stage-3 li.complete:first-child:after { + content: none; } -.module-heading-secondary { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border-top: 1px solid #d0d0d0; +.stages li.active, +.stages li.complete { + background: none; } -.module-heading [class^=icon]:before { - font-size: 1.2em; - line-height: 1; - position: relative; - top: 1px; - margin-right: 0.1em; +.stages li.active:before { + color: #8cc68a; + background: #ffffff; } -.module-heading .action { - float: right; - color: #8c8c8c; - font-size: 11px; - text-decoration: underline; +.stages li.complete:before { + color: #c5e2c4; + background: #eef6ed; } -.module-content { - padding: 0 25px; - margin: 20px 0; +.stages li .highlight { + display: block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + padding: 10px 52px; + border: none; + text-align: left; + text-decoration: none; + line-height: 27px; + z-index: -1; } -.module-content:first-child { - margin-top: 0; - padding-top: 20px; +.stages li.active .highlight { + color: #ffffff; + background: #8cc68a; } -.module-content:last-child { - margin-bottom: 0; - padding-bottom: 20px; +.stages li.complete .highlight { + color: #eef6ed; + background: #c5e2c4; } -.module-content > :last-child { +.alert > :last-child { margin-bottom: 0; } -.module-border-top { - border-top: 1px dotted #cccccc; +.slug-preview { + font-size: 14px; + line-height: 1.5; + margin-top: 5px; + margin-left: 10px; } -.module-border-bottom { - border-bottom: 1px dotted #cccccc; +.slug-preview-value { + background-color: #faedcf; + margin-right: 3px; } -.module-footer { - padding: 7px 25px 7px; - border-top: 1px dotted #cccccc; +.resource-upload-field { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: bottom; } -.module .read-more { - font-weight: bold; - color: #000000; +.resource-upload-field label { + z-index: 0; } -.module .pagination { - height: 34px; - margin-bottom: 0; - border-top: 1px solid #d0d0d0; +.resource-upload-field input { + opacity: 0; + filter: alpha(opacity=0); + position: absolute; + top: 0; + right: 0; + z-index: 1; + margin: 0; + border: solid transparent; + border-width: 100px 0 0 200px; + cursor: pointer; + direction: ltr; + -moz-transform: translate(-300px, 0) scale(4); } -.module .pagination > ul { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0; +.resource-upload-field.loading { + display: inline-block; + background: url("../../../base/images/loading-spinner.gif") no-repeat center right; + padding-right: 5px; } -.module .pagination li a { - border-top: none; - border-bottom: none; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + font-size: 14px; } -.module .pagination li:first-child a, -.module .pagination li:last-child a { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.select2-container-multi .select2-choices .select2-search-field input { + height: 29px; } -.module .pagination li:first-child a { - border-left-width: 0; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + padding-left: 10px; } -.module .pagination li:last-child a { - border-right-width: 0; +.select2-container { + margin-top: 1px; } -.module .pagination li.active a { - border-left-width: 1px; - border-right-width: 1px; +.select2-container-multi { + margin-top: 0; } -.module .action { - text-align: center; +.select2-container-multi .select2-choices .select2-search-choice { + padding: 5px 8px 5px 22px; } -.module-shallow .module-content { - padding: 10px; - margin: 0; +.select2-container-multi.select2-container .select2-choices { + padding-top: 3px; + padding-bottom: 3px; } -.module-shallow .module-content:first-child { - padding-top: 10px; -} -.module-shallow .module-content:last-child { - padding-bottom: 10px; +.select2-search-choice-close, +.select2-container-multi .select2-search-choice-close { + top: 6px; + left: 5px; } -.module-shallow small { - font-size: 11px; - display: block; +.select2-container-multi .select2-choices { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -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); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; } -.module-narrow .module-heading, -.module-narrow .module-content, -.module-narrow .module-footer { - padding-left: 15px; - padding-right: 15px; +.select2-container-active .select2-choices, +.select2-container-multi.select2-container-active .select2-choices { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -.module-grid { - margin: 0; - list-style: none; - margin: 0; - list-style: none; - *zoom: 1; - margin-left: -20px; - padding: 0; +.select2-container-multi .select2-drop { + margin-top: -2px; } -.module-grid:before, -.module-grid:after { - display: table; - content: ""; +.select2-container .select2-results li { + line-height: 18px; + padding-top: 4px; + padding-bottom: 4px; } -.module-grid:after { - clear: both; +.control-full .select2-container { + width: 520px !important; } -.module-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; - float: left; - margin-left: 20px; - width: 460px; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 50px; - overflow: hidden; - position: relative; +.control-group.error .select2-container input:focus, +.control-group.error .select2-container select:focus, +.control-group.error .select2-container textarea:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.module-item.first { - clear: left; +.dataset-item { + border-bottom: 1px dotted #dddddd; + padding-bottom: 20px; + margin-bottom: 20px; } -.group .content img { - margin: 0 -5px 5px; - max-width: initial; +.dataset-item:last-of-type { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } -.group .content h3 { - font-size: 14px; +.dataset-heading { + font-size: 16px; + margin-top: 0; + margin-bottom: 8px; line-height: 1.3; } -.group-listing { - margin-left: -20px; +.dataset-heading a { + color: #333333; } -.ckanext-datapreview { +.dataset-heading .label { position: relative; + top: -1px; } -.ckanext-datapreview > iframe { - min-height: 400px; -} -.ckanext-datapreview > img { - max-height: 500px; - max-width: 100%; - overflow: hidden; +.dataset-private { + margin-right: 10px; + text-transform: uppercase; } -.package-info h4 { - margin-bottom: 10px; +.dataset-private .icon-lock { + width: 9px; } -.media { - position: relative; - overflow: hidden; +.dataset-private.pull-right { + margin-right: 0; } -.media-content > :last-child { - margin-bottom: 0; +.dataset-resources { + margin-top: 8px; } -.media-heading { - font-size: 14px; - line-height: 1.3em; - margin: 5px 0; +.dataset-resources li { + display: inline; } -.media-image, -.media .gravatar { - position: relative; - float: left; - margin-right: 10px; - overflow: hidden; +.dataset-resources li a { + background-color: #aaaaaa; } -.media-image:after { - -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - content: ""; - position: absolute; +.dataset-heading .popular { top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1; } -.media-image img { - display: block; - margin: 0 auto; -} -.media-vertical .media-image, -.media-vertical .media-content { - float: none; - display: block; -} -.media-vertical .media-image { - margin-right: 0; - max-height: 125px; -} -.media-grid, -ul.media-grid, -ol.media-grid { +.resource-list { margin: 0; list-style: none; - *zoom: 1; - margin-left: -20px; + margin: -10px -10px 10px -10px; } -.media-grid:before, -ul.media-grid:before, -ol.media-grid:before, -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - display: table; - content: ""; +.resource-item { + position: relative; + padding: 10px 10px 10px 60px; + margin-bottom: 0px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - clear: both; +.resource-item:hover { + background-color: #eeeeee; } -.media-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; +.resource-item .heading { + color: #000000; + font-size: 14px; + font-weight: bold; } -.media-item.first { - clear: left; +.resource-item .format-label { + position: absolute; + top: 10px; + left: 10px; } -.media-item .media-content { - min-height: 63px; +.resource-item .description { + font-size: 12px; + margin-bottom: 0; } -.related-item.expanded { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #ffffff; - background-color: rgba(255, 255, 255, 0.9); - z-index: 2; +.resource-item .btn-group { + position: absolute; + top: 14px; + right: 10px; } -.media-wide { - padding: 0; +.dataset-resource-form .dataset-form-resource-types { + margin-bottom: 5px; } -.media-wide .media { - float: left; - margin-left: 20px; - width: 460px; +.dataset-form-resource-types .ckan-icon { + position: relative; + top: 3px; } -.media-overlay { +.dataset-form-resource-types .radio { + font-weight: normal; + padding-left: 0; + padding-right: 18px; +} +.dataset-form-resource-types label { position: relative; - min-height: 35px; } -.media-overlay .media-heading { +.dataset-form-resource-types input[type=radio]:checked + label { + font-weight: bold; +} +.dataset-form-resource-types input[type=radio]:checked + label:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 16px; + height: 16px; + background-position: -192px 0; + display: block; + content: ""; position: absolute; + top: auto; left: 0; - right: 0; - bottom: 0; - padding: 12px 10px; + bottom: -12px; +} +.dataset-form-resource-types input[type=radio] { + display: none; +} +.tag-list { margin: 0; - background-color: #000; - background-color: rgba(0, 0, 0, 0.8); - font-size: 13px; - color: #fff; - z-index: 1; + list-style: none; + padding: 10px 10px 5px 10px; } -.media-overlay .media-image { - float: none; - display: block; +.tag-list li { + display: inline-block; + margin-right: 5px; +} +.tag-list li:last-child { margin-right: 0; } -.banner { - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-transform-origin: center center; - -moz-transform-origin: center center; - -ms-transform-origin: center center; - -o-transform-origin: center center; - transform-origin: center center; - position: absolute; - top: 15px; - right: -35px; - width: 80px; - color: #ffffff; - background: #707070; - padding: 1px 20px; - font-size: 11px; - text-align: center; - text-transform: uppercase; +.additional-info td, +.additional-info th { + width: 50%; } -.nav-simple { - *zoom: 1; - margin: 0; - list-style: none; - padding-bottom: 0; +.label[data-format=html], +.label[data-format*=html] { + background-color: #55a1ce; } -.nav-simple:before, -.nav-simple:after { - display: table; - content: ""; +.label[data-format=json], +.label[data-format*=json] { + background-color: #ef7100; } -.nav-simple:after { - clear: both; +.label[data-format=xml], +.label[data-format*=xml] { + background-color: #ef7100; } -.nav-simple > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.label[data-format=text], +.label[data-format*=text] { + background-color: #74cbec; } -.nav-simple > li:last-of-type { - border-bottom: 0; +.label[data-format=csv], +.label[data-format*=csv] { + background-color: #dfb100; } -.nav-simple .ckan-icon { - position: relative; - top: 0px; +.label[data-format=xls], +.label[data-format*=xls] { + background-color: #2db55d; } -.nav-item > a { - color: #333333; - margin: -7px -25px; - padding: 7px 25px; +.label[data-format=zip], +.label[data-format*=zip] { + background-color: #686868; } -.nav-item.active { - background-color: #f2f2f2; +.label[data-format=api], +.label[data-format*=api] { + background-color: #ec96be; } -.nav-item.active > a span { - white-space: nowrap; - overflow: hidden; - display: block; +.label[data-format=pdf], +.label[data-format*=pdf] { + background-color: #e0051e; +} +.label[data-format=rdf], +.label[data-format*=rdf], +.label[data-format*=nquad], +.label[data-format*=ntriples], +.label[data-format*=turtle] { + background-color: #0b4498; } -.nav-item.active > a { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #b50909; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; + margin-bottom: 20px; +} +.search-form .search-input input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; - font-size: 12px; - font-weight: bold; - position: relative; - left: 4px; - margin-left: -25px; - margin-right: -20px; - padding-left: 10px; - padding-right: 0px; - padding: 1px 22px; + margin: 0; + width: 100%; + height: auto; } -.nav-item.active > a:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; +.search-form .search-input button { + cursor: pointer; display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; } -.nav-item [class^=icon] { - font-size: 1.2em; - margin: -1px 0 -1px -1px; +.search-form .search-input button span { + display: none; } -.module-narrow .nav-item > a { - padding-left: 15px; - padding-right: 15px; - position: relative; +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; } -.module-narrow .nav-item.active > a { - padding-left: 12px; - padding-right: 12px; +.search-form .search-input button:hover i { + color: #000000; } -.module-narrow .nav-item.image { - position: relative; +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; } -.module-narrow .nav-item.image > a { - padding-left: 42px; - padding-right: 42px; +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; } -.module-narrow .nav-item.image > img { - position: absolute; - top: 50%; - left: 15px; - width: 20px; - height: 20px; - margin-top: -10px; - z-index: 2; +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; } -.nav-facet .nav-item > a:hover:after, -.nav-facet .nav-item.active > a:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - content: ""; - position: absolute; - top: 50%; - right: 5px; - margin-top: -8px; +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; } -.nav-facet .nav-item > a:hover:after:last-child, -.nav-facet .nav-item.active > a:after:last-child { - *margin-left: 0; +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; } -.nav-facet .nav-item > a:hover:after { - width: 17px; - height: 17px; - background-position: -17px -16px; +.search-form .control-order-by select { + width: 160px; + margin: 0; } -.nav-facet .nav-item.active > a:after { - width: 17px; - height: 17px; - background-position: 0px -16px; - right: 3px; +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; } -.js .js-hide { - display: none; +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; } -.js .js-hide.active { +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { display: block; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; } -.btn, -label { - font-weight: bold; +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; } -label { - cursor: pointer; - font-size: 14px; - line-height: 2; +.tertiary .search-input { + margin-bottom: 10px; } -label:after { - content: ":"; +.group .media-vertical .image { + margin: 0 -5px 5px; } -label.radio:after, -label.checkbox:after { - content: ""; +.group-list:nth-child(odd) { + clear: left; } -input, -textarea, -select, -.uneditable-input { - font-size: 14px; - padding: 8px 10px; +.group-list .module-heading { + padding-top: 15px; + padding-bottom: 15px; } -input[type=radio], -input[type=checkbox] { - position: relative; - top: 7px; - padding: 0; - margin: 0; +.group-list .dataset-content { + min-height: 54px; } -input[type=radio].checkbox-onown, -input[type=checkbox].checkbox-onown { - top: 0; +.group-list .module-heading h3 { + margin-bottom: 2px; } -select { - margin-top: 6px; - padding: 4px; +.group-list .module-heading h3 a { + color: #333333; } -textarea { - max-width: 100%; +.group-list .module-heading .media-image { + overflow: hidden; + max-height: 60px; } -.input-prepend .add-on { - padding: 8px 8px; - font-size: 14px; +.group-list .module-heading .media-image img { + max-width: 85px; } -.control-group .btn { +.toolbar { + *zoom: 1; position: relative; - top: -2px; + margin-bottom: 10px; + padding: 5px 0; } -.control-full input, -.control-full select, -.control-full textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - height: auto; - width: 100%; +.toolbar:before, +.toolbar:after { + display: table; + content: ""; + line-height: 0; } -.control-medium input, -.control-medium select, -.control-medium textarea { - width: 320px; +.toolbar:after { + clear: both; } -.control-large input, -.control-large .control-label { - font-size: 18px; +.page_primary_action { + margin-bottom: 20px; } -.form-actions { - background: none; - margin-left: -25px; - margin-right: -25px; - margin-bottom: 0; - padding-bottom: 0; - text-align: right; -} -.form-actions .action-info { +.toolbar .breadcrumb { + *zoom: 1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + position: relative; float: left; - width: 50%; - line-height: 2; - text-align: left; - color: #707070; margin: 0; + padding: 0; + border: none; + background: none; + font-size: 20px; + line-height: 1.3; } -.form-actions .action-info.small { - font-size: 11px; - line-height: 1.2; +.toolbar .breadcrumb:before, +.toolbar .breadcrumb:after { + display: table; + content: ""; + line-height: 0; } -.form-horizontal .control-label { - width: 120px; - line-height: 1.3; - padding-top: 9px; +.toolbar .breadcrumb:after { + clear: both; } -.form-horizontal .control-large input, -.form-horizontal .control-large .control-label { - font-size: 18px; - line-height: 2; +.toolbar .breadcrumb li:after { + content: " / "; } -.form-horizontal .control-large .control-label { - padding-top: 10px; +.toolbar .breadcrumb li.active:after { + content: ""; } -.form-horizontal .controls { - margin-left: 130px; +.toolbar .breadcrumb li:last-of-type:after { + content: ""; } -.form-horizontal .info-block { - position: relative; - display: block; - font-size: 11px; - color: #aeaeae; - line-height: 1.3; - padding: 6px 0 6px 25px; - margin-top: 6px; +.toolbar .home a { + text-decoration: none; } -.form-horizontal .info-inline { - float: right; - width: 265px; - margin-top: 0; +.toolbar .home span { + display: none; } -.form-horizontal .control-medium .info-block.info-inline { - width: 165px; +.toolbar .breadcrumb a { + color: #505050; } -.form-horizontal .info-block:before { - font-size: 2.2em; +.toolbar .breadcrumb .active a, +.toolbar .breadcrumb a.active { + font-weight: bold; +} +.actions { + margin: 0; + list-style: none; position: absolute; - left: 0; - top: 2px; + top: 10px; + right: 10px; + z-index: 1; } -.form-horizontal .info-inline:before { - top: 8px; +.actions li { + display: inline-block; + margin-right: 5px; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } -.info-block .icon-large, -.info-inline .icon-large { +.actions li:last-of-type { + margin-right: 0; +} +.hide-heading { + display: none; +} +.page-header { + *zoom: 1; + border-bottom: 1px solid #dddddd; + background-color: #f6f6f6; + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; +} +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} +.page-header .nav-tabs { float: left; - font-size: 22px; - margin-right: 15px; + margin-bottom: -1px; } -.form-horizontal .info-block a { - color: #aeaeae; - text-decoration: underline; +.page-header .nav-tabs li.active a, +.page-header .nav-tabs a:hover { + background-color: #ffffff; } -.form-horizontal .form-actions { - padding-left: 25px; - padding-right: 25px; +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; } -.form-inline input { - padding-bottom: 9px; +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.form-inline select { - margin-top: 0; +h1 { + font-size: 28px; } -.form-inline .btn { - margin-left: 5px; +h2 { + font-size: 21px; } -.form-narrow label { - margin-bottom: 0; +h3 { + font-size: 18px; } -.form-narrow select { - width: 100%; +h4 { + font-size: 14px; } -.form-narrow .form-actions { - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px 0; +h1, +h2, +h3, +h4 { + line-height: 1.5; } -.form-select label { - margin-right: 5px; +h1 small, +h2 small, +h3 small, +h4 small { + font-size: 14px; } -.simple-input label, -.simple-input button { - display: none; +.prose h1, +.prose heading-1 h2, +.prose heading-2 { + margin-bottom: 15px; } -.simple-input .field { - position: relative; +.prose h3, +.prose heading-3 { + margin-bottom: 10px; } -.simple-input .field-bordered { - border-bottom: 1px dotted #cccccc; +.table-chunky td, +.table-chunky th { + padding: 12px 15px; + font-size: 12px; } -.simple-input .field input { - width: 100%; - height: auto; - margin: 0 -7px; - padding: 7px 5px; +.table-chunky thead th, +.table-chunky thead td { + color: #ffffff; + background-color: #aaaaaa; + padding-top: 10px; + padding-bottom: 10px; } -.simple-input .field .btn-search { +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { + background-color: transparent; +} +.table-striped tbody tr:nth-child(even) td, +.table-striped tbody tr:nth-child(even) th { + background-color: #f2f2f2; +} +.table-chunky.table-bordered { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topleft: 2px; + border-top-left-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topright: 2px; + border-top-right-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 2px; + -moz-border-radius: 0 0 0 2px; + border-radius: 0 0 0 2px; + -webkit-border-bottom-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + border-bottom-left-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + border-bottom-right-radius: 2px; +} +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.ckan-icon { *margin-right: .3em; display: inline-block; vertical-align: text-bottom; @@ -5209,1524 +6647,1336 @@ textarea { background-image: url("../../../base/images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; - width: 17px; - height: 17px; - background-position: -51px -16px; - position: absolute; - display: block; - height: 17px; - width: 17px; - top: 50%; - right: 0; - margin-top: -8px; - background-color: transparent; - border: none; - text-indent: -999em; } -.simple-input .field .btn-search:last-child { - *margin-left: 0; +.ckan-icon-fb { + width: 16px; + height: 16px; + background-position: 0px 0; } -.editor textarea { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: none; +.ckan-icon-gplus { + width: 16px; + height: 16px; + background-position: -16px 0; } -.editor .editor-info-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - float: none; - padding: 4px 10px; - background: #ebebeb; +.ckan-icon-twitter { + width: 16px; + height: 16px; + background-position: -32px 0; +} +.ckan-icon-email { + width: 16px; + height: 16px; + background-position: -48px 0; +} +.ckan-icon-share { + width: 16px; + height: 16px; + background-position: -64px 0; +} +.ckan-icon-feed { + width: 16px; + height: 16px; + background-position: -80px 0; +} +.ckan-icon-calendar { + width: 16px; + height: 16px; + background-position: -96px 0; +} +.ckan-icon-file { + width: 16px; + height: 16px; + background-position: -112px 0; +} +.ckan-icon-lock { + width: 16px; + height: 16px; + background-position: -128px 0; +} +.ckan-icon-link-file { + width: 16px; + height: 16px; + background-position: -144px 0; +} +.ckan-icon-link-plugin { + width: 16px; + height: 16px; + background-position: -160px 0; +} +.ckan-icon-upload-file { + width: 16px; + height: 16px; + background-position: -176px 0; +} +.ckan-icon-callout { + width: 16px; + height: 16px; + background-position: -192px 0; +} +.ckan-icon-circle-cross { + width: 17px; + height: 17px; + background-position: 0px -16px; +} +.ckan-icon-circle-add { + width: 17px; + height: 17px; + background-position: -17px -16px; +} +.ckan-icon-flame { + width: 17px; + height: 17px; + background-position: -34px -16px; +} +.ckan-icon-search { + width: 17px; + height: 17px; + background-position: -51px -16px; +} +.ckan-icon-large-lock { + width: 20px; + height: 20px; + background-position: 0px -33px; +} +.ckan-icon-photo { + width: 20px; + height: 20px; + background-position: -20px -33px; +} +.ckan-icon-add { + width: 20px; + height: 20px; + background-position: -40px -33px; +} +.ckan-icon-home { + width: 20px; + height: 20px; + background-position: -60px -33px; +} +.ckan-icon-rewind { + width: 20px; + height: 20px; + background-position: -80px -33px; +} +.ckan-icon-tools { + width: 20px; + height: 20px; + background-position: -100px -33px; +} +.ckan-icon-flag { + width: 20px; + height: 20px; + background-position: -120px -33px; +} +.ckan-icon-clipboard { + width: 20px; + height: 20px; + background-position: -140px -33px; +} +.ckan-icon-share { + width: 20px; + height: 20px; + background-position: -160px -33px; +} +.ckan-icon-info { + width: 20px; + height: 20px; + background-position: -180px -33px; +} +.ckan-icon-download { + width: 20px; + height: 20px; + background-position: -200px -33px; +} +.ckan-icon-star { + width: 20px; + height: 20px; + background-position: -220px -33px; +} +.ckan-icon-info-flat { + width: 20px; + height: 20px; + background-position: -240px -33px; +} +.ckan-icon-tag { + width: 20px; + height: 20px; + background-position: -260px -33px; +} +.ckan-icon-plus { + width: 20px; + height: 20px; + background-position: -280px -33px; + width: 16px; +} +.ckan-icon-head { + width: 20px; + height: 20px; + background-position: -300px -33px; +} +.ckan-icon-arrow-e { + width: 20px; + height: 20px; + background-position: -320px -33px; + width: 16px; +} +.ckan-icon-bookmark { + width: 25px; + height: 25px; + background-position: 0px -53px; +} +.format-label { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + text-indent: -900em; + background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +} +.format-label { + width: 32px; + height: 35px; + background-position: 0px -62px; +} +.format-label[data-format=rdf], +.format-label[data-format*=rdf] { + width: 32px; + height: 35px; + background-position: -32px -62px; +} +.format-label[data-format=pdf], +.format-label[data-format*=pdf] { + width: 32px; + height: 35px; + background-position: -64px -62px; +} +.format-label[data-format=api], +.format-label[data-format*=api] { + width: 32px; + height: 35px; + background-position: -96px -62px; +} +.format-label[data-format=zip], +.format-label[data-format*=zip] { + width: 32px; + height: 35px; + background-position: -128px -62px; +} +.format-label[data-format=xls], +.format-label[data-format*=xls] { + width: 32px; + height: 35px; + background-position: -160px -62px; +} +.format-label[data-format=csv], +.format-label[data-format*=csv] { + width: 32px; + height: 35px; + background-position: -192px -62px; +} +.format-label[data-format=txt], +.format-label[data-format*=txt] { + width: 32px; + height: 35px; + background-position: -224px -62px; +} +.format-label[data-format=xml], +.format-label[data-format*=xml] { + width: 32px; + height: 35px; + background-position: -256px -62px; +} +.format-label[data-format=json], +.format-label[data-format*=json] { + width: 32px; + height: 35px; + background-position: -288px -62px; +} +.format-label[data-format=html], +.format-label[data-format*=html] { + width: 32px; + height: 35px; + background-position: -320px -62px; +} +/* This is a modified version of the font-awesome core less document. */ +@font-face { + font-family: 'FontAwesome'; + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + font-weight: normal; + font-style: normal; +} +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + display: inline; width: auto; - border: 1px solid #cccccc; - border-top: none; - font-size: 11px; - color: #282828; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; } -.editor .editor-info-block a { - color: #b50909; - text-decoration: none; +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } -.control-custom { - font-size: 0; +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } -.control-custom label { - margin-bottom: 0; +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } -.control-custom input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - width: 140px; +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } } -.control-custom input:last-of-type { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } } -.control-custom .checkbox { - display: inline-block; - margin-left: 5px; +@-moz-document url-prefix() { + .icon-spin { + height: .9em; + } + .btn .icon-spin { + height: auto; + } + .icon-spin.icon-large { + height: 1.25em; + } + .btn .icon-spin.icon-large { + height: .75em; + } } -.control-custom .checkbox input { - width: auto; +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; } -.control-custom.disabled label, -.control-custom.disabled input { - color: #aaaaaa; - text-decoration: line-through; - text-shadow: none; +.icon-music:before { + content: "\f001"; } -.control-custom.disabled input { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #f3f3f3; +.icon-search:before { + content: "\f002"; } -.control-custom.disabled .checkbox { - color: #4d4d4d; - text-decoration: none; +.icon-envelope:before { + content: "\f003"; } -.control-custom .checkbox.btn { - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - position: relative; - top: 0; - left: 5px; - height: 3px; - width: 8px; - padding: 3px 8px; +.icon-heart:before { + content: "\f004"; } -.control-custom .checkbox.btn span { - display: none; - width: 30px; +.icon-star:before { + content: "\f005"; } -.control-custom .checkbox.btn:before { - position: relative; - top: 1px; - left: -1px; - color: #fff; +.icon-star-empty:before { + content: "\f006"; } -.control-custom .checkbox.btn input { - display: none; +.icon-user:before { + content: "\f007"; } -.control-custom.disabled .checkbox.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f65454; - background-image: -moz-linear-gradient(top, #f54444, #f76b6b); - background-image: -ms-linear-gradient(top, #f54444, #f76b6b); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f54444), to(#f76b6b)); - background-image: -webkit-linear-gradient(top, #f54444, #f76b6b); - background-image: -o-linear-gradient(top, #f54444, #f76b6b); - background-image: linear-gradient(top, #f54444, #f76b6b); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f54444', endColorstr='#f76b6b', GradientType=0); - border-color: #f76b6b #f76b6b #f32222; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76b6b; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-film:before { + content: "\f008"; } -.control-custom.disabled .checkbox.btn:hover, -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active, -.control-custom.disabled .checkbox.btn.disabled, -.control-custom.disabled .checkbox.btn[disabled] { - background-color: #f76b6b; - *background-color: #f65353; +.icon-th-large:before { + content: "\f009"; } -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active { - background-color: #f43b3b \9; +.icon-th:before { + content: "\f00a"; } -.control-custom.disabled .checkbox.btn .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-th-list:before { + content: "\f00b"; } -.alert-danger a, -.alert-error a { - color: #b55457; +.icon-ok:before { + content: "\f00c"; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea, -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - border-color: #c6898b; +.icon-remove:before { + content: "\f00d"; } -.error-inline { - color: #b55457; +.icon-zoom-in:before { + content: "\f00e"; } -.error-block, -.error-inline { - font-size: 12px; +.icon-zoom-out:before { + content: "\f010"; } -.error-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - padding: 6px 8px 3px; - background: #c6898b; - margin: -3px 0 0; - color: #ffffff; - width: 216px; +.icon-off:before { + content: "\f011"; } -.control-medium .error-block { - width: 326px; +.icon-signal:before { + content: "\f012"; } -.control-full .error-block { - width: auto; +.icon-cog:before { + content: "\f013"; } -.control-group.error .input-prepend .error-block, -.control-custom.error .error-block { - margin-left: -1px; - width: auto; +.icon-trash:before { + content: "\f014"; } -.control-custom.error .error-block { - width: 409px; +.icon-home:before { + content: "\f015"; } -.control-select.error .error-block { - width: 204px; +.icon-file:before { + content: "\f016"; } -.stages { - margin: 0; - list-style: none; - *zoom: 1; - color: #aeaeae; - counter-reset: stage; - margin: -20px -25px 20px; - overflow: hidden; +.icon-time:before { + content: "\f017"; } -.stages:before, -.stages:after { - display: table; - content: ""; +.icon-road:before { + content: "\f018"; } -.stages:after { - clear: both; +.icon-download-alt:before { + content: "\f019"; } -.stages li { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - line-height: 27px; - counter-increment: stage; - width: 33.33%; - background-color: #ededed; - float: left; - padding: 10px 20px; - position: relative; - z-index: 0; +.icon-download:before { + content: "\f01a"; } -.stages li:before { - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; - content: counter(stage); - display: inline-block; - width: 27px; - height: 27px; - margin-right: 5px; - font-weight: bold; - text-align: center; - color: #ffffff; - background-color: #aeaeae; - z-index: 1; +.icon-upload:before { + content: "\f01b"; +} +.icon-inbox:before { + content: "\f01c"; +} +.icon-play-circle:before { + content: "\f01d"; +} +.icon-repeat:before { + content: "\f01e"; +} +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; +} +.icon-list-alt:before { + content: "\f022"; +} +.icon-lock:before { + content: "\f023"; +} +.icon-flag:before { + content: "\f024"; +} +.icon-headphones:before { + content: "\f025"; +} +.icon-volume-off:before { + content: "\f026"; +} +.icon-volume-down:before { + content: "\f027"; +} +.icon-volume-up:before { + content: "\f028"; +} +.icon-qrcode:before { + content: "\f029"; +} +.icon-barcode:before { + content: "\f02a"; } -.stages li:after { - left: 0; - border: solid rgba(237, 237, 237, 0); - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #ededed; - border-bottom-color: #ededed; - border-width: 29px; - top: 50%; - margin-top: -29px; - margin-left: -30px; +.icon-tag:before { + content: "\f02b"; } -.stages li.first, -.stages li.first .highlight { - -webkit-border-radius: 3px 0 0 0; - -moz-border-radius: 3px 0 0 0; - border-radius: 3px 0 0 0; +.icon-tags:before { + content: "\f02c"; } -.stages li.last { - position: relative; - right: -1px; +.icon-book:before { + content: "\f02d"; } -.stages li.last, -.stages li.last .highlight { - -webkit-border-radius: 0 3px 0 0; - -moz-border-radius: 0 3px 0 0; - border-radius: 0 3px 0 0; +.icon-bookmark:before { + content: "\f02e"; } -.stages li.first:after { - content: none; - border: none; +.icon-print:before { + content: "\f02f"; } -.stages li.active:after { - border-color: rgba(140, 198, 138, 0); - border-top-color: #8cc68a; - border-bottom-color: #8cc68a; +.icon-camera:before { + content: "\f030"; } -.stages li.complete:after { - border-color: rgba(197, 226, 196, 0); - border-top-color: #c5e2c4; - border-bottom-color: #c5e2c4; +.icon-font:before { + content: "\f031"; } -.stages.stage-3 li.complete:first-child:after { - content: none; +.icon-bold:before { + content: "\f032"; } -.stages li.active, -.stages li.complete { - background: none; +.icon-italic:before { + content: "\f033"; } -.stages li.active:before { - color: #8cc68a; - background: #ffffff; +.icon-text-height:before { + content: "\f034"; } -.stages li.complete:before { - color: #c5e2c4; - background: #eef6ed; +.icon-text-width:before { + content: "\f035"; } -.stages li .highlight { - display: block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - padding: 10px 52px; - border: none; - text-align: left; - text-decoration: none; - line-height: 27px; - z-index: -1; +.icon-align-left:before { + content: "\f036"; } -.stages li.active .highlight { - color: #ffffff; - background: #8cc68a; +.icon-align-center:before { + content: "\f037"; } -.stages li.complete .highlight { - color: #eef6ed; - background: #c5e2c4; +.icon-align-right:before { + content: "\f038"; } -.alert > :last-child { - margin-bottom: 0; +.icon-align-justify:before { + content: "\f039"; } -.slug-preview { - font-size: 14px; - line-height: 1.5; - margin-top: 5px; - margin-left: 10px; +.icon-list:before { + content: "\f03a"; } -.slug-preview-value { - background-color: #faedcf; - margin-right: 3px; +.icon-indent-left:before { + content: "\f03b"; } -.slug-preview .btn { - padding-top: 3px; - padding-bottom: 3px; +.icon-indent-right:before { + content: "\f03c"; } -.resource-upload-field { - position: relative; - overflow: hidden; - display: inline-block; - vertical-align: bottom; +.icon-facetime-video:before { + content: "\f03d"; } -.resource-upload-field label { - z-index: 0; +.icon-picture:before { + content: "\f03e"; } -.resource-upload-field input { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - right: 0; - z-index: 1; - margin: 0; - border: solid transparent; - border-width: 100px 0 0 200px; - cursor: pointer; - direction: ltr; - -moz-transform: translate(-300px, 0) scale(4); +.icon-pencil:before { + content: "\f040"; } -.resource-upload-field.loading { - display: inline-block; - background: url("../../../base/images/loading-spinner.gif") no-repeat center right; - padding-right: 5px; +.icon-map-marker:before { + content: "\f041"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - font-size: 14px; +.icon-adjust:before { + content: "\f042"; } -.select2-container-multi .select2-choices .select2-search-field input { - height: 29px; +.icon-tint:before { + content: "\f043"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - padding-left: 10px; +.icon-edit:before { + content: "\f044"; } -.select2-container { - margin-top: 5px; +.icon-share:before { + content: "\f045"; } -.select2-container-multi { - margin-top: 0; +.icon-check:before { + content: "\f046"; } -.select2-container-multi .select2-choices .select2-search-choice { - padding: 5px 8px 5px 22px; +.icon-move:before { + content: "\f047"; } -.select2-container-multi.select2-container .select2-choices { - padding-top: 3px; - padding-bottom: 3px; +.icon-step-backward:before { + content: "\f048"; } -.select2-search-choice-close, -.select2-container-multi .select2-search-choice-close { - top: 6px; - left: 5px; +.icon-fast-backward:before { + content: "\f049"; } -.select2-container-multi .select2-choices { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -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); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - background-color: #ffffff; - border: 1px solid #cccccc; +.icon-backward:before { + content: "\f04a"; } -.select2-container-active .select2-choices, -.select2-container-multi.select2-container-active .select2-choices { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +.icon-play:before { + content: "\f04b"; } -.select2-container-multi .select2-drop { - margin-top: -2px; +.icon-pause:before { + content: "\f04c"; } -.select2-container .select2-results li { - line-height: 18px; - padding-top: 4px; - padding-bottom: 4px; +.icon-stop:before { + content: "\f04d"; } -.control-full .select2-container { - width: 520px !important; +.icon-forward:before { + content: "\f04e"; } -.dataset-item { - border-bottom: 1px dotted #cccccc; - padding-bottom: 20px; - margin-bottom: 20px; +.icon-fast-forward:before { + content: "\f050"; } -.dataset-item:last-of-type { - border-bottom: none; - margin-bottom: 0; - padding-bottom: 0; +.icon-step-forward:before { + content: "\f051"; } -.dataset-heading { - font-size: 14px; - line-height: 1.3; +.icon-eject:before { + content: "\f052"; } -.dataset-heading a { - color: #333333; +.icon-chevron-left:before { + content: "\f053"; +} +.icon-chevron-right:before { + content: "\f054"; +} +.icon-plus-sign:before { + content: "\f055"; +} +.icon-minus-sign:before { + content: "\f056"; +} +.icon-remove-sign:before { + content: "\f057"; } -.dataset-heading .label { - position: relative; - top: -1px; +.icon-ok-sign:before { + content: "\f058"; } -.dataset-content { - font-size: 12px; +.icon-question-sign:before { + content: "\f059"; } -.dataset-resources { - font-size: 10px; - line-height: 14px; - margin-top: 5px; +.icon-info-sign:before { + content: "\f05a"; } -.dataset-resources li { - display: inline; +.icon-screenshot:before { + content: "\f05b"; } -.dataset-resources li a { - background-color: #aaaaaa; +.icon-remove-circle:before { + content: "\f05c"; } -.dataset-heading .popular { - top: 0; +.icon-ok-circle:before { + content: "\f05d"; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #cccccc; +.icon-ban-circle:before { + content: "\f05e"; } -.results strong { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; +.icon-arrow-left:before { + content: "\f060"; } -.results strong:before { - float: right; - content: " "; - width: 280px; - white-space: pre; +.icon-arrow-right:before { + content: "\f061"; } -.filter-list { - color: #4d4d4d; - font-weight: bold; +.icon-arrow-up:before { + content: "\f062"; } -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; +.icon-arrow-down:before { + content: "\f063"; } -.dataset-search { - position: relative; +.icon-share-alt:before { + content: "\f064"; } -.search-giant { - position: relative; +.icon-resize-full:before { + content: "\f065"; } -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; +.icon-resize-small:before { + content: "\f066"; } -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; +.icon-plus:before { + content: "\f067"; } -.control-order-by { - position: absolute; - bottom: -65px; - right: 0; +.icon-minus:before { + content: "\f068"; } -.control-order-by label, -.control-order-by select { - display: inline; +.icon-asterisk:before { + content: "\f069"; } -.control-order-by select { - width: 160px; +.icon-exclamation-sign:before { + content: "\f06a"; } -.resource-list { - margin: 0; - list-style: none; - margin: -10px -10px 10px -10px; +.icon-gift:before { + content: "\f06b"; } -.resource-item { - position: relative; - padding: 10px 110px 10px 60px; - margin-bottom: 0px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-leaf:before { + content: "\f06c"; } -.resource-item:hover { - background-color: #efefef; +.icon-fire:before { + content: "\f06d"; } -.resource-item .heading { - color: #000000; - font-size: 14px; - font-weight: bold; +.icon-eye-open:before { + content: "\f06e"; } -.resource-item .format-label { - position: absolute; - top: 10px; - left: 10px; +.icon-eye-close:before { + content: "\f070"; } -.resource-item .description { - font-size: 12px; - margin-bottom: 0; +.icon-warning-sign:before { + content: "\f071"; } -.resource-item .btn-group { - position: absolute; - top: 13px; - right: 10px; +.icon-plane:before { + content: "\f072"; } -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; +.icon-calendar:before { + content: "\f073"; } -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; +.icon-random:before { + content: "\f074"; } -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; +.icon-comment:before { + content: "\f075"; } -.dataset-form-resource-types label { - position: relative; +.icon-magnet:before { + content: "\f076"; } -.dataset-form-resource-types input[type=radio]:checked + label { - font-weight: bold; +.icon-chevron-up:before { + content: "\f077"; } -.dataset-form-resource-types input[type=radio]:checked + label:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 16px; - height: 16px; - background-position: -192px 0; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; +.icon-chevron-down:before { + content: "\f078"; } -.dataset-form-resource-types input[type=radio]:checked + label:after:last-child { - *margin-left: 0; +.icon-retweet:before { + content: "\f079"; } -.dataset-form-resource-types input[type=radio] { - display: none; +.icon-shopping-cart:before { + content: "\f07a"; } -.tag-list { - margin: 0; - list-style: none; - padding: 10px; +.icon-folder-close:before { + content: "\f07b"; } -.tag-list li { - display: inline-block; - margin-right: 5px; +.icon-folder-open:before { + content: "\f07c"; } -.tag-list li:last-child { - margin-right: 0; +.icon-resize-vertical:before { + content: "\f07d"; } -.additional-info td, -.additional-info th { - width: 50%; +.icon-resize-horizontal:before { + content: "\f07e"; } -.label[data-format=html], -.label[data-format*=html] { - background-color: #55a1ce; +.icon-bar-chart:before { + content: "\f080"; } -.label[data-format=json], -.label[data-format*=json] { - background-color: #ef7100; +.icon-twitter-sign:before { + content: "\f081"; } -.label[data-format=xml], -.label[data-format*=xml] { - background-color: #ef7100; +.icon-facebook-sign:before { + content: "\f082"; } -.label[data-format=text], -.label[data-format*=text] { - background-color: #74cbec; +.icon-camera-retro:before { + content: "\f083"; } -.label[data-format=csv], -.label[data-format*=csv] { - background-color: #dfb100; +.icon-key:before { + content: "\f084"; } -.label[data-format=xls], -.label[data-format*=xls] { - background-color: #2db55d; +.icon-cogs:before { + content: "\f085"; } -.label[data-format=zip], -.label[data-format*=zip] { - background-color: #686868; +.icon-comments:before { + content: "\f086"; } -.label[data-format=api], -.label[data-format*=api] { - background-color: #ec96be; +.icon-thumbs-up:before { + content: "\f087"; } -.label[data-format=pdf], -.label[data-format*=pdf] { - background-color: #e0051e; +.icon-thumbs-down:before { + content: "\f088"; } -.label[data-format=rdf], -.label[data-format*=rdf], -.label[data-format*=nquad], -.label[data-format*=ntriples], -.label[data-format*=turtle] { - background-color: #0b4498; +.icon-star-half:before { + content: "\f089"; } -.group .media-vertical .image { - margin: 0 -5px 5px; +.icon-heart-empty:before { + content: "\f08a"; } -.group-list:nth-child(odd) { - clear: left; +.icon-signout:before { + content: "\f08b"; } -.group-list .module-heading { - padding-top: 15px; - padding-bottom: 15px; +.icon-linkedin-sign:before { + content: "\f08c"; } -.group-list .dataset-content { - min-height: 54px; +.icon-pushpin:before { + content: "\f08d"; } -.group-list .module-heading h3 { - margin-bottom: 2px; +.icon-external-link:before { + content: "\f08e"; } -.group-list .module-heading h3 a { - color: #333333; +.icon-signin:before { + content: "\f090"; } -.toolbar { - *zoom: 1; - margin-top: -10px; - margin-bottom: 10px; - padding: 5px 0; +.icon-trophy:before { + content: "\f091"; } -.toolbar:before, -.toolbar:after { - display: table; - content: ""; +.icon-github-sign:before { + content: "\f092"; } -.toolbar:after { - clear: both; +.icon-upload-alt:before { + content: "\f093"; } -.toolbar .breadcrumb { - *zoom: 1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - position: relative; - float: left; - margin: 0; - padding: 0; - border: none; - background: none; - font-size: 20px; +.icon-lemon:before { + content: "\f094"; } -.toolbar .breadcrumb:before, -.toolbar .breadcrumb:after { - display: table; - content: ""; +.icon-phone:before { + content: "\f095"; } -.toolbar .breadcrumb:after { - clear: both; +.icon-check-empty:before { + content: "\f096"; } -.toolbar li [class^=icon]:before { - width: auto; +.icon-bookmark-empty:before { + content: "\f097"; } -.toolbar .breadcrumb li:after { - content: " / "; +.icon-phone-sign:before { + content: "\f098"; } -.toolbar .breadcrumb li.active:after { - content: ""; +.icon-twitter:before { + content: "\f099"; } -.toolbar .breadcrumb li:last-of-type:after { - content: ""; +.icon-facebook:before { + content: "\f09a"; } -.toolbar .home a { - text-decoration: none; +.icon-github:before { + content: "\f09b"; } -.toolbar .home span { - display: none; +.icon-unlock:before { + content: "\f09c"; } -.toolbar .breadcrumb a { - color: #505050; - line-height: 28px; +.icon-credit-card:before { + content: "\f09d"; } -.toolbar .breadcrumb .active a { - font-weight: bold; +.icon-rss:before { + content: "\f09e"; } -.toolbar .actions { - margin: 0; - list-style: none; +.icon-hdd:before { + content: "\f0a0"; } -.toolbar .actions li { - display: inline-block; - margin-right: 5px; +.icon-bullhorn:before { + content: "\f0a1"; } -.toolbar .actions li { - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.icon-bell:before { + content: "\f0a2"; } -.toolbar .actions li:last-of-type { - margin-right: 0; +.icon-certificate:before { + content: "\f0a3"; } -.toolbar .btn { - padding: 0 10px 0 8px; - border-color: #b7b7b7; - line-height: 27px; +.icon-hand-right:before { + content: "\f0a4"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - 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); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-hand-left:before { + content: "\f0a5"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-hand-up:before { + content: "\f0a6"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-hand-down:before { + content: "\f0a7"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-circle-arrow-left:before { + content: "\f0a8"; } -.toolbar .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f65454; - background-image: -moz-linear-gradient(top, #f54444, #f76b6b); - background-image: -ms-linear-gradient(top, #f54444, #f76b6b); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f54444), to(#f76b6b)); - background-image: -webkit-linear-gradient(top, #f54444, #f76b6b); - background-image: -o-linear-gradient(top, #f54444, #f76b6b); - background-image: linear-gradient(top, #f54444, #f76b6b); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f54444', endColorstr='#f76b6b', GradientType=0); - border-color: #f76b6b #f76b6b #f32222; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76b6b; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-circle-arrow-right:before { + content: "\f0a9"; } -.toolbar .btn-primary:hover, -.toolbar .btn-primary:active, -.toolbar .btn-primary.active, -.toolbar .btn-primary.disabled, -.toolbar .btn-primary[disabled] { - background-color: #f76b6b; - *background-color: #f65353; +.icon-circle-arrow-up:before { + content: "\f0aa"; } -.toolbar .btn-primary:active, -.toolbar .btn-primary.active { - background-color: #f43b3b \9; +.icon-circle-arrow-down:before { + content: "\f0ab"; } -.toolbar .btn-primary .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-globe:before { + content: "\f0ac"; } -.toolbar .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-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(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - 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); - *background-color: #f89406; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-wrench:before { + content: "\f0ad"; } -.toolbar .btn-warning:hover, -.toolbar .btn-warning:active, -.toolbar .btn-warning.active, -.toolbar .btn-warning.disabled, -.toolbar .btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; +.icon-tasks:before { + content: "\f0ae"; } -.toolbar .btn-warning:active, -.toolbar .btn-warning.active { - background-color: #c67605 \9; +.icon-filter:before { + content: "\f0b0"; } -.toolbar .btn-warning .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-briefcase:before { + content: "\f0b1"; } -.toolbar .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - 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); - *background-color: #bd362f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-fullscreen:before { + content: "\f0b2"; } -.toolbar .btn-danger:hover, -.toolbar .btn-danger:active, -.toolbar .btn-danger.active, -.toolbar .btn-danger.disabled, -.toolbar .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; +.icon-group:before { + content: "\f0c0"; } -.toolbar .btn-danger:active, -.toolbar .btn-danger.active { - background-color: #942a25 \9; +.icon-link:before { + content: "\f0c1"; } -.toolbar .btn-danger .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-cloud:before { + content: "\f0c2"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - 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); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-beaker:before { + content: "\f0c3"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-cut:before { + content: "\f0c4"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-copy:before { + content: "\f0c5"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-paper-clip:before { + content: "\f0c6"; } -.toolbar .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - 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); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-save:before { + content: "\f0c7"; +} +.icon-sign-blank:before { + content: "\f0c8"; } -.toolbar .btn-info:hover, -.toolbar .btn-info:active, -.toolbar .btn-info.active, -.toolbar .btn-info.disabled, -.toolbar .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; +.icon-reorder:before { + content: "\f0c9"; } -.toolbar .btn-info:active, -.toolbar .btn-info.active { - background-color: #24748c \9; +.icon-list-ul:before { + content: "\f0ca"; } -.toolbar .btn-info .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-list-ol:before { + content: "\f0cb"; } -.toolbar .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - 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); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-strikethrough:before { + content: "\f0cc"; } -.toolbar .btn-inverse:hover, -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active, -.toolbar .btn-inverse.disabled, -.toolbar .btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; +.icon-underline:before { + content: "\f0cd"; } -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active { - background-color: #080808 \9; +.icon-table:before { + content: "\f0ce"; } -.toolbar .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-magic:before { + content: "\f0d0"; } -.hide-heading { - display: none; +.icon-truck:before { + content: "\f0d1"; } -.page-header { - position: relative; - border-bottom: 1px solid #d0d0d0; - height: 30px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.icon-pinterest:before { + content: "\f0d2"; } -.page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; +.icon-pinterest-sign:before { + content: "\f0d3"; } -.page-header .nav-tabs i { - margin-right: 10px; - font-size: 14px; +.icon-google-plus-sign:before { + content: "\f0d4"; } -.page-header .nav-tabs a:hover { - background-color: #ffffff; +.icon-google-plus:before { + content: "\f0d5"; } -.prose h1, -.prose heading-1 h2, -.prose heading-2 { - margin-bottom: 15px; +.icon-money:before { + content: "\f0d6"; } -.prose h3, -.prose heading-3 { - margin-bottom: 10px; +.icon-caret-down:before { + content: "\f0d7"; } -.table-chunky td, -.table-chunky th { - padding: 12px 15px; - font-size: 12px; +.icon-caret-up:before { + content: "\f0d8"; } -.table-chunky thead th, -.table-chunky thead td { - color: #ffffff; - background-color: #aaaaaa; - padding-top: 10px; - padding-bottom: 10px; +.icon-caret-left:before { + content: "\f0d9"; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: transparent; +.icon-caret-right:before { + content: "\f0da"; } -.table-striped tbody tr:nth-child(even) td, -.table-striped tbody tr:nth-child(even) th { - background-color: #f2f2f2; +.icon-columns:before { + content: "\f0db"; } -.table-chunky.table-bordered { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-sort:before { + content: "\f0dc"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; +.icon-sort-down:before { + content: "\f0dd"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +.icon-sort-up:before { + content: "\f0de"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 2px; - -moz-border-radius: 0 0 0 2px; - border-radius: 0 0 0 2px; - -webkit-border-bottom-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - border-bottom-left-radius: 2px; +.icon-envelope-alt:before { + content: "\f0e0"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - border-bottom-right-radius: 2px; +.icon-linkedin:before { + content: "\f0e1"; } -.ckan-icon { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; +.icon-undo:before { + content: "\f0e2"; } -.ckan-icon:last-child { - *margin-left: 0; +.icon-legal:before { + content: "\f0e3"; } -.ckan-icon-fb { - width: 16px; - height: 16px; - background-position: 0px 0; +.icon-dashboard:before { + content: "\f0e4"; } -.ckan-icon-gplus { - width: 16px; - height: 16px; - background-position: -16px 0; +.icon-comment-alt:before { + content: "\f0e5"; } -.ckan-icon-twitter { - width: 16px; - height: 16px; - background-position: -32px 0; +.icon-comments-alt:before { + content: "\f0e6"; } -.ckan-icon-email { - width: 16px; - height: 16px; - background-position: -48px 0; +.icon-bolt:before { + content: "\f0e7"; } -.ckan-icon-share { - width: 16px; - height: 16px; - background-position: -64px 0; +.icon-sitemap:before { + content: "\f0e8"; } -.ckan-icon-feed { - width: 16px; - height: 16px; - background-position: -80px 0; +.icon-umbrella:before { + content: "\f0e9"; } -.ckan-icon-calendar { - width: 16px; - height: 16px; - background-position: -96px 0; +.icon-paste:before { + content: "\f0ea"; } -.ckan-icon-file { - width: 16px; - height: 16px; - background-position: -112px 0; +.icon-lightbulb:before { + content: "\f0eb"; } -.ckan-icon-lock { - width: 16px; - height: 16px; - background-position: -128px 0; +.icon-exchange:before { + content: "\f0ec"; } -.ckan-icon-link-file { - width: 16px; - height: 16px; - background-position: -144px 0; +.icon-cloud-download:before { + content: "\f0ed"; } -.ckan-icon-link-plugin { - width: 16px; - height: 16px; - background-position: -160px 0; +.icon-cloud-upload:before { + content: "\f0ee"; } -.ckan-icon-upload-file { - width: 16px; - height: 16px; - background-position: -176px 0; +.icon-user-md:before { + content: "\f0f0"; } -.ckan-icon-callout { - width: 16px; - height: 16px; - background-position: -192px 0; +.icon-stethoscope:before { + content: "\f0f1"; } -.ckan-icon-circle-cross { - width: 17px; - height: 17px; - background-position: 0px -16px; +.icon-suitcase:before { + content: "\f0f2"; } -.ckan-icon-circle-add { - width: 17px; - height: 17px; - background-position: -17px -16px; +.icon-bell-alt:before { + content: "\f0f3"; } -.ckan-icon-flame { - width: 17px; - height: 17px; - background-position: -34px -16px; +.icon-coffee:before { + content: "\f0f4"; } -.ckan-icon-search { - width: 17px; - height: 17px; - background-position: -51px -16px; +.icon-food:before { + content: "\f0f5"; } -.ckan-icon-large-lock { - width: 20px; - height: 20px; - background-position: 0px -33px; +.icon-file-alt:before { + content: "\f0f6"; } -.ckan-icon-photo { - width: 20px; - height: 20px; - background-position: -20px -33px; +.icon-building:before { + content: "\f0f7"; } -.ckan-icon-add { - width: 20px; - height: 20px; - background-position: -40px -33px; +.icon-hospital:before { + content: "\f0f8"; } -.ckan-icon-home { - width: 20px; - height: 20px; - background-position: -60px -33px; +.icon-ambulance:before { + content: "\f0f9"; } -.ckan-icon-rewind { - width: 20px; - height: 20px; - background-position: -80px -33px; +.icon-medkit:before { + content: "\f0fa"; +} +.icon-fighter-jet:before { + content: "\f0fb"; +} +.icon-beer:before { + content: "\f0fc"; +} +.icon-h-sign:before { + content: "\f0fd"; +} +.icon-plus-sign-alt:before { + content: "\f0fe"; } -.ckan-icon-tools { - width: 20px; - height: 20px; - background-position: -100px -33px; +.icon-double-angle-left:before { + content: "\f100"; } -.ckan-icon-flag { - width: 20px; - height: 20px; - background-position: -120px -33px; +.icon-double-angle-right:before { + content: "\f101"; } -.ckan-icon-clipboard { - width: 20px; - height: 20px; - background-position: -140px -33px; +.icon-double-angle-up:before { + content: "\f102"; } -.ckan-icon-share { - width: 20px; - height: 20px; - background-position: -160px -33px; +.icon-double-angle-down:before { + content: "\f103"; } -.ckan-icon-info { - width: 20px; - height: 20px; - background-position: -180px -33px; +.icon-angle-left:before { + content: "\f104"; } -.ckan-icon-download { - width: 20px; - height: 20px; - background-position: -200px -33px; +.icon-angle-right:before { + content: "\f105"; } -.ckan-icon-star { - width: 20px; - height: 20px; - background-position: -220px -33px; +.icon-angle-up:before { + content: "\f106"; } -.ckan-icon-info-flat { - width: 20px; - height: 20px; - background-position: -240px -33px; +.icon-angle-down:before { + content: "\f107"; } -.ckan-icon-tag { - width: 20px; - height: 20px; - background-position: -260px -33px; +.icon-desktop:before { + content: "\f108"; } -.ckan-icon-plus { - width: 20px; - height: 20px; - background-position: -280px -33px; - width: 16px; +.icon-laptop:before { + content: "\f109"; } -.ckan-icon-head { - width: 20px; - height: 20px; - background-position: -300px -33px; +.icon-tablet:before { + content: "\f10a"; } -.ckan-icon-arrow-e { - width: 20px; - height: 20px; - background-position: -320px -33px; - width: 16px; +.icon-mobile-phone:before { + content: "\f10b"; } -.ckan-icon-bookmark { - width: 25px; - height: 25px; - background-position: 0px -53px; +.icon-circle-blank:before { + content: "\f10c"; } -.format-label { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - text-indent: -900em; - background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +.icon-quote-left:before { + content: "\f10d"; } -.format-label:last-child { - *margin-left: 0; +.icon-quote-right:before { + content: "\f10e"; } -.format-label { - width: 32px; - height: 35px; - background-position: 0px -62px; +.icon-spinner:before { + content: "\f110"; } -.format-label[data-format=rdf], -.format-label[data-format*=rdf] { - width: 32px; - height: 35px; - background-position: -32px -62px; +.icon-circle:before { + content: "\f111"; } -.format-label[data-format=pdf], -.format-label[data-format*=pdf] { - width: 32px; - height: 35px; - background-position: -64px -62px; +.icon-reply:before { + content: "\f112"; } -.format-label[data-format=api], -.format-label[data-format*=api] { - width: 32px; - height: 35px; - background-position: -96px -62px; +.icon-github-alt:before { + content: "\f113"; } -.format-label[data-format=zip], -.format-label[data-format*=zip] { - width: 32px; - height: 35px; - background-position: -128px -62px; +.icon-folder-close-alt:before { + content: "\f114"; } -.format-label[data-format=xls], -.format-label[data-format*=xls] { - width: 32px; - height: 35px; - background-position: -160px -62px; +.icon-folder-open-alt:before { + content: "\f115"; } -.format-label[data-format=csv], -.format-label[data-format*=csv] { - width: 32px; - height: 35px; - background-position: -192px -62px; +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + text-align: right; + font-size: 14px; + line-height: 1; + width: 14px; } -.format-label[data-format=txt], -.format-label[data-format*=txt] { - width: 32px; - height: 35px; - background-position: -224px -62px; +.btn [class^="icon-"], +.nav [class^="icon-"], +.module-heading [class^="icon-"], +.dropdown [class^="icon-"], +.btn [class*=" icon-"], +.nav [class*=" icon-"], +.module-heading [class*=" icon-"], +.dropdown [class*=" icon-"] { + margin-right: 4px; } -.format-label[data-format=xml], -.format-label[data-format*=xml] { - width: 32px; - height: 35px; - background-position: -256px -62px; +.info-block [class^="icon-"], +.info-block [class*=" icon-"] { + float: left; + font-size: 28px; + width: 28px; + margin-right: 5px; + margin-top: 2px; } -.format-label[data-format=json], -.format-label[data-format*=json] { - width: 32px; - height: 35px; - background-position: -288px -62px; +.breadcrumb .home .icon-home { + font-size: 24px; + width: 24px; + vertical-align: -1px; } -.format-label[data-format=html], -.format-label[data-format*=html] { - width: 32px; - height: 35px; - background-position: -320px -62px; +.info-block-small [class^="icon-"], +.info-block-small [class*=" icon-"] { + font-size: 14px; + width: 14px; + margin-top: 1px; } -li [class^="icon-"], -li [class*=" icon-"] { - width: auto; +.wrapper { + *zoom: 1; + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + position: relative; + background: #ffffff url("../../../base/images/nav.png") 0 0 repeat-y; + margin-bottom: 20px; } -li .icon-large:before, -li .icon-large:before { - width: auto; +.wrapper:before, +.wrapper:after { + display: table; + content: ""; + line-height: 0; +} +.wrapper:after { + clear: both; +} +.wrapper.no-nav { + background-image: none; } [role=main], .main { position: relative; - padding-top: 27px; - padding-bottom: 27px; - background-color: #efefef; + padding-top: 10px; + padding-bottom: 20px; + background: #eeeeee url("../../../base/images/bg.png"); } [role=main] { min-height: 350px; } .main:after, -.main:before, -[role=main]:after, -[role=main]:before { - content: ""; - position: absolute; - left: 0; - right: 0; - height: 7px; - background: #ffffff; - border-color: #c9c9c9; - border-style: solid; - border-width: 0; -} -.main:before, -[role=main]:before { - top: 0; - border-bottom-width: 1px; -} -.main:after, [role=main]:after { bottom: 0; border-top-width: 1px; } [role=main] .primary { - float: left; - margin-left: 20px; - width: 700px; + width: 717px; float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; float: left; } -.primary > :last-child, -.secondary > :last-child { - margin-bottom: 0; +.primary > :last-child, +.secondary > :last-child { + margin-bottom: 0; +} +.primary .primary { + float: left; + width: 467px; + margin-left: 0; + margin-bottom: 20px; +} +.primary .primary h1:first-child, +.primary .primary h2:first-child, +.primary .primary h3:first-child, +.primary .primary h4:first-child { + margin-top: 0; +} +.primary .tertiary { + float: left; + width: 180px; + margin-left: 20px; + margin-bottom: 20px; +} +.hero { + background: url("../../../base/images/background-tile.png"); +} +.hero:after { + background-color: rgba(0, 0, 0, 0.09); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-repeat: repeat-x; + background-color: #f6f6f6; + border-bottom: 1px solid #d0d0d0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + -moz-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); +} +.hero:after .back:hover { + text-decoration: none; +} +.hero:after .back:hover span { + text-decoration: underline; +} +.context-info .module-content { + padding: 15px; +} +.context-info .image { + margin-bottom: 10px; +} +.context-info .image img, +.context-info .image a { + display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.context-info p { + overflow: auto; +} +.context-info code { + display: block; + font-weight: normal; + padding: 0; + margin: 0; + overflow: auto; +} +.context-info h1.heading { + margin: 0 0 5px 0; + font-size: 18px; + line-height: 1.3; +} +.context-info .info { + margin-top: 15px; + padding-top: 10px; + border-top: 1px dotted #DDD; +} +.context-info .info dl dd { + margin-top: 3px; + margin-left: 0; +} +.context-info .nums { + *zoom: 1; + margin-top: 15px; + padding-top: 10px; + padding-bottom: 0; + border-top: 1px dotted #DDD; +} +.context-info .nums:before, +.context-info .nums:after { + display: table; + content: ""; + line-height: 0; +} +.context-info .nums:after { + clear: both; +} +.context-info .nums dl { + float: left; + width: 50%; + margin: 5px 0 0 0; + color: #444444; +} +.context-info .nums dl dt { + display: block; + font-size: 13px; + font-weight: 300; +} +.context-info .nums dl dd { + display: block; + font-size: 30px; + font-weight: 700; + line-height: 36px; + margin-left: 0; +} +.context-info .nums dl dd .smallest { + font-size: 13px; +} +.context-info .nums dl dd .smaller { + font-size: 16px; } -.hero { - background: url("../../../base/images/background-tile.png"); +.context-info .nums dl dd .small { + font-size: 21px; } -.hero:after { - background-color: rgba(0, 0, 0, 0.09); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-repeat: repeat-x; - background-color: transparent; - top: 7px; - bottom: auto; - height: 5px; +.context-info .follow_button { + margin-top: 15px; +} +.context-info.editing .module-content { + margin-top: 0; } .hero { - padding-bottom: 0; + background: url("../../../base/images/background-tile.png"); + padding: 20px 0; min-height: 0; } .hero > .container { position: relative; padding-bottom: 0; } -.hero-primary, -.hero-secondary { - float: left; - margin-left: 20px; - width: 460px; -} -.hero-primary { - margin-left: 0; -} -.hero-primary { - margin-left: 0; - margin-bottom: 0; -} -.hero-secondary { - position: absolute; - bottom: 0; - right: 0; -} -.hero-secondary-inner { - bottom: 0; - left: 0; - right: 0; -} -.hero .module-popup { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - margin-top: 50px; +.hero .search-giant { + margin-bottom: 10px; } -.hero .module-popup .module-content { - padding-bottom: 2px; +.hero .search-giant input { + border-color: #003f52; } .hero .page-heading { font-size: 18px; @@ -6734,290 +7984,339 @@ li .icon-large:before { } .hero .module-dark { padding: 5px; - margin-bottom: 10px; + margin-bottom: 0; color: #ffffff; background: #ffffff; } .hero .module-dark .module-content { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - background-color: #dc0b0b; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + background-color: #c14531; + border-bottom: none; } .hero .module-dark .module-content .heading { + margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { - margin-bottom: 9px; -} -.hero .tags .tag, -.hero .tags .tag-list { - display: inline-block; -} -.hero .tags .tag-list { - padding: 0; -} -.hero .tags .tag { - margin-right: 15px; -} -header.masthead { *zoom: 1; - color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #e51212; - background-image: -moz-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -ms-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc0b0b), to(#f31d1d)); - background-image: -webkit-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -o-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: linear-gradient(top, #dc0b0b, #f31d1d); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dc0b0b', endColorstr='#f31d1d', GradientType=0); + padding: 5px 10px 10px 10px; + background-color: #983627; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -header.masthead:before, -header.masthead:after { +.hero .tags:before, +.hero .tags:after { display: table; content: ""; + line-height: 0; } -header.masthead:after { +.hero .tags:after { clear: both; } -header.masthead .container { - position: relative; +.hero .tags h3, +.hero .tags .tag { + display: block; + float: left; + margin: 5px 10px 0 0; } -header.masthead a { - color: #ffffff; +.hero .tags h3 { + font-size: 14px; + line-height: 20px; + padding: 2px 8px; } -header.masthead hgroup h1, -header.masthead hgroup h2 { +.hero-primary, +.hero-secondary { float: left; - font-size: 34px; - line-height: 1.5; -} -header.masthead hgroup h1 { - font-weight: 900; - letter-spacing: -1px; + margin-left: 20px; + width: 460px; } -header.masthead hgroup h2 { - position: absolute; - bottom: -3px; - left: 0; - margin: 0; - font-size: 15px; - font-weight: normal; - line-height: 1.2; - white-space: nowrap; +.hero-primary { + margin-left: 0; + margin-bottom: 0; } -header.masthead .content { +.hero-secondary { position: absolute; - top: 10px; + bottom: 0; right: 0; } -header.masthead .section { - float: left; +.hero-secondary .hero-secondary-inner { + bottom: 0; + left: 0; + right: 0; } -header.masthead .navigation { - margin-right: 20px; +.main.homepage { + padding-top: 20px; + padding-bottom: 20px; + border-top: 1px solid #cccccc; } -header.masthead .navigation ul.unstyled { - *zoom: 1; - margin: 5px 0; +.main.homepage .module-heading .media-image { + margin-right: 15px; + max-height: 53px; + -webkit-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); } -header.masthead .navigation ul.unstyled:before, -header.masthead .navigation ul.unstyled:after { - display: table; - content: ""; +.main.homepage .group-listing .box { + min-height: 275px; } -header.masthead .navigation ul.unstyled:after { - clear: both; +.main.homepage .group-list { + margin-bottom: 0; } -header.masthead .navigation ul.unstyled li { - display: block; - float: left; +.main.homepage .group-list .dataset-content { + min-height: 70px; } -header.masthead .navigation ul.unstyled li a { - display: block; - font-size: 12px; - font-weight: bold; - padding: 4px 10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.main.homepage .box .module { + margin-top: 0; } -header.masthead .navigation ul.unstyled li a.active { - background-color: #de1717; - box-shadow: 0 -1px 0 #b01212, 0 1px 0 #e13030; +.account-masthead { + *zoom: 1; + min-height: 30px; + color: #ffffff; + background: #983627 url("../../../base/images/bg.png"); } -header.masthead .site-search { - margin: 3px 0; +.account-masthead:before, +.account-masthead:after { + display: table; + content: ""; + line-height: 0; } -header.masthead .site-search input { - width: 190px; - font-size: 11px; - padding: 4px; +.account-masthead:after { + clear: both; } -header.masthead .account { - background: #ea0c0c; - padding: 3px 5px; - margin: 2px 0 2px 30px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 2px 4px #d20b0b; - -moz-box-shadow: inset 0 2px 4px #d20b0b; - box-shadow: inset 0 2px 4px #d20b0b; +.account-masthead .account { + float: right; } -header.masthead .account ul.unstyled { +.account-masthead .account ul { *zoom: 1; } -header.masthead .account ul.unstyled:before, -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:before, +.account-masthead .account ul:after { display: table; content: ""; + line-height: 0; } -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:after { clear: both; } -header.masthead .account ul.unstyled li { +.account-masthead .account ul li { display: block; float: left; + border-left: 1px solid #842f22; } -header.masthead .account ul.unstyled li a { +.account-masthead .account ul li a { display: block; - font-size: 12px; + color: #f0d1cc; + font-size: 13px; font-weight: bold; - padding: 4px 10px; + padding: 0 10px; + line-height: 31px; +} +.account-masthead .account ul li a span.username { + margin: 0 2px 0 4px; } -header.masthead .account ul.unstyled li a.sub { +.account-masthead .account ul li a:hover { + color: #f6e3e0; + background-color: #842f22; + text-decoration: none; +} +.account-masthead .account ul li a.sub { font-weight: 300; - border-left: 1px solid #d20b0b; } -header.masthead .account .dropdown { - float: left; +.account-masthead .account ul li a .btn { + vertical-align: 1px; + margin-left: 3px; } -header.masthead .account .button { - display: block; - text-decoration: none; - background-color: #dc0b0b; - color: #ee8585; - text-shadow: 0 1px 1px #ab0909; +.account-masthead .account .notifications a span { + font-size: 12px; + margin-left: 3px; + padding: 1px 6px; + background-color: #842f22; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 #f30e0e; - -moz-box-shadow: inset 0 1px 0 #f30e0e; - box-shadow: inset 0 1px 0 #f30e0e; } -header.masthead .account .image { - margin: 2px 0; - padding: 0 4px 0 0; - overflow: hidden; - font-size: 10px; +.account-masthead .account .notifications a:hover span { + color: #ffffff; + background-color: #70281c; +} +.account-masthead .account .notifications.notifications-important a span { + color: #ffffff; + background-color: #c9403a; +} +.account-masthead .account.authed .image { + padding: 0 6px; +} +.account-masthead .account.authed .image img { + vertical-align: -6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -header.masthead .account .image i { - vertical-align: -1px; +.masthead { + *zoom: 1; + min-height: 55px; + color: #ffffff; + background: #c14531 url("../../../base/images/bg.png"); } -header.masthead .account .image img { - opacity: 0.7; - border-right: 1px solid #f31d1d; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.masthead:before, +.masthead:after { + display: table; + content: ""; + line-height: 0; +} +.masthead:after { + clear: both; } -header.masthead .account .notifications { - padding: 4px 8px 3px 8px; - margin: 2px 5px 2px 0; +.masthead .container { + position: relative; } -header.masthead .account .notifications.notifications-important { +.masthead a { color: #ffffff; - background-color: #c9403a; - text-shadow: 0 1px 1px #a3322d; - -webkit-box-shadow: inset 0 1px 0 #ce534e; - -moz-box-shadow: inset 0 1px 0 #ce534e; - box-shadow: inset 0 1px 0 #ce534e; } -header.masthead .account .dropdown.open .image img, -header.masthead .account .dropdown .image:hover img { - opacity: 1; - border-right-color: #f64d4d; +.masthead hgroup h1, +.masthead hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; } -header.masthead .account .dropdown.open .button, -header.masthead .account .dropdown .button:hover { - color: #ffffff; - background-color: #ea6d6d; - -webkit-box-shadow: inset 0 1px 0 #ee8585; - -moz-box-shadow: inset 0 1px 0 #ee8585; - box-shadow: inset 0 1px 0 #ee8585; - text-decoration: none; +.masthead hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.masthead hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; } -header.masthead .account .dropdown.open .notifications-important, -header.masthead .account .dropdown .notifications-important:hover { - background-color: #d46762; - text-shadow: 0 1px 1px #c9403a; - -webkit-box-shadow: inset 0 1px 0 #d97a76; - -moz-box-shadow: inset 0 1px 0 #d97a76; - box-shadow: inset 0 1px 0 #d97a76; +.masthead .content { + position: absolute; + top: 10px; + right: 0; } -header.masthead .account.authed { - margin: 0 0 0 30px; +.masthead .section { + float: left; } -header.masthead .account.not-authed { - padding-top: 2px; - padding-bottom: 2px; +.masthead input[type="text"] { + border-color: #ad3e2c; } -header.masthead .dropdown-menu { - margin-top: -1px; +.masthead .navigation { + margin-right: 20px; } -header.masthead .user-dropdown-menu a { - color: #dc0b0b; +.masthead .navigation .nav-pills { + margin-bottom: 0; } -header.masthead .user-dropdown-menu a:hover { - color: #ffffff; +.masthead .navigation .nav-pills li a:hover, +.masthead .navigation .nav-pills li.active a { + background-color: #983627; } -header.masthead .debug { +.masthead .site-search { + margin: 2px 8px 2px 0; +} +.masthead .site-search input { + width: 200px; + padding: 4px 10px; +} +.masthead .debug { position: absolute; - bottom: 10px; + top: 37px; left: 10px; - font-size: 11px; color: rgba(255, 255, 255, 0.5); - line-height: 1.2; } .site-footer { *zoom: 1; + min-height: 55px; color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #e51212; - background-image: -moz-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -ms-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc0b0b), to(#f31d1d)); - background-image: -webkit-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -o-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: linear-gradient(top, #dc0b0b, #f31d1d); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dc0b0b', endColorstr='#f31d1d', GradientType=0); - font-size: 12px; + background: #c14531 url("../../../base/images/bg.png"); padding: 20px 0; } .site-footer:before, .site-footer:after { display: table; content: ""; + line-height: 0; } .site-footer:after { clear: both; } +.site-footer .container { + position: relative; +} +.site-footer a { + color: #ffffff; +} +.site-footer hgroup h1, +.site-footer hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; +} +.site-footer hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.site-footer hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.site-footer .content { + position: absolute; + top: 10px; + right: 0; +} +.site-footer .section { + float: left; +} +.site-footer input[type="text"] { + border-color: #ad3e2c; +} +.site-footer .navigation { + margin-right: 20px; +} +.site-footer .navigation .nav-pills { + margin-bottom: 0; +} +.site-footer .navigation .nav-pills li a:hover, +.site-footer .navigation .nav-pills li.active a { + background-color: #983627; +} +.site-footer .site-search { + margin: 2px 8px 2px 0; +} +.site-footer .site-search input { + width: 200px; + padding: 4px 10px; +} +.site-footer .debug { + position: absolute; + top: 37px; + left: 10px; + color: rgba(255, 255, 255, 0.5); +} .site-footer, .site-footer label, .site-footer small { - color: #ccdee3; + color: #e6b5ad; } .site-footer a { - color: #ccdee3; + color: #e6b5ad; } .footer-links, .attribution { @@ -7025,22 +8324,27 @@ header.masthead .debug { margin-left: 20px; width: 460px; } -.footer-links { +.footer-links { + margin-left: 0; +} +.footer-links ul { + float: left; + margin-left: 20px; + width: 220px; +} +.footer-links ul:first-child { margin-left: 0; } -.footer-links li { - display: inline-block; - width: 40%; - margin-right: 5%; +.footer-links ul li { margin-bottom: 5px; } .attribution small { - color: #ccdee3; + color: #e6b5ad; font-size: 12px; } .attribution .ckan-footer-logo { display: block; - width: 65px; + width: 68px; height: 21px; margin-top: 2px; background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left; @@ -7053,6 +8357,7 @@ header.masthead .debug { .lang-select:after { display: table; content: ""; + line-height: 0; } .lang-select:after { clear: both; @@ -7069,153 +8374,66 @@ header.masthead .debug { .lang-dropdown li { width: auto; } -.lang-dropdown .select2-result-label[data-value]:before { - content: ""; - display: inline-block; - background-image: url("../../../base/images/flags.png"); - background-repeat: no-repeat; - background-position: 0 11px; - width: 17px; - height: 11px; - position: relative; - top: 1px; -} -.lang-dropdown .select2-result-label[data-value*="/en/"]:before { - background-position: 0 0; -} -.lang-dropdown .select2-result-label[data-value*="/de/"]:before { - background-position: 0 -11px; -} -.lang-dropdown .select2-result-label[data-value*="/fr/"]:before { - background-position: 0 -22px; -} -.lang-dropdown .select2-result-label[data-value*="/it/"]:before { - background-position: 0 -33px; -} -.lang-dropdown .select2-result-label[data-value*="/es/"]:before { - background-position: 0 -44px; -} -.lang-dropdown .select2-result-label[data-value*="/pl/"]:before { - background-position: 0 -55px; +.table-selected td { + background-color: #f5f5f5; } -.lang-dropdown .select2-result-label[data-value*="/ru/"]:before { - background-position: 0 -66px; +.table-selected td .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/nl/"]:before { - background-position: 0 -77px; +.table-bulk-edit th input { + top: -5px; } -.lang-dropdown .select2-result-label[data-value*="/sv/"]:before { - background-position: 0 -88px; +.table-bulk-edit .table-actions .btn-group { + float: left; + margin: 0 10px 0 0; } -.lang-dropdown .select2-result-label[data-value*="/no/"]:before { - background-position: 0 -99px; +.table-bulk-edit .context p { + margin-bottom: 0; } -.lang-dropdown .select2-result-label[data-value*="/cs/"]:before, -.lang-dropdown .select2-result-label[data-value*="/cs_CZ/"]:before { - background-position: 0 -110px; +.table-header thead th { + background-color: #f6f6f6; } -.lang-dropdown .select2-result-label[data-value*="/hu/"]:before { - background-position: 0 -121px; +.table-edit-hover .edit { + display: none; + float: right; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.table-edit-hover tr:hover .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/fi/"]:before { - background-position: 0 -143px; +.js .table-toggle-more .toggle-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/bg/"]:before { - background-position: 0 -154px; +.js .table-toggle-more .show-more { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/ca/"]:before { - background-position: 0 -165px; +.js .table-toggle-more .show-less { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/sq/"]:before { - background-position: 0 -176px; +.js .table-toggle-more .toggle-seperator { + display: table-row; } -.lang-dropdown .select2-result-label[data-value*="/sr/"]:before, -.lang-dropdown .select2-result-label[data-value*="/sr_Latn/"]:before { - background-position: 0 -187px; +.js .table-toggle-more .toggle-seperator td { + height: 11px; + padding: 0; + background-image: url("../../../base/images/table-seperator.png"); } -.lang-dropdown .select2-result-label[data-value*="/zh_TW/"]:before { - background-position: 0 -198px; +.js .table .toggle-show td { + background: none; + text-align: center; } -.lang-dropdown .select2-result-label[data-value*="/lv/"]:before { - background-position: 0 -209px; +.js .table-toggle-less .show-less { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/sk/"]:before { - background-position: 0 -220px; +.js .table-toggle-less .show-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.js .table-toggle-less .toggle-seperator { + display: none; } .profile .empty, .profile .dataset-list { margin-bottom: 20px; } -.profile-info .module-content { - padding: 15px; -} -.profile-info .avatar { - border: 1px solid #DDD; - padding: 5px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.profile-info .avatar img, -.profile-info .avatar a { - display: block; -} -.profile-info code { - font-weight: normal; - padding: 0; - margin: 0; -} -.profile-info h1.heading { - margin: 10px 0 5px 0; - font-size: 21px; -} -.profile-info .info { - margin-top: 15px; - padding-top: 10px; - border-top: 1px dotted #DDD; -} -.profile-info .info dl dd { - margin-top: 3px; - margin-left: 0; -} -.profile-info .nums { - *zoom: 1; - margin-top: 15px; - padding-top: 10px; - padding-bottom: 0; - border-top: 1px dotted #DDD; -} -.profile-info .nums:before, -.profile-info .nums:after { - display: table; - content: ""; -} -.profile-info .nums:after { - clear: both; -} -.profile-info .nums dl { - float: left; - width: 33%; - margin: 5px 0 0 0; - color: #4d4d4d; -} -.profile-info .nums dl dt { - display: block; - font-weight: 300; -} -.profile-info .nums dl dd { - display: block; - font-size: 30px; - font-weight: 700; - line-height: 1.2; - margin-left: 0; -} .activity { margin: 10px 0; padding: 0; @@ -7232,13 +8450,16 @@ header.masthead .debug { .activity .item:after { display: table; content: ""; + line-height: 0; } .activity .item:after { clear: both; } -.activity .item i { +.activity .item .icon { display: block; - float: left; + position: absolute; + top: 0; + left: 0; width: 30px; height: 30px; line-height: 30px; @@ -7246,7 +8467,6 @@ header.masthead .debug { color: #ffffff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); font-weight: normal; - font-size: 16px; margin-right: 10px; -webkit-border-radius: 100px; -moz-border-radius: 100px; @@ -7261,20 +8481,19 @@ header.masthead .debug { border-radius: 100px; } .activity .item .actor .gravatar { - float: left; - margin-top: -5px; - margin-right: 10px; + position: absolute; + top: 0; + left: 40px; } .activity .item p { font-size: 14px; line-height: 1.5; - margin: 5px 0 0 0; + margin: 5px 0 0 80px; } .activity .item .date { color: #999; font-size: 12px; white-space: nowrap; - margin-left: 5px; } .activity .item .new { display: block; @@ -7294,106 +8513,278 @@ header.masthead .debug { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.popover .about { - margin-bottom: 10px; +.activity .load-less { + margin-bottom: 15px; +} +.popover { + width: 300px; +} +.popover .popover-title { + font-weight: bold; + margin-bottom: 0; +} +.popover p.about { + margin: 0 0 10px 0; } .popover .popover-close { float: right; text-decoration: none; } -.activity .item i { - background-color: #767dce; +.activity .item .icon { + background-color: #999999; } -.activity .item.added-tag i { +.activity .item.added-tag .icon { background-color: #6995a6; } -.activity .item.changed-group i { +.activity .item.changed-group .icon { background-color: #767dce; } -.activity .item.changed-package i { +.activity .item.changed-package .icon { background-color: #8c76ce; } -.activity .item.changed-package_extra i { +.activity .item.changed-package_extra .icon { background-color: #769ace; } -.activity .item.changed-resource i { +.activity .item.changed-resource .icon { background-color: #aa76ce; } -.activity .item.changed-user i { +.activity .item.changed-user .icon { background-color: #76b8ce; } -.activity .item.deleted-group i { +.activity .item.changed-organization .icon { + background-color: #699fa6; +} +.activity .item.deleted-group .icon { background-color: #b95252; } -.activity .item.deleted-package i { +.activity .item.deleted-package .icon { background-color: #b97452; } -.activity .item.deleted-package_extra i { +.activity .item.deleted-package_extra .icon { background-color: #b95274; } -.activity .item.deleted-resource i { +.activity .item.deleted-resource .icon { background-color: #b99752; } -.activity .item.new-group i { +.activity .item.deleted-organization .icon { + background-color: #b95297; +} +.activity .item.new-group .icon { background-color: #69a67a; } -.activity .item.new-package i { +.activity .item.new-package .icon { background-color: #69a68e; } -.activity .item.new-package_extra i { +.activity .item.new-package_extra .icon { background-color: #6ca669; } -.activity .item.new-resource i { +.activity .item.new-resource .icon { background-color: #81a669; } -.activity .item.new-user i { +.activity .item.new-user .icon { background-color: #69a6a3; } -.activity .item.removed-tag i { +.activity .item.new-organization .icon { + background-color: #81a669; +} +.activity .item.removed-tag .icon { background-color: #b95297; } -.activity .item.deleted-related-item i { +.activity .item.deleted-related-item .icon { background-color: #b9b952; } -.activity .item.follow-dataset i { +.activity .item.follow-dataset .icon { background-color: #767dce; } -.activity .item.follow-user i { +.activity .item.follow-user .icon { background-color: #8c76ce; } -.activity .item.new-related-item i { +.activity .item.new-related-item .icon { background-color: #95a669; } -.activity .item.follow-group i { +.activity .item.follow-group .icon { background-color: #8ba669; } -.popover-context-loading .popover-title { +.dropdown:hover .dropdown-menu { + display: block; +} +.js .dropdown .dropdown-menu, +.js .dropdown:hover .dropdown-menu { + display: none; +} +.js .dropdown.open .dropdown-menu { + display: block; +} +#followee-filter .btn { + *zoom: 1; +} +#followee-filter .btn:before, +#followee-filter .btn:after { + display: table; + content: ""; + line-height: 0; +} +#followee-filter .btn:after { + clear: both; +} +#followee-filter .btn span, +#followee-filter .btn strong { + display: block; + float: left; + line-height: 1.5; +} +#followee-filter .btn span { + font-weight: normal; +} +#followee-filter .btn strong { + margin: 0 5px; + white-space: nowrap; + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; +} +.dashboard-context { + position: relative; + margin-bottom: 20px; + padding: 20px; + border-bottom: 1px solid #DCDCDC; + background-color: #f6f6f6; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; +} +.dashboard-context h2 { + margin-bottom: 10px; +} +.dashboard-context .arrow { + position: absolute; + content: ' '; + top: 30px; + right: -10px; + width: 10px; + height: 21px; + background: transparent url("../../../base/images/dashboard-followee-related.png"); +} +.popover-followee .popover-title { display: none; } -.popover-context-loading .popover-content { +.popover-followee .popover-content { + padding: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -.popover-context-loading .popover-content img { - vertical-align: -3px; - margin-right: 10px; +.popover-followee .empty { + padding: 10px; } -.follower-list li { - margin: 0 0 15px 0; +.popover-followee .popover-header { + *zoom: 1; + background-color: whiteSmoke; + padding: 5px; + border-bottom: 1px solid #cccccc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.follower-list .gravatar { - vertical-align: -4px; - margin-right: 3px; +.popover-followee .popover-header:before, +.popover-followee .popover-header:after { + display: table; + content: ""; + line-height: 0; +} +.popover-followee .popover-header:after { + clear: both; +} +.popover-followee .popover-header .input-prepend { + margin-bottom: 0; +} +.popover-followee .popover-header .add-on, +.popover-followee .popover-header input { + float: left; + margin: 0; +} +.popover-followee .popover-header .add-on { + padding: 4px 8px 4px 12px; + border-right-width: 0; + -webkit-border-radius: 100px 0 0 100px; + -moz-border-radius: 100px 0 0 100px; + border-radius: 100px 0 0 100px; +} +.popover-followee .popover-header input { + padding: 4px 12px 4px 8px; + font-size: 13px; + width: 207px; + -webkit-border-radius: 0 100px 100px 0; + -moz-border-radius: 0 100px 100px 0; + border-radius: 0 100px 100px 0; +} +.popover-followee .nav { + padding: 0; + margin: 0; + max-height: 205px; + overflow: auto; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.popover-followee .nav li a { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: 7px 10px 7px 15px; + margin: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.popover-followee .nav li a i { + background-color: #c14531; + color: #ffffff; + margin-right: 11px; + padding: 3px 5px; + line-height: 1; -webkit-border-radius: 100px; -moz-border-radius: 100px; border-radius: 100px; + -webkit-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); } -.module-my-datasets .empty { - padding: 10px; +.popover-followee .nav li a:hover i { + background-color: #000; +} +.popover-followee .nav li.active a i { + color: #c14531; + background-color: #ffffff; +} +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; } body { - background-color: #f31d1d; + background: #c14531 url("../../../base/images/bg.png"); } [hidden] { display: none; @@ -7412,11 +8803,10 @@ table .metric { width: 140px; } code { - padding: 2px 2px; color: #000000; - font-weight: bold; border: none; background: none; + white-space: normal; } pre { border: none; @@ -7446,10 +8836,11 @@ iframe { text-indent: -999em; } .empty { - color: #aeaeae; + color: #aaaaaa; font-style: italic; } .page-heading { + margin-top: 0; margin-bottom: 16px; } .m-top { @@ -7492,10 +8883,6 @@ iframe { position: relative; top: -20px; } -.ie .module, -.ie .media-image { - border: 1px solid #cccccc; -} .ie .module-popup { border-bottom: none; } @@ -7519,24 +8906,19 @@ iframe { .ie9 .control-large input { height: 56px; } -.ie9 .module { - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +.ie8 .account-masthead a.image, +.ie8 .account-masthead .username { + white-space: nowrap; } -.ie7 .masthead nav ul li a.active, -.ie8 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #e60b0b; - border-top: 1px solid #cd0a0a; - border-bottom: 1px solid #f30e0e; +.ie9 .homepage .media.module-heading .media-image img, +.ie8 .homepage .media.module-heading .media-image img, +.ie7 .homepage .media.module-heading .media-image img { + width: 85px !important; } -.ie8 .masthead .account a.image { - display: block; - width: 25px; - padding-right: 10px; - white-space: nowrap; +.ie8 .hero .hero-primary.module-popup .box, +.ie7 .hero .hero-primary.module-popup .box { + padding-bottom: 20px !important; + margin-bottom: 0 !important; } .ie7 .alert { position: relative; @@ -7556,6 +8938,7 @@ iframe { .ie7 .tags .tag-list:after { display: table; content: ""; + line-height: 0; } .ie7 .tags .tag-list:after { clear: both; @@ -7569,8 +8952,6 @@ iframe { } .ie7 .tags .tag { display: block; - border: 1px solid #d0d0d0; - background: #f5f5f5; } .ie7 .search-giant input { width: 95%; @@ -7621,6 +9002,9 @@ iframe { .ie7 .stages li .highlight { width: auto; } +.ie7 .account-masthead .account a i { + line-height: 31px; +} .ie7 .masthead { position: relative; z-index: 1; @@ -7632,39 +9016,12 @@ iframe { *zoom: 1; } -.ie7 .masthead nav ul { - margin-top: 5px; -} -.ie7 .masthead nav ul li { - float: left; -} -.ie7 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #e60b0b; - border-top: 1px solid #cd0a0a; - border-bottom: 1px solid #f30e0e; -} .ie7 .masthead .header-image { display: block; } .ie7 .masthead .account .dropdown-menu { z-index: 10000; } -.ie7 .footer-links { - *zoom: 1; -} -.ie7 .footer-links:before, -.ie7 .footer-links:after { - display: table; - content: ""; -} -.ie7 .footer-links:after { - clear: both; -} -.ie7 .footer-links li { - float: left; -} .ie7 .module-narrow .nav-item.image { *zoom: 1; } @@ -7672,6 +9029,7 @@ iframe { .ie7 .module-narrow .nav-item.image:after { display: table; content: ""; + line-height: 0; } .ie7 .module-narrow .nav-item.image:after { clear: both; @@ -7689,11 +9047,13 @@ iframe { } .ie7 .module-heading { *zoom: 1; + position: relative; } .ie7 .module-heading:before, .ie7 .module-heading:after { display: table; content: ""; + line-height: 0; } .ie7 .module-heading:after { clear: both; @@ -7713,3 +9073,22 @@ iframe { position: relative; zoom: 1; } +.ie7 .resource-item { + position: static; + padding-bottom: 1px; +} +.ie7 .resource-item .heading { + position: relative; +} +.ie7 .resource-item .format-label { + left: -48px; +} +.ie7 .resource-item .btn-group { + position: relative; + float: right; + top: -35px; + right: 0; +} +.ie7 .media-overlay .media-heading { + background-color: #000; +} diff --git a/ckan/public/base/javascript/main.js b/ckan/public/base/javascript/main.js index bda7535bead..e307fe8403c 100644 --- a/ckan/public/base/javascript/main.js +++ b/ckan/public/base/javascript/main.js @@ -82,7 +82,7 @@ this.ckan = this.ckan || {}; // This is useful for when IE7 doesn't properly render parts of the page after // some dom manipulation has happened this.jQuery.fn.ie7redraw = function() { - if (jQuery.browser.msie && jQuery.browser.version == '7.0') { + if (jQuery('html').hasClass('ie7')) { jQuery(this).css('zoom', 1); } }; diff --git a/ckan/public/base/javascript/modules/custom-fields.js b/ckan/public/base/javascript/modules/custom-fields.js index a68737ddc50..7124d27a763 100644 --- a/ckan/public/base/javascript/modules/custom-fields.js +++ b/ckan/public/base/javascript/modules/custom-fields.js @@ -17,7 +17,7 @@ this.ckan.module('custom-fields', function (jQuery, _) { * Returns nothing. */ initialize: function () { - if (!jQuery.browser.msie || !jQuery.browser.version == '7.0') { + if (!jQuery('html').hasClass('ie7')) { jQuery.proxyAll(this, /_on/); var delegated = this.options.fieldSelector + ':last input:first'; diff --git a/ckan/public/base/javascript/modules/dataset-visibility.js b/ckan/public/base/javascript/modules/dataset-visibility.js new file mode 100644 index 00000000000..5bfa4963bb0 --- /dev/null +++ b/ckan/public/base/javascript/modules/dataset-visibility.js @@ -0,0 +1,32 @@ +/* Dataset visibility toggler + * When no organization is selected in the org dropdown then set visibility to + * public always and disable dropdown + */ +this.ckan.module('dataset-visibility', function ($, _) { + return { + currentValue: false, + options: { + organizations: $('#field-organizations'), + visibility: $('#field-private'), + currentValue: null + }, + initialize: function() { + $.proxyAll(this, /_on/); + this.options.currentValue = this.options.visibility.val(); + this.options.organizations.on('change', this._onOrganizationChange); + this._onOrganizationChange(); + }, + _onOrganizationChange: function() { + var value = this.options.organizations.val(); + if (value) { + this.options.visibility + .prop('disabled', false) + .val(this.options.currentValue); + } else { + this.options.visibility + .prop('disabled', true) + .val('False'); + } + } + }; +}); diff --git a/ckan/public/base/javascript/modules/slug-preview.js b/ckan/public/base/javascript/modules/slug-preview.js index 2545daf6ee6..e622401ee09 100644 --- a/ckan/public/base/javascript/modules/slug-preview.js +++ b/ckan/public/base/javascript/modules/slug-preview.js @@ -72,7 +72,7 @@ this.ckan.module('slug-preview-slug', function (jQuery, _) { // Horrible hack to make sure that IE7 rerenders the subsequent // DOM children correctly now that we've render the slug preview element // We should drop this horrible hack ASAP - if (jQuery.browser.msie && jQuery.browser.version == '7.0') { + if (jQuery('html').hasClass('ie7')) { jQuery('.btn').on('click', preview, function(){ jQuery('.controls').ie7redraw(); }); diff --git a/ckan/public/base/javascript/plugins/jquery.slug-preview.js b/ckan/public/base/javascript/plugins/jquery.slug-preview.js index b9ffe1509eb..fd3cb170cb9 100644 --- a/ckan/public/base/javascript/plugins/jquery.slug-preview.js +++ b/ckan/public/base/javascript/plugins/jquery.slug-preview.js @@ -31,13 +31,14 @@ var field = element.find('input'); var preview = $(options.template); var value = preview.find('.slug-preview-value'); + var required = $('
').append($('.control-required', element).clone()).html(); function setValue() { var val = escape(field.val()) || options.placeholder; value.text(val); } - preview.find('strong').text(options.i18n['URL'] + ':'); + preview.find('strong').html(required + ' ' + options.i18n['URL'] + ':'); preview.find('.slug-preview-prefix').text(options.prefix); preview.find('button').text(options.i18n['Edit']).click(function (event) { event.preventDefault(); diff --git a/ckan/public/base/javascript/resource.config b/ckan/public/base/javascript/resource.config index aa4f28371d7..b1a7302d9e8 100644 --- a/ckan/public/base/javascript/resource.config +++ b/ckan/public/base/javascript/resource.config @@ -36,6 +36,7 @@ ckan = modules/activity-stream.js modules/dashboard.js modules/table-toggle-more.js + modules/dataset-visibility.js modules/media-grid.js main = diff --git a/ckan/public/base/less/ckan.less b/ckan/public/base/less/ckan.less index b18b68e89bc..f7c108f8734 100644 --- a/ckan/public/base/less/ckan.less +++ b/ckan/public/base/less/ckan.less @@ -138,7 +138,3 @@ iframe { } @import "iehacks.less"; - -.debug { - display: none; -} diff --git a/ckan/public/base/less/dashboard.less b/ckan/public/base/less/dashboard.less index 4e8b047561c..286f72bb968 100644 --- a/ckan/public/base/less/dashboard.less +++ b/ckan/public/base/less/dashboard.less @@ -33,7 +33,7 @@ .arrow { position: absolute; content: ' '; - top: 70px; + top: 30px; right: -10px; width: 10px; height: 21px; @@ -113,3 +113,18 @@ } } } + +.dashboard-me { + .clearfix; + padding: 15px 15px 0 15px; + img { + float: left; + margin-right: 10px; + .border-radius(100px); + } + strong { + display: block; + font-size: 16px; + margin: 3px 0; + } +} diff --git a/ckan/public/base/less/font-awesome.less b/ckan/public/base/less/font-awesome.less deleted file mode 100644 index 35abe13307a..00000000000 --- a/ckan/public/base/less/font-awesome.less +++ /dev/null @@ -1,335 +0,0 @@ -/* This is a modified version of the font-awesome core less document. */ - -@font-face { - font-family: 'FontAwesome'; - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=3.0.1'); - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), - url('@{FontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format('woff'), - url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); - font-weight: normal; - font-style: normal; -} - -[class^="icon-"], -[class*=" icon-"] { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} - -.icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -@-moz-keyframes spin { - 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } -} -@-webkit-keyframes spin { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } -} -@-o-keyframes spin { - 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } -} -@-ms-keyframes spin { - 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } -} -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } -} - -@-moz-document url-prefix() { - .icon-spin { height: .9em; } - .btn .icon-spin { height: auto; } - .icon-spin.icon-large { height: 1.25em; } - .btn .icon-spin.icon-large { height: .75em; } -} - -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { content: "\f000"; } -.icon-music:before { content: "\f001"; } -.icon-search:before { content: "\f002"; } -.icon-envelope:before { content: "\f003"; } -.icon-heart:before { content: "\f004"; } -.icon-star:before { content: "\f005"; } -.icon-star-empty:before { content: "\f006"; } -.icon-user:before { content: "\f007"; } -.icon-film:before { content: "\f008"; } -.icon-th-large:before { content: "\f009"; } -.icon-th:before { content: "\f00a"; } -.icon-th-list:before { content: "\f00b"; } -.icon-ok:before { content: "\f00c"; } -.icon-remove:before { content: "\f00d"; } -.icon-zoom-in:before { content: "\f00e"; } - -.icon-zoom-out:before { content: "\f010"; } -.icon-off:before { content: "\f011"; } -.icon-signal:before { content: "\f012"; } -.icon-cog:before { content: "\f013"; } -.icon-trash:before { content: "\f014"; } -.icon-home:before { content: "\f015"; } -.icon-file:before { content: "\f016"; } -.icon-time:before { content: "\f017"; } -.icon-road:before { content: "\f018"; } -.icon-download-alt:before { content: "\f019"; } -.icon-download:before { content: "\f01a"; } -.icon-upload:before { content: "\f01b"; } -.icon-inbox:before { content: "\f01c"; } -.icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before { content: "\f01e"; } - -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { content: "\f021"; } -.icon-list-alt:before { content: "\f022"; } -.icon-lock:before { content: "\f023"; } -.icon-flag:before { content: "\f024"; } -.icon-headphones:before { content: "\f025"; } -.icon-volume-off:before { content: "\f026"; } -.icon-volume-down:before { content: "\f027"; } -.icon-volume-up:before { content: "\f028"; } -.icon-qrcode:before { content: "\f029"; } -.icon-barcode:before { content: "\f02a"; } -.icon-tag:before { content: "\f02b"; } -.icon-tags:before { content: "\f02c"; } -.icon-book:before { content: "\f02d"; } -.icon-bookmark:before { content: "\f02e"; } -.icon-print:before { content: "\f02f"; } - -.icon-camera:before { content: "\f030"; } -.icon-font:before { content: "\f031"; } -.icon-bold:before { content: "\f032"; } -.icon-italic:before { content: "\f033"; } -.icon-text-height:before { content: "\f034"; } -.icon-text-width:before { content: "\f035"; } -.icon-align-left:before { content: "\f036"; } -.icon-align-center:before { content: "\f037"; } -.icon-align-right:before { content: "\f038"; } -.icon-align-justify:before { content: "\f039"; } -.icon-list:before { content: "\f03a"; } -.icon-indent-left:before { content: "\f03b"; } -.icon-indent-right:before { content: "\f03c"; } -.icon-facetime-video:before { content: "\f03d"; } -.icon-picture:before { content: "\f03e"; } - -.icon-pencil:before { content: "\f040"; } -.icon-map-marker:before { content: "\f041"; } -.icon-adjust:before { content: "\f042"; } -.icon-tint:before { content: "\f043"; } -.icon-edit:before { content: "\f044"; } -.icon-share:before { content: "\f045"; } -.icon-check:before { content: "\f046"; } -.icon-move:before { content: "\f047"; } -.icon-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { content: "\f049"; } -.icon-backward:before { content: "\f04a"; } -.icon-play:before { content: "\f04b"; } -.icon-pause:before { content: "\f04c"; } -.icon-stop:before { content: "\f04d"; } -.icon-forward:before { content: "\f04e"; } - -.icon-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { content: "\f051"; } -.icon-eject:before { content: "\f052"; } -.icon-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { content: "\f055"; } -.icon-minus-sign:before { content: "\f056"; } -.icon-remove-sign:before { content: "\f057"; } -.icon-ok-sign:before { content: "\f058"; } -.icon-question-sign:before { content: "\f059"; } -.icon-info-sign:before { content: "\f05a"; } -.icon-screenshot:before { content: "\f05b"; } -.icon-remove-circle:before { content: "\f05c"; } -.icon-ok-circle:before { content: "\f05d"; } -.icon-ban-circle:before { content: "\f05e"; } - -.icon-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before { content: "\f064"; } -.icon-resize-full:before { content: "\f065"; } -.icon-resize-small:before { content: "\f066"; } -.icon-plus:before { content: "\f067"; } -.icon-minus:before { content: "\f068"; } -.icon-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { content: "\f06a"; } -.icon-gift:before { content: "\f06b"; } -.icon-leaf:before { content: "\f06c"; } -.icon-fire:before { content: "\f06d"; } -.icon-eye-open:before { content: "\f06e"; } - -.icon-eye-close:before { content: "\f070"; } -.icon-warning-sign:before { content: "\f071"; } -.icon-plane:before { content: "\f072"; } -.icon-calendar:before { content: "\f073"; } -.icon-random:before { content: "\f074"; } -.icon-comment:before { content: "\f075"; } -.icon-magnet:before { content: "\f076"; } -.icon-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { content: "\f078"; } -.icon-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { content: "\f07b"; } -.icon-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { content: "\f07d"; } -.icon-resize-horizontal:before { content: "\f07e"; } - -.icon-bar-chart:before { content: "\f080"; } -.icon-twitter-sign:before { content: "\f081"; } -.icon-facebook-sign:before { content: "\f082"; } -.icon-camera-retro:before { content: "\f083"; } -.icon-key:before { content: "\f084"; } -.icon-cogs:before { content: "\f085"; } -.icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { content: "\f087"; } -.icon-thumbs-down:before { content: "\f088"; } -.icon-star-half:before { content: "\f089"; } -.icon-heart-empty:before { content: "\f08a"; } -.icon-signout:before { content: "\f08b"; } -.icon-linkedin-sign:before { content: "\f08c"; } -.icon-pushpin:before { content: "\f08d"; } -.icon-external-link:before { content: "\f08e"; } - -.icon-signin:before { content: "\f090"; } -.icon-trophy:before { content: "\f091"; } -.icon-github-sign:before { content: "\f092"; } -.icon-upload-alt:before { content: "\f093"; } -.icon-lemon:before { content: "\f094"; } -.icon-phone:before { content: "\f095"; } -.icon-check-empty:before { content: "\f096"; } -.icon-bookmark-empty:before { content: "\f097"; } -.icon-phone-sign:before { content: "\f098"; } -.icon-twitter:before { content: "\f099"; } -.icon-facebook:before { content: "\f09a"; } -.icon-github:before { content: "\f09b"; } -.icon-unlock:before { content: "\f09c"; } -.icon-credit-card:before { content: "\f09d"; } -.icon-rss:before { content: "\f09e"; } - -.icon-hdd:before { content: "\f0a0"; } -.icon-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { content: "\f0a2"; } -.icon-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { content: "\f0a4"; } -.icon-hand-left:before { content: "\f0a5"; } -.icon-hand-up:before { content: "\f0a6"; } -.icon-hand-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { content: "\f0ab"; } -.icon-globe:before { content: "\f0ac"; } -.icon-wrench:before { content: "\f0ad"; } -.icon-tasks:before { content: "\f0ae"; } - -.icon-filter:before { content: "\f0b0"; } -.icon-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { content: "\f0b2"; } - -.icon-group:before { content: "\f0c0"; } -.icon-link:before { content: "\f0c1"; } -.icon-cloud:before { content: "\f0c2"; } -.icon-beaker:before { content: "\f0c3"; } -.icon-cut:before { content: "\f0c4"; } -.icon-copy:before { content: "\f0c5"; } -.icon-paper-clip:before { content: "\f0c6"; } -.icon-save:before { content: "\f0c7"; } -.icon-sign-blank:before { content: "\f0c8"; } -.icon-reorder:before { content: "\f0c9"; } -.icon-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { content: "\f0cd"; } -.icon-table:before { content: "\f0ce"; } - -.icon-magic:before { content: "\f0d0"; } -.icon-truck:before { content: "\f0d1"; } -.icon-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { content: "\f0d3"; } -.icon-google-plus-sign:before { content: "\f0d4"; } -.icon-google-plus:before { content: "\f0d5"; } -.icon-money:before { content: "\f0d6"; } -.icon-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { content: "\f0da"; } -.icon-columns:before { content: "\f0db"; } -.icon-sort:before { content: "\f0dc"; } -.icon-sort-down:before { content: "\f0dd"; } -.icon-sort-up:before { content: "\f0de"; } - -.icon-envelope-alt:before { content: "\f0e0"; } -.icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before { content: "\f0e2"; } -.icon-legal:before { content: "\f0e3"; } -.icon-dashboard:before { content: "\f0e4"; } -.icon-comment-alt:before { content: "\f0e5"; } -.icon-comments-alt:before { content: "\f0e6"; } -.icon-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { content: "\f0e9"; } -.icon-paste:before { content: "\f0ea"; } -.icon-lightbulb:before { content: "\f0eb"; } -.icon-exchange:before { content: "\f0ec"; } -.icon-cloud-download:before { content: "\f0ed"; } -.icon-cloud-upload:before { content: "\f0ee"; } - -.icon-user-md:before { content: "\f0f0"; } -.icon-stethoscope:before { content: "\f0f1"; } -.icon-suitcase:before { content: "\f0f2"; } -.icon-bell-alt:before { content: "\f0f3"; } -.icon-coffee:before { content: "\f0f4"; } -.icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { content: "\f0f6"; } -.icon-building:before { content: "\f0f7"; } -.icon-hospital:before { content: "\f0f8"; } -.icon-ambulance:before { content: "\f0f9"; } -.icon-medkit:before { content: "\f0fa"; } -.icon-fighter-jet:before { content: "\f0fb"; } -.icon-beer:before { content: "\f0fc"; } -.icon-h-sign:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { content: "\f0fe"; } - -.icon-double-angle-left:before { content: "\f100"; } -.icon-double-angle-right:before { content: "\f101"; } -.icon-double-angle-up:before { content: "\f102"; } -.icon-double-angle-down:before { content: "\f103"; } -.icon-angle-left:before { content: "\f104"; } -.icon-angle-right:before { content: "\f105"; } -.icon-angle-up:before { content: "\f106"; } -.icon-angle-down:before { content: "\f107"; } -.icon-desktop:before { content: "\f108"; } -.icon-laptop:before { content: "\f109"; } -.icon-tablet:before { content: "\f10a"; } -.icon-mobile-phone:before { content: "\f10b"; } -.icon-circle-blank:before { content: "\f10c"; } -.icon-quote-left:before { content: "\f10d"; } -.icon-quote-right:before { content: "\f10e"; } - -.icon-spinner:before { content: "\f110"; } -.icon-circle:before { content: "\f111"; } -.icon-reply:before { content: "\f112"; } -.icon-github-alt:before { content: "\f113"; } -.icon-folder-close-alt:before { content: "\f114"; } -.icon-folder-open-alt:before { content: "\f115"; } diff --git a/ckan/public/base/less/forms.less b/ckan/public/base/less/forms.less index a7449a9980a..289439c291a 100644 --- a/ckan/public/base/less/forms.less +++ b/ckan/public/base/less/forms.less @@ -79,6 +79,14 @@ textarea { height: (@baseLineHeight*2)+1; } +.control-required { + color: @errorBorder; +} + +.form-actions .control-required-message { + float: left; +} + .form-actions { background: none; margin-left: -@gutterX; diff --git a/ckan/public/base/less/icons.less b/ckan/public/base/less/icons.less index 2abf55a11dc..d1481f2fe48 100644 --- a/ckan/public/base/less/icons.less +++ b/ckan/public/base/less/icons.less @@ -150,8 +150,6 @@ .ckan-icon-background-position(10, "formatMedium"); } -@import url('font-awesome.less'); - [class^="icon-"], [class*=" icon-"] { display: inline-block; diff --git a/ckan/public/base/less/media.less b/ckan/public/base/less/media.less index e13ecac93cc..f18c49d0e91 100644 --- a/ckan/public/base/less/media.less +++ b/ckan/public/base/less/media.less @@ -136,3 +136,7 @@ } } } + +.wide .media-item { + width: 186px; +} diff --git a/ckan/public/base/less/module.less b/ckan/public/base/less/module.less index 20ac16702e7..a575abcbda4 100644 --- a/ckan/public/base/less/module.less +++ b/ckan/public/base/less/module.less @@ -231,6 +231,10 @@ } } +.no-nav .module:last-child { + margin-top: 0; +} + .module-image { float: left; width: 50px; diff --git a/ckan/public/base/less/nav.less b/ckan/public/base/less/nav.less index f49b8101c29..44e9e7e7e62 100644 --- a/ckan/public/base/less/nav.less +++ b/ckan/public/base/less/nav.less @@ -1,9 +1,17 @@ -.nav-simple { +.nav-simple, +.nav-aside { .simple-list; // Adds border and padding. padding-bottom: 0; } -.nav-item > a { +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; +} + +.nav-item > a, +.nav-aside li a { color: @navLinkColor; font-size: @baseFontSize; line-height: @baseLineHeight; @@ -11,11 +19,13 @@ padding: 7px @gutterX; } -.nav-item.active { +.nav-item.active, +.nav-aside li.active { background-color: @navActiveBackgroundColor; } -.nav-item.active > a { +.nav-item.active > a, +.nav-aside li.active a { position: relative; color: @navItemActiveTextColor; background-color: @navItemActiveBackgroundColor; @@ -34,28 +44,33 @@ } } -.nav-item.active > a span { +.nav-item.active > a span, +.nav-aside li.active a span { white-space: nowrap; overflow:hidden; display:block; } -.module-narrow .nav-item > a { +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { padding-left: @gutterSmallX; padding-right: @gutterSmallX; position: relative; } -.module-narrow .nav-item.image { +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { position: relative; } -.module-narrow .nav-item.image > a { +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { padding-left: @gutterSmallX + 27; padding-right: @gutterSmallX + 27; } -.module-narrow .nav-item.image > img { +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { position: absolute; top: 50%; left: @gutterSmallX; diff --git a/ckan/public/base/less/toolbar.less b/ckan/public/base/less/toolbar.less index 2bc6ac2a0d5..b5b2d4adac8 100644 --- a/ckan/public/base/less/toolbar.less +++ b/ckan/public/base/less/toolbar.less @@ -93,3 +93,7 @@ margin-right: -7px; } } + +.no-nav .page-header { + .border-radius(3px 3px 0 0); +} diff --git a/ckan/public/base/test/index.html b/ckan/public/base/test/index.html index 1fc8e7eade8..40d8529f2c9 100644 --- a/ckan/public/base/test/index.html +++ b/ckan/public/base/test/index.html @@ -110,7 +110,7 @@ params = {}; } - return (new ckan.Client()).getTemplate(filename, params).error(function () { + return (new ckan.Client()).getTemplate(filename, params).fail(function () { throw new Error('Unable to load fixture: ' + filename); }).pipe(function (template) { var fixture = jQuery('#fixture').html(template); @@ -133,7 +133,12 @@ this.fixture.empty(); }); - mocha.run().globals(['ckan', 'setTimeout', 'setInterval', 'clearTimeout', 'clearInterval']); + if (window.mochaPhantomJS) { + mochaPhantomJS.run(); + } else { + mocha.run(); + } + diff --git a/ckan/public/base/test/spec/modules/custom-fields.spec.js b/ckan/public/base/test/spec/modules/custom-fields.spec.js index 6be05c9f5af..99088cc5e9e 100644 --- a/ckan/public/base/test/spec/modules/custom-fields.spec.js +++ b/ckan/public/base/test/spec/modules/custom-fields.spec.js @@ -66,7 +66,7 @@ describe('ckan.module.CustomFieldsModule()', function () { this.module.newField(); - assert.ok(jQuery.contains(this.module.el, element)); + assert.ok(jQuery.contains(this.module.el[0], element)); }); }); diff --git a/ckan/public/base/test/spec/modules/resource-upload-field.spec.js b/ckan/public/base/test/spec/modules/resource-upload-field.spec.js index ee8eb8513dc..dcf2ca0630e 100644 --- a/ckan/public/base/test/spec/modules/resource-upload-field.spec.js +++ b/ckan/public/base/test/spec/modules/resource-upload-field.spec.js @@ -30,7 +30,7 @@ describe('ckan.modules.ResourceUploadFieldModule()', function () { it('should append the upload field to the module element', function () { this.module.initialize(); - assert.ok(jQuery.contains(this.el, this.module.upload)); + assert.ok(jQuery.contains(this.el[0], this.module.upload[0])); }); it('should call .setupFileUpload()', function () { diff --git a/ckan/public/base/test/vendor/mocha.css b/ckan/public/base/test/vendor/mocha.css index cdfea1a28da..ae220938c48 100644 --- a/ckan/public/base/test/vendor/mocha.css +++ b/ckan/public/base/test/vendor/mocha.css @@ -1,7 +1,12 @@ +@charset "utf-8"; body { + margin:0; +} + +#mocha { font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif; - padding: 60px 50px; + margin: 60px 50px; } #mocha ul, #mocha li { @@ -37,6 +42,10 @@ body { font-size: .8em; } +#mocha .hidden { + display: none; +} + #mocha h2 { font-size: 12px; font-weight: normal; @@ -49,21 +58,12 @@ body { #mocha .test { margin-left: 15px; -} - -#mocha .test:hover h2::after { - position: relative; - top: 0; - right: -10px; - content: '(view source)'; - font-size: 12px; - font-family: arial; - color: #888; + overflow: hidden; } #mocha .test.pending:hover h2::after { content: '(pending)'; - font-family: arial; + font-family: arial, sans-serif; } #mocha .test.pass.medium .duration { @@ -130,10 +130,14 @@ body { #mocha .test pre.error { color: #c00; + max-height: 300px; + overflow: auto; } #mocha .test pre { - display: inline-block; + display: block; + float: left; + clear: left; font: 12px/1.5 monaco, monospace; margin: 5px; padding: 15px; @@ -141,42 +145,107 @@ body { border-bottom-color: #ddd; -webkit-border-radius: 3px; -webkit-box-shadow: 0 1px 3px #eee; + -moz-border-radius: 3px; + -moz-box-shadow: 0 1px 3px #eee; +} + +#mocha .test h2 { + position: relative; } -#error { +#mocha .test a.replay { + position: absolute; + top: 3px; + right: 0; + text-decoration: none; + vertical-align: middle; + display: block; + width: 15px; + height: 15px; + line-height: 15px; + text-align: center; + background: #eee; + font-size: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + -webkit-transition: opacity 200ms; + -moz-transition: opacity 200ms; + transition: opacity 200ms; + opacity: 0.3; + color: #888; +} + +#mocha .test:hover a.replay { + opacity: 1; +} + +#mocha-report.pass .test.fail { + display: none; +} + +#mocha-report.fail .test.pass { + display: none; +} + +#mocha-error { color: #c00; - font-size: 1.5 em; + font-size: 1.5em; font-weight: 100; letter-spacing: 1px; } -#stats { +#mocha-stats { position: fixed; top: 15px; right: 10px; font-size: 12px; margin: 0; color: #888; + z-index: 1; } -#stats .progress { +#mocha-stats .progress { float: right; padding-top: 0; } -#stats em { +#mocha-stats em { color: black; } -#stats li { +#mocha-stats a { + text-decoration: none; + color: inherit; +} + +#mocha-stats a:hover { + border-bottom: 1px solid #eee; +} + +#mocha-stats li { display: inline-block; margin: 0 5px; list-style: none; padding-top: 11px; } -code .comment { color: #ddd } -code .init { color: #2F6FAD } -code .string { color: #5890AD } -code .keyword { color: #8A6343 } -code .number { color: #2F6FAD } +#mocha-stats canvas { + width: 40px; + height: 40px; +} + +#mocha code .comment { color: #ddd } +#mocha code .init { color: #2F6FAD } +#mocha code .string { color: #5890AD } +#mocha code .keyword { color: #8A6343 } +#mocha code .number { color: #2F6FAD } + +@media screen and (max-device-width: 480px) { + #mocha { + margin: 60px 0px; + } + + #mocha #stats { + position: absolute; + } +} \ No newline at end of file diff --git a/ckan/public/base/test/vendor/mocha.js b/ckan/public/base/test/vendor/mocha.js index 05ad4d82f79..a55115a3131 100644 --- a/ckan/public/base/test/vendor/mocha.js +++ b/ckan/public/base/test/vendor/mocha.js @@ -1,6 +1,5 @@ ;(function(){ - // CommonJS require() function require(p){ @@ -32,11 +31,11 @@ require.register = function (path, fn){ require.relative = function (parent) { return function(p){ if ('.' != p.charAt(0)) return require(p); - + var path = parent.split('/') , segs = p.split('/'); path.pop(); - + for (var i = 0; i < segs.length; i++) { var seg = segs[i]; if ('..' == seg) path.pop(); @@ -52,12 +51,299 @@ require.register("browser/debug.js", function(module, exports, require){ module.exports = function(type){ return function(){ - } }; + }); // module: browser/debug.js require.register("browser/diff.js", function(module, exports, require){ +/* See license.txt for terms of usage */ + +/* + * Text diff implementation. + * + * This library supports the following APIS: + * JsDiff.diffChars: Character by character diff + * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace + * JsDiff.diffLines: Line based diff + * + * JsDiff.diffCss: Diff targeted at CSS content + * + * These methods are based on the implementation proposed in + * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986). + * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927 + */ +var JsDiff = (function() { + function clonePath(path) { + return { newPos: path.newPos, components: path.components.slice(0) }; + } + function removeEmpty(array) { + var ret = []; + for (var i = 0; i < array.length; i++) { + if (array[i]) { + ret.push(array[i]); + } + } + return ret; + } + function escapeHTML(s) { + var n = s; + n = n.replace(/&/g, "&"); + n = n.replace(//g, ">"); + n = n.replace(/"/g, """); + + return n; + } + + + var fbDiff = function(ignoreWhitespace) { + this.ignoreWhitespace = ignoreWhitespace; + }; + fbDiff.prototype = { + diff: function(oldString, newString) { + // Handle the identity case (this is due to unrolling editLength == 0 + if (newString == oldString) { + return [{ value: newString }]; + } + if (!newString) { + return [{ value: oldString, removed: true }]; + } + if (!oldString) { + return [{ value: newString, added: true }]; + } + + newString = this.tokenize(newString); + oldString = this.tokenize(oldString); + + var newLen = newString.length, oldLen = oldString.length; + var maxEditLength = newLen + oldLen; + var bestPath = [{ newPos: -1, components: [] }]; + + // Seed editLength = 0 + var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0); + if (bestPath[0].newPos+1 >= newLen && oldPos+1 >= oldLen) { + return bestPath[0].components; + } + + for (var editLength = 1; editLength <= maxEditLength; editLength++) { + for (var diagonalPath = -1*editLength; diagonalPath <= editLength; diagonalPath+=2) { + var basePath; + var addPath = bestPath[diagonalPath-1], + removePath = bestPath[diagonalPath+1]; + oldPos = (removePath ? removePath.newPos : 0) - diagonalPath; + if (addPath) { + // No one else is going to attempt to use this value, clear it + bestPath[diagonalPath-1] = undefined; + } + + var canAdd = addPath && addPath.newPos+1 < newLen; + var canRemove = removePath && 0 <= oldPos && oldPos < oldLen; + if (!canAdd && !canRemove) { + bestPath[diagonalPath] = undefined; + continue; + } + + // Select the diagonal that we want to branch from. We select the prior + // path whose position in the new string is the farthest from the origin + // and does not pass the bounds of the diff graph + if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) { + basePath = clonePath(removePath); + this.pushComponent(basePath.components, oldString[oldPos], undefined, true); + } else { + basePath = clonePath(addPath); + basePath.newPos++; + this.pushComponent(basePath.components, newString[basePath.newPos], true, undefined); + } + + var oldPos = this.extractCommon(basePath, newString, oldString, diagonalPath); + + if (basePath.newPos+1 >= newLen && oldPos+1 >= oldLen) { + return basePath.components; + } else { + bestPath[diagonalPath] = basePath; + } + } + } + }, + + pushComponent: function(components, value, added, removed) { + var last = components[components.length-1]; + if (last && last.added === added && last.removed === removed) { + // We need to clone here as the component clone operation is just + // as shallow array clone + components[components.length-1] = + {value: this.join(last.value, value), added: added, removed: removed }; + } else { + components.push({value: value, added: added, removed: removed }); + } + }, + extractCommon: function(basePath, newString, oldString, diagonalPath) { + var newLen = newString.length, + oldLen = oldString.length, + newPos = basePath.newPos, + oldPos = newPos - diagonalPath; + while (newPos+1 < newLen && oldPos+1 < oldLen && this.equals(newString[newPos+1], oldString[oldPos+1])) { + newPos++; + oldPos++; + + this.pushComponent(basePath.components, newString[newPos], undefined, undefined); + } + basePath.newPos = newPos; + return oldPos; + }, + + equals: function(left, right) { + var reWhitespace = /\S/; + if (this.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right)) { + return true; + } else { + return left == right; + } + }, + join: function(left, right) { + return left + right; + }, + tokenize: function(value) { + return value; + } + }; + + var CharDiff = new fbDiff(); + + var WordDiff = new fbDiff(true); + WordDiff.tokenize = function(value) { + return removeEmpty(value.split(/(\s+|\b)/)); + }; + + var CssDiff = new fbDiff(true); + CssDiff.tokenize = function(value) { + return removeEmpty(value.split(/([{}:;,]|\s+)/)); + }; + + var LineDiff = new fbDiff(); + LineDiff.tokenize = function(value) { + return value.split(/^/m); + }; + + return { + diffChars: function(oldStr, newStr) { return CharDiff.diff(oldStr, newStr); }, + diffWords: function(oldStr, newStr) { return WordDiff.diff(oldStr, newStr); }, + diffLines: function(oldStr, newStr) { return LineDiff.diff(oldStr, newStr); }, + + diffCss: function(oldStr, newStr) { return CssDiff.diff(oldStr, newStr); }, + + createPatch: function(fileName, oldStr, newStr, oldHeader, newHeader) { + var ret = []; + + ret.push("Index: " + fileName); + ret.push("==================================================================="); + ret.push("--- " + fileName + (typeof oldHeader === "undefined" ? "" : "\t" + oldHeader)); + ret.push("+++ " + fileName + (typeof newHeader === "undefined" ? "" : "\t" + newHeader)); + + var diff = LineDiff.diff(oldStr, newStr); + if (!diff[diff.length-1].value) { + diff.pop(); // Remove trailing newline add + } + diff.push({value: "", lines: []}); // Append an empty value to make cleanup easier + + function contextLines(lines) { + return lines.map(function(entry) { return ' ' + entry; }); + } + function eofNL(curRange, i, current) { + var last = diff[diff.length-2], + isLast = i === diff.length-2, + isLastOfType = i === diff.length-3 && (current.added === !last.added || current.removed === !last.removed); + + // Figure out if this is the last line for the given file and missing NL + if (!/\n$/.test(current.value) && (isLast || isLastOfType)) { + curRange.push('\\ No newline at end of file'); + } + } + + var oldRangeStart = 0, newRangeStart = 0, curRange = [], + oldLine = 1, newLine = 1; + for (var i = 0; i < diff.length; i++) { + var current = diff[i], + lines = current.lines || current.value.replace(/\n$/, "").split("\n"); + current.lines = lines; + + if (current.added || current.removed) { + if (!oldRangeStart) { + var prev = diff[i-1]; + oldRangeStart = oldLine; + newRangeStart = newLine; + + if (prev) { + curRange = contextLines(prev.lines.slice(-4)); + oldRangeStart -= curRange.length; + newRangeStart -= curRange.length; + } + } + curRange.push.apply(curRange, lines.map(function(entry) { return (current.added?"+":"-") + entry; })); + eofNL(curRange, i, current); + + if (current.added) { + newLine += lines.length; + } else { + oldLine += lines.length; + } + } else { + if (oldRangeStart) { + // Close out any changes that have been output (or join overlapping) + if (lines.length <= 8 && i < diff.length-2) { + // Overlapping + curRange.push.apply(curRange, contextLines(lines)); + } else { + // end the range and output + var contextSize = Math.min(lines.length, 4); + ret.push( + "@@ -" + oldRangeStart + "," + (oldLine-oldRangeStart+contextSize) + + " +" + newRangeStart + "," + (newLine-newRangeStart+contextSize) + + " @@"); + ret.push.apply(ret, curRange); + ret.push.apply(ret, contextLines(lines.slice(0, contextSize))); + if (lines.length <= 4) { + eofNL(ret, i, current); + } + + oldRangeStart = 0; newRangeStart = 0; curRange = []; + } + } + oldLine += lines.length; + newLine += lines.length; + } + } + + return ret.join('\n') + '\n'; + }, + + convertChangesToXML: function(changes){ + var ret = []; + for ( var i = 0; i < changes.length; i++) { + var change = changes[i]; + if (change.added) { + ret.push(""); + } else if (change.removed) { + ret.push(""); + } + + ret.push(escapeHTML(change.value)); + + if (change.added) { + ret.push(""); + } else if (change.removed) { + ret.push(""); + } + } + return ret.join(""); + } + }; +})(); + +if (typeof module !== "undefined") { + module.exports = JsDiff; +} }); // module: browser/diff.js @@ -386,8 +672,14 @@ exports.isatty = function(){ }; exports.getWindowSize = function(){ - return [window.innerHeight, window.innerWidth]; + if ('innerHeight' in global) { + return [global.innerHeight, global.innerWidth]; + } else { + // In a Web Worker, the DOM Window is not available. + return [640, 480]; + } }; + }); // module: browser/tty.js require.register("context.js", function(module, exports, require){ @@ -433,6 +725,19 @@ Context.prototype.timeout = function(ms){ return this; }; +/** + * Set test slowness threshold `ms`. + * + * @param {Number} ms + * @return {Context} self + * @api private + */ + +Context.prototype.slow = function(ms){ + this.runnable().slow(ms); + return this; +}; + /** * Inspect the context void of `._runnable`. * @@ -481,7 +786,9 @@ function Hook(title, fn) { * Inherit from `Runnable.prototype`. */ -Hook.prototype = new Runnable; +function F(){}; +F.prototype = Runnable.prototype; +Hook.prototype = new F; Hook.prototype.constructor = Hook; @@ -503,7 +810,6 @@ Hook.prototype.error = function(err){ this._error = err; }; - }); // module: hook.js require.register("interfaces/bdd.js", function(module, exports, require){ @@ -517,7 +823,7 @@ var Suite = require('../suite') /** * BDD-style interface: - * + * * describe('Array', function(){ * describe('#indexOf()', function(){ * it('should return -1 when not present', function(){ @@ -529,18 +835,13 @@ var Suite = require('../suite') * }); * }); * }); - * + * */ module.exports = function(suite){ var suites = [suite]; - suite.on('pre-require', function(context){ - - // noop variants - - context.xdescribe = function(){}; - context.xit = function(){}; + suite.on('pre-require', function(context, file, mocha){ /** * Execute before running tests. @@ -579,12 +880,36 @@ module.exports = function(suite){ * and callback `fn` containing nested suites * and/or tests. */ - + context.describe = context.context = function(title, fn){ var suite = Suite.create(suites[0], title); suites.unshift(suite); - fn(); + fn.call(suite); suites.shift(); + return suite; + }; + + /** + * Pending describe. + */ + + context.xdescribe = + context.xcontext = + context.describe.skip = function(title, fn){ + var suite = Suite.create(suites[0], title); + suite.pending = true; + suites.unshift(suite); + fn.call(suite); + suites.shift(); + }; + + /** + * Exclusive suite. + */ + + context.describe.only = function(title, fn){ + var suite = context.describe(title, fn); + mocha.grep(suite.fullTitle()); }; /** @@ -594,7 +919,30 @@ module.exports = function(suite){ */ context.it = context.specify = function(title, fn){ - suites[0].addTest(new Test(title, fn)); + var suite = suites[0]; + if (suite.pending) var fn = null; + var test = new Test(title, fn); + suite.addTest(test); + return test; + }; + + /** + * Exclusive test-case. + */ + + context.it.only = function(title, fn){ + var test = context.it(title, fn); + mocha.grep(test.fullTitle()); + }; + + /** + * Pending test case. + */ + + context.xit = + context.xspecify = + context.it.skip = function(title){ + context.it(title); }; }); }; @@ -612,19 +960,19 @@ var Suite = require('../suite') /** * TDD-style interface: - * + * * exports.Array = { * '#indexOf()': { * 'should return -1 when the value is not present': function(){ - * + * * }, * * 'should return the correct index when the value is present': function(){ - * + * * } * } * }; - * + * */ module.exports = function(suite){ @@ -662,6 +1010,7 @@ module.exports = function(suite){ } } }; + }); // module: interfaces/exports.js require.register("interfaces/index.js", function(module, exports, require){ @@ -684,33 +1033,33 @@ var Suite = require('../suite') /** * QUnit-style interface: - * + * * suite('Array'); - * + * * test('#length', function(){ * var arr = [1,2,3]; * ok(arr.length == 3); * }); - * + * * test('#indexOf()', function(){ * var arr = [1,2,3]; * ok(arr.indexOf(1) == 0); * ok(arr.indexOf(2) == 1); * ok(arr.indexOf(3) == 2); * }); - * + * * suite('String'); - * + * * test('#length', function(){ * ok('foo'.length == 3); * }); - * + * */ module.exports = function(suite){ var suites = [suite]; - suite.on('pre-require', function(context){ + suite.on('pre-require', function(context, file, mocha){ /** * Execute before running tests. @@ -747,11 +1096,21 @@ module.exports = function(suite){ /** * Describe a "suite" with the given `title`. */ - + context.suite = function(title){ if (suites.length > 1) suites.shift(); var suite = Suite.create(suites[0], title); suites.unshift(suite); + return suite; + }; + + /** + * Exclusive test-case. + */ + + context.suite.only = function(title, fn){ + var suite = context.suite(title, fn); + mocha.grep(suite.fullTitle()); }; /** @@ -761,7 +1120,26 @@ module.exports = function(suite){ */ context.test = function(title, fn){ - suites[0].addTest(new Test(title, fn)); + var test = new Test(title, fn); + suites[0].addTest(test); + return test; + }; + + /** + * Exclusive test-case. + */ + + context.test.only = function(title, fn){ + var test = context.test(title, fn); + mocha.grep(test.fullTitle()); + }; + + /** + * Pending test case. + */ + + context.test.skip = function(title){ + context.test(title); }; }); }; @@ -785,7 +1163,7 @@ var Suite = require('../suite') * suiteSetup(function(){ * * }); - * + * * test('should return -1 when not present', function(){ * * }); @@ -805,7 +1183,7 @@ var Suite = require('../suite') module.exports = function(suite){ var suites = [suite]; - suite.on('pre-require', function(context){ + suite.on('pre-require', function(context, file, mocha){ /** * Execute before each test case. @@ -848,8 +1226,29 @@ module.exports = function(suite){ context.suite = function(title, fn){ var suite = Suite.create(suites[0], title); suites.unshift(suite); - fn(); + fn.call(suite); suites.shift(); + return suite; + }; + + /** + * Pending suite. + */ + context.suite.skip = function(title, fn) { + var suite = Suite.create(suites[0], title); + suite.pending = true; + suites.unshift(suite); + fn.call(suite); + suites.shift(); + }; + + /** + * Exclusive test-case. + */ + + context.suite.only = function(title, fn){ + var suite = context.suite(title, fn); + mocha.grep(suite.fullTitle()); }; /** @@ -859,7 +1258,28 @@ module.exports = function(suite){ */ context.test = function(title, fn){ - suites[0].addTest(new Test(title, fn)); + var suite = suites[0]; + if (suite.pending) var fn = null; + var test = new Test(title, fn); + suite.addTest(test); + return test; + }; + + /** + * Exclusive test-case. + */ + + context.test.only = function(title, fn){ + var test = context.test(title, fn); + mocha.grep(test.fullTitle()); + }; + + /** + * Pending test case. + */ + + context.test.skip = function(title){ + context.test(title); }; }); }; @@ -877,7 +1297,8 @@ require.register("mocha.js", function(module, exports, require){ * Module dependencies. */ -var path = require('browser/path'); +var path = require('browser/path') + , utils = require('./utils'); /** * Expose `Mocha`. @@ -889,7 +1310,7 @@ exports = module.exports = Mocha; * Expose internals. */ -exports.utils = require('./utils'); +exports.utils = utils; exports.interfaces = require('./interfaces'); exports.reporters = require('./reporters'); exports.Runnable = require('./runnable'); @@ -920,6 +1341,8 @@ function image(name) { * - `reporter` reporter instance, defaults to `mocha.reporters.Dot` * - `globals` array of accepted globals * - `timeout` timeout in milliseconds + * - `bail` bail on the first test failure + * - `slow` milliseconds to wait before considering a test slow * - `ignoreLeaks` ignore global leaks * - `grep` string or regexp to filter tests with * @@ -934,10 +1357,25 @@ function Mocha(options) { this.grep(options.grep); this.suite = new exports.Suite('', new exports.Context); this.ui(options.ui); + this.bail(options.bail); this.reporter(options.reporter); - if (options.timeout) this.suite.timeout(options.timeout); + if (options.timeout) this.timeout(options.timeout); + if (options.slow) this.slow(options.slow); } +/** + * Enable or disable bailing on the first failure. + * + * @param {Boolean} [bail] + * @api public + */ + +Mocha.prototype.bail = function(bail){ + if (0 == arguments.length) bail = true; + this.suite.bail(bail); + return this; +}; + /** * Add test `file`. * @@ -951,16 +1389,24 @@ Mocha.prototype.addFile = function(file){ }; /** - * Set reporter to `name`, defaults to "dot". + * Set reporter to `reporter`, defaults to "dot". * - * @param {String} name + * @param {String|Function} reporter name or constructor * @api public */ -Mocha.prototype.reporter = function(name){ - name = name || 'dot'; - this._reporter = require('./reporters/' + name); - if (!this._reporter) throw new Error('invalid reporter "' + name + '"'); +Mocha.prototype.reporter = function(reporter){ + if ('function' == typeof reporter) { + this._reporter = reporter; + } else { + reporter = reporter || 'dot'; + try { + this._reporter = require('./reporters/' + reporter); + } catch (err) { + this._reporter = require(reporter); + } + if (!this._reporter) throw new Error('invalid reporter "' + reporter + '"'); + } return this; }; @@ -985,13 +1431,16 @@ Mocha.prototype.ui = function(name){ * @api private */ -Mocha.prototype.loadFiles = function(){ +Mocha.prototype.loadFiles = function(fn){ + var self = this; var suite = this.suite; + var pending = this.files.length; this.files.forEach(function(file){ file = path.resolve(file); - suite.emit('pre-require', global, file); - suite.emit('require', require(file), file); - suite.emit('post-require', global, file); + suite.emit('pre-require', global, file, self); + suite.emit('require', require(file), file, self); + suite.emit('post-require', global, file, self); + --pending || (fn && fn()); }); }; @@ -1001,7 +1450,7 @@ Mocha.prototype.loadFiles = function(){ * @api private */ -Mocha.prototype.growl = function(runner, reporter) { +Mocha.prototype._growl = function(runner, reporter) { var notify = require('growl'); runner.on('end', function(){ @@ -1020,20 +1469,120 @@ Mocha.prototype.growl = function(runner, reporter) { }; /** - * Add regexp to grep for to the options object + * Add regexp to grep, if `re` is a string it is escaped. * - * @param {RegExp} or {String} re + * @param {RegExp|String} re * @return {Mocha} * @api public */ Mocha.prototype.grep = function(re){ this.options.grep = 'string' == typeof re - ? new RegExp(re) + ? new RegExp(utils.escapeRegexp(re)) : re; return this; }; +/** + * Invert `.grep()` matches. + * + * @return {Mocha} + * @api public + */ + +Mocha.prototype.invert = function(){ + this.options.invert = true; + return this; +}; + +/** + * Ignore global leaks. + * + * @param {Boolean} ignore + * @return {Mocha} + * @api public + */ + +Mocha.prototype.ignoreLeaks = function(ignore){ + this.options.ignoreLeaks = !!ignore; + return this; +}; + +/** + * Enable global leak checking. + * + * @return {Mocha} + * @api public + */ + +Mocha.prototype.checkLeaks = function(){ + this.options.ignoreLeaks = false; + return this; +}; + +/** + * Enable growl support. + * + * @return {Mocha} + * @api public + */ + +Mocha.prototype.growl = function(){ + this.options.growl = true; + return this; +}; + +/** + * Ignore `globals` array or string. + * + * @param {Array|String} globals + * @return {Mocha} + * @api public + */ + +Mocha.prototype.globals = function(globals){ + this.options.globals = (this.options.globals || []).concat(globals); + return this; +}; + +/** + * Set the timeout in milliseconds. + * + * @param {Number} timeout + * @return {Mocha} + * @api public + */ + +Mocha.prototype.timeout = function(timeout){ + this.suite.timeout(timeout); + return this; +}; + +/** + * Set slowness threshold in milliseconds. + * + * @param {Number} slow + * @return {Mocha} + * @api public + */ + +Mocha.prototype.slow = function(slow){ + this.suite.slow(slow); + return this; +}; + +/** + * Makes all tests async (accepting a callback) + * + * @return {Mocha} + * @api public + */ + +Mocha.prototype.asyncOnly = function(){ + this.options.asyncOnly = true; + return this; +}; + /** * Run tests and invoke `fn()` when complete. * @@ -1043,20 +1592,105 @@ Mocha.prototype.grep = function(re){ */ Mocha.prototype.run = function(fn){ - this.loadFiles(); + if (this.files.length) this.loadFiles(); var suite = this.suite; var options = this.options; var runner = new exports.Runner(suite); var reporter = new this._reporter(runner); - runner.ignoreLeaks = options.ignoreLeaks; - if (options.grep) runner.grep(options.grep); + runner.ignoreLeaks = false !== options.ignoreLeaks; + runner.asyncOnly = options.asyncOnly; + if (options.grep) runner.grep(options.grep, options.invert); if (options.globals) runner.globals(options.globals); - if (options.growl) this.growl(runner, reporter); + if (options.growl) this._growl(runner, reporter); return runner.run(fn); }; }); // module: mocha.js +require.register("ms.js", function(module, exports, require){ + +/** + * Helpers. + */ + +var s = 1000; +var m = s * 60; +var h = m * 60; +var d = h * 24; + +/** + * Parse or format the given `val`. + * + * @param {String|Number} val + * @return {String|Number} + * @api public + */ + +module.exports = function(val){ + if ('string' == typeof val) return parse(val); + return format(val); +} + +/** + * Parse the given `str` and return milliseconds. + * + * @param {String} str + * @return {Number} + * @api private + */ + +function parse(str) { + var m = /^((?:\d+)?\.?\d+) *(ms|seconds?|s|minutes?|m|hours?|h|days?|d|years?|y)?$/i.exec(str); + if (!m) return; + var n = parseFloat(m[1]); + var type = (m[2] || 'ms').toLowerCase(); + switch (type) { + case 'years': + case 'year': + case 'y': + return n * 31557600000; + case 'days': + case 'day': + case 'd': + return n * 86400000; + case 'hours': + case 'hour': + case 'h': + return n * 3600000; + case 'minutes': + case 'minute': + case 'm': + return n * 60000; + case 'seconds': + case 'second': + case 's': + return n * 1000; + case 'ms': + return n; + } +} + +/** + * Format the given `ms`. + * + * @param {Number} ms + * @return {String} + * @api public + */ + +function format(ms) { + if (ms == d) return Math.round(ms / d) + ' day'; + if (ms > d) return Math.round(ms / d) + ' days'; + if (ms == h) return Math.round(ms / h) + ' hour'; + if (ms > h) return Math.round(ms / h) + ' hours'; + if (ms == m) return Math.round(ms / m) + ' minute'; + if (ms > m) return Math.round(ms / m) + ' minutes'; + if (ms == s) return Math.round(ms / s) + ' second'; + if (ms > s) return Math.round(ms / s) + ' seconds'; + return ms + ' ms'; +} +}); // module: ms.js + require.register("reporters/base.js", function(module, exports, require){ /** @@ -1064,7 +1698,8 @@ require.register("reporters/base.js", function(module, exports, require){ */ var tty = require('browser/tty') - , diff = require('browser/diff'); + , diff = require('browser/diff') + , ms = require('../ms'); /** * Save timer references to avoid Sinon interfering (see GH-237). @@ -1120,6 +1755,23 @@ exports.colors = { , 'diff removed': 41 }; +/** + * Default symbol map. + */ + +exports.symbols = { + ok: '✓', + err: '✖', + dot: '․' +}; + +// With node.js on Windows: use symbols available in terminal default fonts +if ('win32' == process.platform) { + exports.symbols.ok = '\u221A'; + exports.symbols.err = '\u00D7'; + exports.symbols.dot = '.'; +} + /** * Color `str` with the given `type`, * allowing colors to be disabled, @@ -1134,7 +1786,7 @@ exports.colors = { var color = exports.color = function(type, str) { if (!exports.useColors) return str; - return '\033[' + exports.colors[type] + 'm' + str + '\033[0m'; + return '\u001b[' + exports.colors[type] + 'm' + str + '\u001b[0m'; }; /** @@ -1157,33 +1809,26 @@ exports.window = { exports.cursor = { hide: function(){ - process.stdout.write('\033[?25l'); + process.stdout.write('\u001b[?25l'); }, show: function(){ - process.stdout.write('\033[?25h'); + process.stdout.write('\u001b[?25h'); }, deleteLine: function(){ - process.stdout.write('\033[2K'); + process.stdout.write('\u001b[2K'); }, beginningOfLine: function(){ - process.stdout.write('\033[0G'); + process.stdout.write('\u001b[0G'); }, CR: function(){ exports.cursor.deleteLine(); exports.cursor.beginningOfLine(); } -}; - -/** - * A test is considered slow if it - * exceeds the following value in milliseconds. - */ - -exports.slow = 75; +}; /** * Outut the given `failures` as a list. @@ -1207,14 +1852,24 @@ exports.list = function(failures){ , index = stack.indexOf(message) + message.length , msg = stack.slice(0, index) , actual = err.actual - , expected = err.expected; + , expected = err.expected + , escape = true; + + // uncaught + if (err.uncaught) { + msg = 'Uncaught ' + msg; + } + + // explicitly show diff + if (err.showDiff && sameType(actual, expected)) { + escape = false; + err.actual = actual = stringify(actual); + err.expected = expected = stringify(expected); + } // actual / expected diff if ('string' == typeof actual && 'string' == typeof expected) { - var len = Math.max(actual.length, expected.length); - - if (len < 20) msg = errorDiff(err, 'Chars'); - else msg = errorDiff(err, 'Words'); + msg = errorDiff(err, 'Words', escape); // linenos var lines = msg.split('\n'); @@ -1269,6 +1924,8 @@ function Base(runner) { if (!runner) return; this.runner = runner; + runner.stats = stats; + runner.on('start', function(){ stats.start = new Date; }); @@ -1286,8 +1943,8 @@ function Base(runner) { runner.on('pass', function(test){ stats.passes = stats.passes || 0; - var medium = exports.slow / 2; - test.speed = test.duration > exports.slow + var medium = test.slow() / 2; + test.speed = test.duration > test.slow() ? 'slow' : test.duration > medium ? 'medium' @@ -1321,48 +1978,38 @@ function Base(runner) { */ Base.prototype.epilogue = function(){ - var stats = this.stats - , fmt - , tests; + var stats = this.stats; + var tests; + var fmt; console.log(); - function pluralize(n) { - return 1 == n ? 'test' : 'tests'; + // passes + fmt = color('bright pass', ' ') + + color('green', ' %d passing') + + color('light', ' (%s)'); + + console.log(fmt, + stats.passes || 0, + ms(stats.duration)); + + // pending + if (stats.pending) { + fmt = color('pending', ' ') + + color('pending', ' %d pending'); + + console.log(fmt, stats.pending); } - // failure + // failures if (stats.failures) { - fmt = color('bright fail', ' ✖') - + color('fail', ' %d of %d %s failed') - + color('light', ':') + fmt = color('fail', ' %d failing'); console.error(fmt, - stats.failures, - this.runner.total, - pluralize(this.runner.total)); + stats.failures); Base.list(this.failures); console.error(); - return; - } - - // pass - fmt = color('bright pass', ' ✔') - + color('green', ' %d %s complete') - + color('light', ' (%dms)'); - - console.log(fmt, - stats.tests || 0, - pluralize(stats.tests), - stats.duration); - - // pending - if (stats.pending) { - fmt = color('pending', ' •') - + color('pending', ' %d %s pending'); - - console.log(fmt, stats.pending, pluralize(stats.pending)); } console.log(); @@ -1390,9 +2037,14 @@ function pad(str, len) { * @api private */ -function errorDiff(err, type) { +function errorDiff(err, type, escape) { return diff['diff' + type](err.actual, err.expected).map(function(str){ - if (/^(\n+)$/.test(str.value)) str.value = Array(++RegExp.$1.length).join(''); + if (escape) { + str.value = str.value + .replace(/\t/g, '') + .replace(/\r/g, '') + .replace(/\n/g, '\n'); + } if (str.added) return colorLines('diff added', str.value); if (str.removed) return colorLines('diff removed', str.value); return str.value; @@ -1414,6 +2066,34 @@ function colorLines(name, str) { }).join('\n'); } +/** + * Stringify `obj`. + * + * @param {Mixed} obj + * @return {String} + * @api private + */ + +function stringify(obj) { + if (obj instanceof RegExp) return obj.toString(); + return JSON.stringify(obj, null, 2); +} + +/** + * Check that a / b have the same type. + * + * @param {Object} a + * @param {Object} b + * @return {Boolean} + * @api private + */ + +function sameType(a, b) { + a = Object.prototype.toString.call(a); + b = Object.prototype.toString.call(b); + return a == b; +} + }); // module: reporters/base.js require.register("reporters/doc.js", function(module, exports, require){ @@ -1455,7 +2135,7 @@ function Doc(runner) { ++indents; console.log('%s
', indent()); ++indents; - console.log('%s

%s

', indent(), suite.title); + console.log('%s

%s

', indent(), utils.escape(suite.title)); console.log('%s
', indent()); }); @@ -1468,7 +2148,7 @@ function Doc(runner) { }); runner.on('pass', function(test){ - console.log('%s
%s
', indent(), test.title); + console.log('%s
%s
', indent(), utils.escape(test.title)); var code = utils.escape(utils.clean(test.fn.toString())); console.log('%s 
%s
', indent(), code); }); @@ -1511,21 +2191,21 @@ function Dot(runner) { }); runner.on('pending', function(test){ - process.stdout.write(color('pending', '.')); + process.stdout.write(color('pending', Base.symbols.dot)); }); runner.on('pass', function(test){ if (++n % width == 0) process.stdout.write('\n '); if ('slow' == test.speed) { - process.stdout.write(color('bright yellow', '.')); + process.stdout.write(color('bright yellow', Base.symbols.dot)); } else { - process.stdout.write(color(test.speed, '.')); + process.stdout.write(color(test.speed, Base.symbols.dot)); } }); runner.on('fail', function(test, err){ if (++n % width == 0) process.stdout.write('\n '); - process.stdout.write(color('fail', '.')); + process.stdout.write(color('fail', Base.symbols.dot)); }); runner.on('end', function(){ @@ -1538,7 +2218,9 @@ function Dot(runner) { * Inherit from `Base.prototype`. */ -Dot.prototype = new Base; +function F(){}; +F.prototype = Base.prototype; +Dot.prototype = new F; Dot.prototype.constructor = Dot; }); // module: reporters/dot.js @@ -1628,10 +2310,10 @@ exports = module.exports = HTML; * Stats template. */ -var statsTemplate = '
    ' +var statsTemplate = '
      ' + '
      • ' - + '
    • passes: 0
      • ' - + '
    • failures: 0
      • ' + + '
    • passes: 0
      • ' + + '
    • failures: 0
      • ' + '
    • duration: 0s
      • ' + '
    '; @@ -1642,31 +2324,56 @@ var statsTemplate = '
      ' * @api public */ -function HTML(runner) { +function HTML(runner, root) { Base.call(this, runner); var self = this , stats = this.stats , total = runner.total - , root = document.getElementById('mocha') , stat = fragment(statsTemplate) , items = stat.getElementsByTagName('li') , passes = items[1].getElementsByTagName('em')[0] + , passesLink = items[1].getElementsByTagName('a')[0] , failures = items[2].getElementsByTagName('em')[0] + , failuresLink = items[2].getElementsByTagName('a')[0] , duration = items[3].getElementsByTagName('em')[0] , canvas = stat.getElementsByTagName('canvas')[0] - , report = fragment('
        ') + , report = fragment('
          ') , stack = [report] , progress , ctx + root = root || document.getElementById('mocha'); + if (canvas.getContext) { + var ratio = window.devicePixelRatio || 1; + canvas.style.width = canvas.width; + canvas.style.height = canvas.height; + canvas.width *= ratio; + canvas.height *= ratio; ctx = canvas.getContext('2d'); + ctx.scale(ratio, ratio); progress = new Progress; } if (!root) return error('#mocha div missing, add it to your document'); + // pass toggle + on(passesLink, 'click', function(){ + unhide(); + var name = /pass/.test(report.className) ? '' : ' pass'; + report.className = report.className.replace(/fail|pass/g, '') + name; + if (report.className.trim()) hideSuitesWithout('test pass'); + }); + + // failure toggle + on(failuresLink, 'click', function(){ + unhide(); + var name = /fail/.test(report.className) ? '' : ' fail'; + report.className = report.className.replace(/fail|pass/g, '') + name; + if (report.className.trim()) hideSuitesWithout('test fail'); + }); + root.appendChild(stat); root.appendChild(report); @@ -1676,8 +2383,8 @@ function HTML(runner) { if (suite.root) return; // suite - var url = location.protocol + '//' + location.host + location.pathname + '?grep=^' + utils.escapeRegexp(suite.fullTitle()); - var el = fragment('

        • %s

          • ', url, suite.title); + var url = '?grep=' + encodeURIComponent(suite.fullTitle()); + var el = fragment('

        • %s

          • ', url, escape(suite.title)); // container stack[0].appendChild(el); @@ -1691,12 +2398,12 @@ function HTML(runner) { }); runner.on('fail', function(test, err){ - if ('hook' == test.type || err.uncaught) runner.emit('test end', test); + if ('hook' == test.type) runner.emit('test end', test); }); runner.on('test end', function(test){ // TODO: add to stats - var percent = stats.tests / total * 100 | 0; + var percent = stats.tests / this.total * 100 | 0; if (progress) progress.update(percent).draw(ctx); // update stats @@ -1707,11 +2414,11 @@ function HTML(runner) { // test if ('passed' == test.state) { - var el = fragment('

        • %e%ems

          • ', test.speed, test.title, test.duration); + var el = fragment('

        • %e%ems ‣

          • ', test.speed, test.title, test.duration, encodeURIComponent(test.fullTitle())); } else if (test.pending) { var el = fragment('

        • %e

          • ', test.title); } else { - var el = fragment('

        • %e

          • ', test.title); + var el = fragment('

        • %e ‣

          • ', test.title, encodeURIComponent(test.fullTitle())); var str = test.err.stack || test.err.toString(); // FF / Opera do not add the message @@ -1732,23 +2439,23 @@ function HTML(runner) { } // toggle code - var h2 = el.getElementsByTagName('h2')[0]; - - on(h2, 'click', function(){ - pre.style.display = 'none' == pre.style.display - ? 'block' - : 'none'; - }); - - // code // TODO: defer if (!test.pending) { + var h2 = el.getElementsByTagName('h2')[0]; + + on(h2, 'click', function(){ + pre.style.display = 'none' == pre.style.display + ? 'block' + : 'none'; + }); + var pre = fragment('
          %e
          ', utils.clean(test.fn.toString())); el.appendChild(pre); pre.style.display = 'none'; } - stack[0].appendChild(el); + // Don't call .appendChild if #mocha-report was already .shift()'ed off the stack. + if (stack[0]) stack[0].appendChild(el); }); } @@ -1757,7 +2464,7 @@ function HTML(runner) { */ function error(msg) { - document.body.appendChild(fragment('
          %s
          ', msg)); + document.body.appendChild(fragment('
          %s
          ', msg)); } /** @@ -1779,6 +2486,30 @@ function fragment(html) { return div.firstChild; } +/** + * Check for suites that do not have elements + * with `classname`, and hide them. + */ + +function hideSuitesWithout(classname) { + var suites = document.getElementsByClassName('suite'); + for (var i = 0; i < suites.length; i++) { + var els = suites[i].getElementsByClassName(classname); + if (0 == els.length) suites[i].className += ' hidden'; + } +} + +/** + * Unhide .hidden suites. + */ + +function unhide() { + var els = document.getElementsByClassName('suite hidden'); + for (var i = 0; i < els.length; ++i) { + els[i].className = els[i].className.replace('suite hidden', 'suite'); + } +} + /** * Set `el` text to `str`. */ @@ -1802,6 +2533,7 @@ function on(el, event, fn) { el.attachEvent('on' + event, fn); } } + }); // module: reporters/html.js require.register("reporters/index.js", function(module, exports, require){ @@ -1815,13 +2547,15 @@ exports.HTML = require('./html'); exports.List = require('./list'); exports.Min = require('./min'); exports.Spec = require('./spec'); +exports.Nyan = require('./nyan'); +exports.XUnit = require('./xunit'); +exports.Markdown = require('./markdown'); exports.Progress = require('./progress'); exports.Landing = require('./landing'); exports.JSONCov = require('./json-cov'); exports.HTMLCov = require('./html-cov'); exports.JSONStream = require('./json-stream'); -exports.XUnit = require('./xunit') -exports.Teamcity = require('./teamcity') +exports.Teamcity = require('./teamcity'); }); // module: reporters/index.js @@ -1908,6 +2642,10 @@ function map(cov) { ret.sloc += data.sloc; } + ret.files.sort(function(a, b) { + return a.filename.localeCompare(b.filename); + }); + if (ret.sloc > 0) { ret.coverage = (ret.hits / ret.sloc) * 100; } @@ -2191,14 +2929,14 @@ function Landing(runner) { } // render landing strip - stream.write('\033[4F\n\n'); + stream.write('\u001b[4F\n\n'); stream.write(runway()); stream.write('\n '); stream.write(color('runway', Array(col).join('⋅'))); stream.write(plane) stream.write(color('runway', Array(width - col).join('⋅') + '\n')); stream.write(runway()); - stream.write('\033[0m'); + stream.write('\u001b[0m'); }); runner.on('end', function(){ @@ -2212,7 +2950,9 @@ function Landing(runner) { * Inherit from `Base.prototype`. */ -Landing.prototype = new Base; +function F(){}; +F.prototype = Base.prototype; +Landing.prototype = new F; Landing.prototype.constructor = Landing; }); // module: reporters/landing.js @@ -2262,7 +3002,7 @@ function List(runner) { }); runner.on('pass', function(test){ - var fmt = color('checkmark', ' ✓') + var fmt = color('checkmark', ' '+Base.symbols.dot) + color('pass', ' %s: ') + color(test.speed, '%dms'); cursor.CR(); @@ -2281,7 +3021,9 @@ function List(runner) { * Inherit from `Base.prototype`. */ -List.prototype = new Base; +function F(){}; +F.prototype = Base.prototype; +List.prototype = new F; List.prototype.constructor = List; @@ -2313,7 +3055,6 @@ function Markdown(runner) { var self = this , stats = this.stats - , total = runner.total , level = 0 , buf = ''; @@ -2358,7 +3099,7 @@ function Markdown(runner) { runner.on('suite', function(suite){ ++level; var slug = utils.slug(suite.fullTitle()); - buf += '' + '\n'; + buf += '' + '\n'; buf += title(suite.title) + '\n'; }); @@ -2383,6 +3124,7 @@ function Markdown(runner) { }); // module: reporters/markdown.js require.register("reporters/min.js", function(module, exports, require){ + /** * Module dependencies. */ @@ -2404,12 +3146,12 @@ exports = module.exports = Min; function Min(runner) { Base.call(this, runner); - + runner.on('start', function(){ // clear screen - process.stdout.write('\033[2J'); + process.stdout.write('\u001b[2J'); // set cursor position - process.stdout.write('\033[1;3H'); + process.stdout.write('\u001b[1;3H'); }); runner.on('end', this.epilogue.bind(this)); @@ -2419,13 +3161,15 @@ function Min(runner) { * Inherit from `Base.prototype`. */ -Min.prototype = new Base; +function F(){}; +F.prototype = Base.prototype; +Min.prototype = new F; Min.prototype.constructor = Min; + }); // module: reporters/min.js require.register("reporters/nyan.js", function(module, exports, require){ - /** * Module dependencies. */ @@ -2514,7 +3258,7 @@ NyanCat.prototype.drawScoreboard = function(){ function draw(color, n) { write(' '); - write('\033[' + color + 'm' + n + '\033[0m'); + write('\u001b[' + color + 'm' + n + '\u001b[0m'); write('\n'); } @@ -2553,7 +3297,7 @@ NyanCat.prototype.drawRainbow = function(){ var self = this; this.trajectories.forEach(function(line, index) { - write('\033[' + self.scoreboardWidth + 'C'); + write('\u001b[' + self.scoreboardWidth + 'C'); write(line.join('')); write('\n'); }); @@ -2571,44 +3315,39 @@ NyanCat.prototype.drawRainbow = function(){ NyanCat.prototype.drawNyanCat = function(status) { var self = this; var startWidth = this.scoreboardWidth + this.trajectories[0].length; - - [0, 1, 2, 3].forEach(function(index) { - write('\033[' + startWidth + 'C'); - - switch (index) { - case 0: - write('_,------,'); - write('\n'); - break; - case 1: - var padding = self.tick ? ' ' : ' '; - write('_|' + padding + '/\\_/\\ '); - write('\n'); - break; - case 2: - var padding = self.tick ? '_' : '__'; - var tail = self.tick ? '~' : '^'; - var face; - switch (status) { - case 'pass': - face = '( ^ .^)'; - break; - case 'fail': - face = '( o .o)'; - break; - default: - face = '( - .-)'; - } - write(tail + '|' + padding + face + ' '); - write('\n'); - break; - case 3: - var padding = self.tick ? ' ' : ' '; - write(padding + '"" "" '); - write('\n'); - break; - } - }); + var color = '\u001b[' + startWidth + 'C'; + var padding = ''; + + write(color); + write('_,------,'); + write('\n'); + + write(color); + padding = self.tick ? ' ' : ' '; + write('_|' + padding + '/\\_/\\ '); + write('\n'); + + write(color); + padding = self.tick ? '_' : '__'; + var tail = self.tick ? '~' : '^'; + var face; + switch (status) { + case 'pass': + face = '( ^ .^)'; + break; + case 'fail': + face = '( o .o)'; + break; + default: + face = '( - .-)'; + } + write(tail + '|' + padding + face + ' '); + write('\n'); + + write(color); + padding = self.tick ? ' ' : ' '; + write(padding + '"" "" '); + write('\n'); this.cursorUp(this.numberOfLines); }; @@ -2621,7 +3360,7 @@ NyanCat.prototype.drawNyanCat = function(status) { */ NyanCat.prototype.cursorUp = function(n) { - write('\033[' + n + 'A'); + write('\u001b[' + n + 'A'); }; /** @@ -2632,7 +3371,7 @@ NyanCat.prototype.cursorUp = function(n) { */ NyanCat.prototype.cursorDown = function(n) { - write('\033[' + n + 'B'); + write('\u001b[' + n + 'B'); }; /** @@ -2668,7 +3407,7 @@ NyanCat.prototype.generateColors = function(){ NyanCat.prototype.rainbowify = function(str){ var color = this.rainbowColors[this.colorIndex % this.rainbowColors.length]; this.colorIndex += 1; - return '\033[38;5;' + color + 'm' + str + '\033[0m'; + return '\u001b[38;5;' + color + 'm' + str + '\u001b[0m'; }; /** @@ -2683,7 +3422,9 @@ function write(string) { * Inherit from `Base.prototype`. */ -NyanCat.prototype = new Base; +function F(){}; +F.prototype = Base.prototype; +NyanCat.prototype = new F; NyanCat.prototype.constructor = NyanCat; @@ -2733,7 +3474,7 @@ function Progress(runner, options) { // default chars options.open = options.open || '['; options.complete = options.complete || '▬'; - options.incomplete = options.incomplete || '⋅'; + options.incomplete = options.incomplete || Base.symbols.dot; options.close = options.close || ']'; options.verbose = false; @@ -2752,7 +3493,7 @@ function Progress(runner, options) { , i = width - n; cursor.CR(); - process.stdout.write('\033[J'); + process.stdout.write('\u001b[J'); process.stdout.write(color('progress', ' ' + options.open)); process.stdout.write(Array(n).join(options.complete)); process.stdout.write(Array(i).join(options.incomplete)); @@ -2775,7 +3516,9 @@ function Progress(runner, options) { * Inherit from `Base.prototype`. */ -Progress.prototype = new Base; +function F(){}; +F.prototype = Base.prototype; +Progress.prototype = new F; Progress.prototype.constructor = Progress; @@ -2842,13 +3585,13 @@ function Spec(runner) { runner.on('pass', function(test){ if ('fast' == test.speed) { var fmt = indent() - + color('checkmark', ' ✓') + + color('checkmark', ' ' + Base.symbols.ok) + color('pass', ' %s '); cursor.CR(); console.log(fmt, test.title); } else { var fmt = indent() - + color('checkmark', ' ✓') + + color('checkmark', ' ' + Base.symbols.ok) + color('pass', ' %s ') + color(test.speed, '(%dms)'); cursor.CR(); @@ -2868,7 +3611,9 @@ function Spec(runner) { * Inherit from `Base.prototype`. */ -Spec.prototype = new Base; +function F(){}; +F.prototype = Base.prototype; +Spec.prototype = new F; Spec.prototype.constructor = Spec; @@ -2902,10 +3647,12 @@ function TAP(runner) { var self = this , stats = this.stats - , total = runner.total - , n = 1; + , n = 1 + , passes = 0 + , failures = 0; runner.on('start', function(){ + var total = runner.grepTotal(runner.suite); console.log('%d..%d', 1, total); }); @@ -2918,12 +3665,20 @@ function TAP(runner) { }); runner.on('pass', function(test){ + passes++; console.log('ok %d %s', n, title(test)); }); runner.on('fail', function(test, err){ + failures++; console.log('not ok %d %s', n, title(test)); - console.log(err.stack.replace(/^/gm, ' ')); + if (err.stack) console.log(err.stack.replace(/^/gm, ' ')); + }); + + runner.on('end', function(){ + console.log('# tests ' + (passes + failures)); + console.log('# pass ' + passes); + console.log('# fail ' + failures); }); } @@ -3049,7 +3804,11 @@ function XUnit(runner) { , tests = [] , self = this; - runner.on('test end', function(test){ + runner.on('pass', function(test){ + tests.push(test); + }); + + runner.on('fail', function(test){ tests.push(test); }); @@ -3059,13 +3818,13 @@ function XUnit(runner) { , tests: stats.tests , failures: stats.failures , errors: stats.failures - , skip: stats.tests - stats.failures - stats.passes + , skipped: stats.tests - stats.failures - stats.passes , timestamp: (new Date).toUTCString() - , time: stats.duration / 1000 + , time: (stats.duration / 1000) || 0 }, false)); tests.forEach(test); - console.log(''); + console.log(''); }); } @@ -3073,7 +3832,9 @@ function XUnit(runner) { * Inherit from `Base.prototype`. */ -XUnit.prototype = new Base; +function F(){}; +F.prototype = Base.prototype; +XUnit.prototype = new F; XUnit.prototype.constructor = XUnit; @@ -3134,7 +3895,8 @@ require.register("runnable.js", function(module, exports, require){ */ var EventEmitter = require('browser/events').EventEmitter - , debug = require('browser/debug')('runnable'); + , debug = require('browser/debug')('mocha:runnable') + , milliseconds = require('./ms'); /** * Save timer references to avoid Sinon interfering (see GH-237). @@ -3146,6 +3908,12 @@ var Date = global.Date , clearTimeout = global.clearTimeout , clearInterval = global.clearInterval; +/** + * Object#toString(). + */ + +var toString = Object.prototype.toString; + /** * Expose `Runnable`. */ @@ -3166,6 +3934,7 @@ function Runnable(title, fn) { this.async = fn && fn.length; this.sync = ! this.async; this._timeout = 2000; + this._slow = 75; this.timedOut = false; } @@ -3173,26 +3942,45 @@ function Runnable(title, fn) { * Inherit from `EventEmitter.prototype`. */ -Runnable.prototype = new EventEmitter; +function F(){}; +F.prototype = EventEmitter.prototype; +Runnable.prototype = new F; Runnable.prototype.constructor = Runnable; /** * Set & get timeout `ms`. * - * @param {Number} ms + * @param {Number|String} ms * @return {Runnable|Number} ms or self * @api private */ Runnable.prototype.timeout = function(ms){ if (0 == arguments.length) return this._timeout; + if ('string' == typeof ms) ms = milliseconds(ms); debug('timeout %d', ms); this._timeout = ms; if (this.timer) this.resetTimeout(); return this; }; +/** + * Set & get slow `ms`. + * + * @param {Number|String} ms + * @return {Runnable|Number} ms or self + * @api private + */ + +Runnable.prototype.slow = function(ms){ + if (0 === arguments.length) return this._slow; + if ('string' == typeof ms) ms = milliseconds(ms); + debug('timeout %d', ms); + this._slow = ms; + return this; +}; + /** * Return the full title generated by recursively * concatenating the parent's full title. @@ -3238,16 +4026,14 @@ Runnable.prototype.inspect = function(){ */ Runnable.prototype.resetTimeout = function(){ - var self = this - , ms = this.timeout(); + var self = this; + var ms = this.timeout() || 1e9; this.clearTimeout(); - if (ms) { - this.timer = setTimeout(function(){ - self.callback(new Error('timeout of ' + ms + 'ms exceeded')); - self.timedOut = true; - }, ms); - } + this.timer = setTimeout(function(){ + self.callback(new Error('timeout of ' + ms + 'ms exceeded')); + self.timedOut = true; + }, ms); }; /** @@ -3278,16 +4064,16 @@ Runnable.prototype.run = function(fn){ } // called multiple times - function multiple() { + function multiple(err) { if (emitted) return; emitted = true; - self.emit('error', new Error('done() called multiple times')); + self.emit('error', err || new Error('done() called multiple times')); } // finished function done(err) { if (self.timedOut) return; - if (finished) return multiple(); + if (finished) return multiple(err); self.clearTimeout(); self.duration = new Date - start; finished = true; @@ -3301,7 +4087,7 @@ Runnable.prototype.run = function(fn){ if (this.async) { try { this.fn.call(ctx, function(err){ - if (err instanceof Error) return done(err); + if (err instanceof Error || toString.call(err) === "[object Error]") return done(err); if (null != err) return done(new Error('done() invoked with non-Error: ' + err)); done(); }); @@ -3310,7 +4096,11 @@ Runnable.prototype.run = function(fn){ } return; } - + + if (this.asyncOnly) { + return done(new Error('--async-only option in use without declaring `done()`')); + } + // sync try { if (!this.pending) this.fn.call(ctx); @@ -3324,18 +4114,29 @@ Runnable.prototype.run = function(fn){ }); // module: runnable.js require.register("runner.js", function(module, exports, require){ - /** * Module dependencies. */ var EventEmitter = require('browser/events').EventEmitter - , debug = require('browser/debug')('runner') + , debug = require('browser/debug')('mocha:runner') , Test = require('./test') , utils = require('./utils') , filter = utils.filter - , keys = utils.keys - , noop = function(){}; + , keys = utils.keys; + +/** + * Non-enumerable globals. + */ + +var globals = [ + 'setTimeout', + 'clearTimeout', + 'setInterval', + 'clearInterval', + 'XMLHttpRequest', + 'Date' +]; /** * Expose `Runner`. @@ -3358,6 +4159,7 @@ module.exports = Runner; * - `hook end` (hook) hook complete * - `pass` (test) test passed * - `fail` (test, err) test failed + * - `pending` (test) test pending * * @api public */ @@ -3371,14 +4173,25 @@ function Runner(suite) { this.on('test end', function(test){ self.checkGlobals(test); }); this.on('hook end', function(hook){ self.checkGlobals(hook); }); this.grep(/.*/); - this.globals(utils.keys(global).concat(['errno'])); + this.globals(this.globalProps().concat(['errno'])); } +/** + * Wrapper for setImmediate, process.nextTick, or browser polyfill. + * + * @param {Function} fn + * @api private + */ + +Runner.immediately = global.setImmediate || process.nextTick; + /** * Inherit from `EventEmitter.prototype`. */ -Runner.prototype = new EventEmitter; +function F(){}; +F.prototype = EventEmitter.prototype; +Runner.prototype = new F; Runner.prototype.constructor = Runner; @@ -3387,13 +4200,15 @@ Runner.prototype.constructor = Runner; * with number of tests matched. * * @param {RegExp} re + * @param {Boolean} invert * @return {Runner} for chaining * @api public */ -Runner.prototype.grep = function(re){ +Runner.prototype.grep = function(re, invert){ debug('grep %s', re); this._grep = re; + this._invert = invert; this.total = this.grepTotal(this.suite); return this; }; @@ -3412,12 +4227,33 @@ Runner.prototype.grepTotal = function(suite) { var total = 0; suite.eachTest(function(test){ - if (self._grep.test(test.fullTitle())) total++; + var match = self._grep.test(test.fullTitle()); + if (self._invert) match = !match; + if (match) total++; }); return total; }; +/** + * Return a list of global properties. + * + * @return {Array} + * @api private + */ + +Runner.prototype.globalProps = function() { + var props = utils.keys(global); + + // non-enumerables + for (var i = 0; i < globals.length; ++i) { + if (~utils.indexOf(props, globals[i])) continue; + props.push(globals[i]); + } + + return props; +}; + /** * Allow the given `arr` of globals. * @@ -3443,8 +4279,16 @@ Runner.prototype.globals = function(arr){ Runner.prototype.checkGlobals = function(test){ if (this.ignoreLeaks) return; - var leaks = filterLeaks(this._globals); + var ok = this._globals; + var globals = this.globalProps(); + var isNode = process.kill; + var leaks; + // check length - 2 ('errno' and 'location' globals) + if (isNode && 1 == ok.length - globals.length) return + else if (2 == ok.length - globals.length) return; + + leaks = filterLeaks(ok, globals); this._globals = this._globals.concat(leaks); if (leaks.length > 1) { @@ -3465,9 +4309,11 @@ Runner.prototype.checkGlobals = function(test){ Runner.prototype.fail = function(test, err){ ++this.failures; test.state = 'failed'; + if ('string' == typeof err) { err = new Error('the string "' + err + '" was thrown, throw an Error :)'); } + this.emit('fail', test, err); }; @@ -3500,15 +4346,17 @@ Runner.prototype.failHook = function(hook, err){ Runner.prototype.hook = function(name, fn){ var suite = this.suite , hooks = suite['_' + name] - , ms = suite._timeout , self = this , timer; function next(i) { var hook = hooks[i]; if (!hook) return fn(); + if (self.failures && suite.bail()) return fn(); self.currentRunnable = hook; + hook.ctx.currentTest = self.test; + self.emit('hook', hook); hook.on('error', function(err){ @@ -3521,11 +4369,12 @@ Runner.prototype.hook = function(name, fn){ if (testError) self.fail(self.test, testError); if (err) return self.failHook(hook, err); self.emit('hook end', hook); + delete hook.ctx.currentTest; next(++i); }); } - process.nextTick(function(){ + Runner.immediately(function(){ next(0); }); }; @@ -3617,6 +4466,8 @@ Runner.prototype.runTest = function(fn){ var test = this.test , self = this; + if (this.asyncOnly) test.asyncOnly = true; + try { test.on('error', function(err){ self.fail(test, err); @@ -3638,7 +4489,7 @@ Runner.prototype.runTest = function(fn){ Runner.prototype.runTests = function(suite, fn){ var self = this - , tests = suite.tests + , tests = suite.tests.slice() , test; function next(err) { @@ -3652,7 +4503,9 @@ Runner.prototype.runTests = function(suite, fn){ if (!test) return fn(); // grep - if (!self._grep.test(test.fullTitle())) return next(); + var match = self._grep.test(test.fullTitle()); + if (self._invert) match = !match; + if (!match) return next(); // pending if (test.pending) { @@ -3733,9 +4586,9 @@ Runner.prototype.runSuite = function(suite, fn){ */ Runner.prototype.uncaught = function(err){ - debug('uncaught exception'); + debug('uncaught exception %s', err.message); var runnable = this.currentRunnable; - if ('failed' == runnable.state) return; + if (!runnable || 'failed' == runnable.state) return; runnable.clearTimeout(); err.uncaught = true; this.fail(runnable, err); @@ -3764,13 +4617,12 @@ Runner.prototype.run = function(fn){ var self = this , fn = fn || function(){}; - debug('start'); - - // uncaught callback - function uncaught(err) { + function uncaught(err){ self.uncaught(err); } + debug('start'); + // callback this.on('end', function(){ debug('end'); @@ -3795,19 +4647,25 @@ Runner.prototype.run = function(fn){ * Filter leaks with the given globals flagged as `ok`. * * @param {Array} ok + * @param {Array} globals * @return {Array} * @api private */ -function filterLeaks(ok) { - return filter(keys(global), function(key){ +function filterLeaks(ok, globals) { + return filter(globals, function(key){ + // Firefox and Chrome exposes iframes as index inside the window object + if (/^d+/.test(key)) return false; var matched = filter(ok, function(ok){ if (~ok.indexOf('*')) return 0 == key.indexOf(ok.split('*')[0]); + // Opera and IE expose global variables for HTML element IDs (issue #243) + if (/^mocha-/.test(key)) return true; return key == ok; }); return matched.length == 0 && (!global.navigator || 'onerror' !== key); }); } + }); // module: runner.js require.register("suite.js", function(module, exports, require){ @@ -3817,7 +4675,8 @@ require.register("suite.js", function(module, exports, require){ */ var EventEmitter = require('browser/events').EventEmitter - , debug = require('browser/debug')('suite') + , debug = require('browser/debug')('mocha:suite') + , milliseconds = require('./ms') , utils = require('./utils') , Hook = require('./hook'); @@ -3843,6 +4702,7 @@ exports = module.exports = Suite; exports.create = function(parent, title){ var suite = new Suite(title, parent.ctx); suite.parent = parent; + if (parent.pending) suite.pending = true; title = suite.fullTitle(); parent.addSuite(suite); return suite; @@ -3862,12 +4722,14 @@ function Suite(title, ctx) { this.ctx = ctx; this.suites = []; this.tests = []; + this.pending = false; this._beforeEach = []; this._beforeAll = []; this._afterEach = []; this._afterAll = []; this.root = !title; this._timeout = 2000; + this._slow = 75; this._bail = false; } @@ -3875,7 +4737,9 @@ function Suite(title, ctx) { * Inherit from `EventEmitter.prototype`. */ -Suite.prototype = new EventEmitter; +function F(){}; +F.prototype = EventEmitter.prototype; +Suite.prototype = new F; Suite.prototype.constructor = Suite; @@ -3891,6 +4755,7 @@ Suite.prototype.clone = function(){ debug('clone'); suite.ctx = this.ctx; suite.timeout(this.timeout()); + suite.slow(this.slow()); suite.bail(this.bail()); return suite; }; @@ -3905,12 +4770,28 @@ Suite.prototype.clone = function(){ Suite.prototype.timeout = function(ms){ if (0 == arguments.length) return this._timeout; - if (String(ms).match(/s$/)) ms = parseFloat(ms) * 1000; + if ('string' == typeof ms) ms = milliseconds(ms); debug('timeout %d', ms); this._timeout = parseInt(ms, 10); return this; }; +/** + * Set slow `ms` or short-hand such as "2s". + * + * @param {Number|String} ms + * @return {Suite|Number} for chaining + * @api private + */ + +Suite.prototype.slow = function(ms){ + if (0 === arguments.length) return this._slow; + if ('string' == typeof ms) ms = milliseconds(ms); + debug('slow %d', ms); + this._slow = ms; + return this; +}; + /** * Sets whether to bail after first error. * @@ -3935,9 +4816,11 @@ Suite.prototype.bail = function(bail){ */ Suite.prototype.beforeAll = function(fn){ + if (this.pending) return this; var hook = new Hook('"before all" hook', fn); hook.parent = this; hook.timeout(this.timeout()); + hook.slow(this.slow()); hook.ctx = this.ctx; this._beforeAll.push(hook); this.emit('beforeAll', hook); @@ -3953,9 +4836,11 @@ Suite.prototype.beforeAll = function(fn){ */ Suite.prototype.afterAll = function(fn){ + if (this.pending) return this; var hook = new Hook('"after all" hook', fn); hook.parent = this; hook.timeout(this.timeout()); + hook.slow(this.slow()); hook.ctx = this.ctx; this._afterAll.push(hook); this.emit('afterAll', hook); @@ -3971,9 +4856,11 @@ Suite.prototype.afterAll = function(fn){ */ Suite.prototype.beforeEach = function(fn){ + if (this.pending) return this; var hook = new Hook('"before each" hook', fn); hook.parent = this; hook.timeout(this.timeout()); + hook.slow(this.slow()); hook.ctx = this.ctx; this._beforeEach.push(hook); this.emit('beforeEach', hook); @@ -3989,9 +4876,11 @@ Suite.prototype.beforeEach = function(fn){ */ Suite.prototype.afterEach = function(fn){ + if (this.pending) return this; var hook = new Hook('"after each" hook', fn); hook.parent = this; hook.timeout(this.timeout()); + hook.slow(this.slow()); hook.ctx = this.ctx; this._afterEach.push(hook); this.emit('afterEach', hook); @@ -4009,6 +4898,7 @@ Suite.prototype.afterEach = function(fn){ Suite.prototype.addSuite = function(suite){ suite.parent = this; suite.timeout(this.timeout()); + suite.slow(this.slow()); suite.bail(this.bail()); this.suites.push(suite); this.emit('suite', suite); @@ -4026,6 +4916,7 @@ Suite.prototype.addSuite = function(suite){ Suite.prototype.addTest = function(test){ test.parent = this; test.timeout(this.timeout()); + test.slow(this.slow()); test.ctx = this.ctx; this.tests.push(test); this.emit('test', test); @@ -4113,7 +5004,9 @@ function Test(title, fn) { * Inherit from `Runnable.prototype`. */ -Test.prototype = new Runnable; +function F(){}; +F.prototype = Runnable.prototype; +Test.prototype = new F; Test.prototype.constructor = Test; @@ -4128,7 +5021,7 @@ require.register("utils.js", function(module, exports, require){ var fs = require('browser/fs') , path = require('browser/path') , join = path.join - , debug = require('browser/debug')('watch'); + , debug = require('browser/debug')('mocha:watch'); /** * Ignored directories. @@ -4144,7 +5037,7 @@ var ignore = ['node_modules', '.git']; * @api private */ -exports.escape = function(html) { +exports.escape = function(html){ return String(html) .replace(/&/g, '&') .replace(/"/g, '"') @@ -4161,7 +5054,7 @@ exports.escape = function(html) { * @api private */ -exports.forEach = function(arr, fn, scope) { +exports.forEach = function(arr, fn, scope){ for (var i = 0, l = arr.length; i < l; i++) fn.call(scope, arr[i], i); }; @@ -4175,7 +5068,7 @@ exports.forEach = function(arr, fn, scope) { * @api private */ -exports.indexOf = function (arr, obj, start) { +exports.indexOf = function(arr, obj, start){ for (var i = start || 0, l = arr.length; i < l; i++) { if (arr[i] === obj) return i; @@ -4185,19 +5078,18 @@ exports.indexOf = function (arr, obj, start) { /** * Array#reduce (<=IE8) - * + * * @param {Array} array * @param {Function} fn * @param {Object} initial value - * @param {Object} scope * @api private */ -exports.reduce = function(arr, fn, val, scope) { +exports.reduce = function(arr, fn, val){ var rval = val; for (var i = 0, l = arr.length; i < l; i++) { - rval = fn.call(scope, rval, arr[i], i, arr); + rval = fn(rval, arr[i], i, arr); } return rval; @@ -4208,17 +5100,15 @@ exports.reduce = function(arr, fn, val, scope) { * * @param {Array} array * @param {Function} fn - * @param {Object} scope * @api private */ -exports.filter = function(arr, fn, scope) { +exports.filter = function(arr, fn){ var ret = []; for (var i = 0, l = arr.length; i < l; i++) { var val = arr[i]; - if (fn.call(scope, val, i, arr)) - ret.push(val); + if (fn(val, i, arr)) ret.push(val); } return ret; @@ -4321,12 +5211,12 @@ exports.clean = function(str) { .replace(/^function *\(.*\) *{/, '') .replace(/\s+\}$/, ''); - var spaces = str.match(/^\n?( *)/)[1].length - , re = new RegExp('^ {' + spaces + '}', 'gm'); + var whitespace = str.match(/^\n?(\s*)/)[1] + , re = new RegExp('^' + whitespace, 'gm'); str = str.replace(re, ''); - return str.trim(); + return exports.trim(str); }; /** @@ -4340,48 +5230,98 @@ exports.clean = function(str) { exports.escapeRegexp = function(str){ return str.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&"); }; -}); // module: utils.js + /** - * Node shims. + * Trim the given `str`. * - * These are meant only to allow - * mocha.js to run untouched, not - * to allow running node code in - * the browser. + * @param {String} str + * @return {String} + * @api private */ -process = {}; -process.exit = function(status){}; -process.stdout = {}; -global = window; +exports.trim = function(str){ + return str.replace(/^\s+|\s+$/g, ''); +}; /** - * next tick implementation. + * Parse the given `qs`. + * + * @param {String} qs + * @return {Object} + * @api private */ -process.nextTick = (function(){ - // postMessage behaves badly on IE8 - if (window.ActiveXObject || !window.postMessage) { - return function(fn){ fn() }; - } +exports.parseQuery = function(qs){ + return exports.reduce(qs.replace('?', '').split('&'), function(obj, pair){ + var i = pair.indexOf('=') + , key = pair.slice(0, i) + , val = pair.slice(++i); - // based on setZeroTimeout by David Baron - // - http://dbaron.org/log/20100309-faster-timeouts - var timeouts = [] - , name = 'mocha-zero-timeout' + obj[key] = decodeURIComponent(val); + return obj; + }, {}); +}; - window.addEventListener('message', function(e){ - if (e.source == window && e.data == name) { - if (e.stopPropagation) e.stopPropagation(); - if (timeouts.length) timeouts.shift()(); - } - }, true); +/** + * Highlight the given string of `js`. + * + * @param {String} js + * @return {String} + * @api private + */ + +function highlight(js) { + return js + .replace(//g, '>') + .replace(/\/\/(.*)/gm, '//$1') + .replace(/('.*?')/gm, '$1') + .replace(/(\d+\.\d+)/gm, '$1') + .replace(/(\d+)/gm, '$1') + .replace(/\bnew *(\w+)/gm, 'new $1') + .replace(/\b(function|new|throw|return|var|if|else)\b/gm, '$1') +} + +/** + * Highlight the contents of tag `name`. + * + * @param {String} name + * @api private + */ - return function(fn){ - timeouts.push(fn); - window.postMessage(name, '*'); +exports.highlightTags = function(name) { + var code = document.getElementsByTagName(name); + for (var i = 0, len = code.length; i < len; ++i) { + code[i].innerHTML = highlight(code[i].innerHTML); } -})(); +}; + +}); // module: utils.js +// The global object is "self" in Web Workers. +global = (function() { return this; })(); + +/** + * Save timer references to avoid Sinon interfering (see GH-237). + */ + +var Date = global.Date; +var setTimeout = global.setTimeout; +var setInterval = global.setInterval; +var clearTimeout = global.clearTimeout; +var clearInterval = global.clearInterval; + +/** + * Node shims. + * + * These are meant only to allow + * mocha.js to run untouched, not + * to allow running node code in + * the browser. + */ + +var process = {}; +process.exit = function(status){}; +process.stdout = {}; /** * Remove uncaughtException listener. @@ -4389,7 +5329,7 @@ process.nextTick = (function(){ process.removeListener = function(e){ if ('uncaughtException' == e) { - window.onerror = null; + global.onerror = function() {}; } }; @@ -4399,7 +5339,9 @@ process.removeListener = function(e){ process.on = function(e, fn){ if ('uncaughtException' == e) { - window.onerror = fn; + global.onerror = function(err, url, line){ + fn(new Error(err + ' (' + url + ':' + line + ')')); + }; } }; @@ -4407,88 +5349,80 @@ process.on = function(e, fn){ * Expose mocha. */ -window.mocha = require('mocha'); +var Mocha = global.Mocha = require('mocha'), + mocha = global.mocha = new Mocha({ reporter: 'html' }); -// boot -;(function(){ - var utils = mocha.utils - , options = {} - - mocha.suite = new mocha.Suite('', new mocha.Context()); - - /** - * Highlight the given string of `js`. - */ - - function highlight(js) { - return js - .replace(//g, '>') - .replace(/\/\/(.*)/gm, '//$1') - .replace(/('.*?')/gm, '$1') - .replace(/(\d+\.\d+)/gm, '$1') - .replace(/(\d+)/gm, '$1') - .replace(/\bnew *(\w+)/gm, 'new $1') - .replace(/\b(function|new|throw|return|var|if|else)\b/gm, '$1') +var immediateQueue = [] + , immediateTimeout; + +function timeslice() { + var immediateStart = new Date().getTime(); + while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) { + immediateQueue.shift()(); + } + if (immediateQueue.length) { + immediateTimeout = setTimeout(timeslice, 0); + } else { + immediateTimeout = null; } +} - /** - * Highlight code contents. - */ +/** + * High-performance override of Runner.immediately. + */ - function highlightCode() { - var code = document.getElementsByTagName('code'); - for (var i = 0, len = code.length; i < len; ++i) { - code[i].innerHTML = highlight(code[i].innerHTML); - } +Mocha.Runner.immediately = function(callback) { + immediateQueue.push(callback); + if (!immediateTimeout) { + immediateTimeout = setTimeout(timeslice, 0); } +}; - /** - * Parse the given `qs`. - */ +/** + * Override ui to ensure that the ui functions are initialized. + * Normally this would happen in Mocha.prototype.loadFiles. + */ - function parse(qs) { - return utils.reduce(qs.replace('?', '').split('&'), function(obj, pair){ - var i = pair.indexOf('=') - , key = pair.slice(0, i) - , val = pair.slice(++i); +mocha.ui = function(ui){ + Mocha.prototype.ui.call(this, ui); + this.suite.emit('pre-require', global, null, this); + return this; +}; - obj[key] = decodeURIComponent(val); - return obj; - }, {}); - } +/** + * Setup mocha with the given setting options. + */ - /** - * Setup mocha with the given setting options. - */ +mocha.setup = function(opts){ + if ('string' == typeof opts) opts = { ui: opts }; + for (var opt in opts) this[opt](opts[opt]); + return this; +}; - mocha.setup = function(opts){ - if ('string' === typeof opts) options.ui = opts; - else options = opts; +/** + * Run mocha, returning the Runner. + */ - ui = mocha.interfaces[options.ui]; - if (!ui) throw new Error('invalid mocha interface "' + ui + '"'); - if (options.timeout) mocha.suite.timeout(options.timeout); - ui(mocha.suite); - mocha.suite.emit('pre-require', window); - }; +mocha.run = function(fn){ + var options = mocha.options; + mocha.globals('location'); - /** - * Run mocha, returning the Runner. - */ - - mocha.run = function(fn){ - mocha.suite.emit('run'); - var runner = new mocha.Runner(mocha.suite); - var Reporter = options.reporter || mocha.reporters.HTML; - var reporter = new Reporter(runner); - var query = parse(window.location.search || ""); - if (query.grep) runner.grep(new RegExp(query.grep)); - if (options.ignoreLeaks) runner.ignoreLeaks = true; - if (options.globals) runner.globals(options.globals); - runner.globals(['location']); - runner.on('end', highlightCode); - return runner.run(fn); - }; -})(); + var query = Mocha.utils.parseQuery(global.location.search || ''); + if (query.grep) mocha.grep(query.grep); + if (query.invert) mocha.invert(); + + return Mocha.prototype.run.call(mocha, function(){ + // The DOM Document is not available in Web Workers. + if (global.document) { + Mocha.utils.highlightTags('code'); + } + if (fn) fn(); + }); +}; + +/** + * Expose the process shim. + */ + +Mocha.process = process; })(); \ No newline at end of file diff --git a/ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png b/ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png old mode 100755 new mode 100644 diff --git a/ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png b/ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png old mode 100755 new mode 100644 diff --git a/ckan/public/base/vendor/bootstrap/js/.jshintrc b/ckan/public/base/vendor/bootstrap/js/.jshintrc deleted file mode 100755 index e0722690bd7..00000000000 --- a/ckan/public/base/vendor/bootstrap/js/.jshintrc +++ /dev/null @@ -1,12 +0,0 @@ -{ - "validthis": true, - "laxcomma" : true, - "laxbreak" : true, - "browser" : true, - "eqnull" : true, - "debug" : true, - "devel" : true, - "boss" : true, - "expr" : true, - "asi" : true -} \ No newline at end of file diff --git a/ckan/public/base/vendor/bootstrap/js/bootstrap.js b/ckan/public/base/vendor/bootstrap/js/bootstrap.js index a81171b42f2..643e71cdf08 100644 --- a/ckan/public/base/vendor/bootstrap/js/bootstrap.js +++ b/ckan/public/base/vendor/bootstrap/js/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.3.0 + * bootstrap-transition.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -58,7 +58,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.0 + * bootstrap-alert.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -156,7 +156,7 @@ $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) }(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.3.0 + * bootstrap-button.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -260,7 +260,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.0 + * bootstrap-carousel.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -336,7 +336,7 @@ if (!e) this.paused = true if (this.$element.find('.next, .prev').length && $.support.transition.end) { this.$element.trigger($.support.transition.end) - this.cycle() + this.cycle(true) } clearInterval(this.interval) this.interval = null @@ -466,7 +466,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.0 + * bootstrap-collapse.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -632,7 +632,7 @@ }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.0 + * bootstrap-dropdown.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -685,6 +685,10 @@ clearMenus() if (!isActive) { + if ('ontouchstart' in document.documentElement) { + // if mobile we we use a backdrop because click events don't delegate + $('
          ').insertBefore($(this)).on('click', clearMenus) + } $parent.toggleClass('open') } @@ -737,6 +741,7 @@ } function clearMenus() { + $('.dropdown-backdrop').remove() $(toggle).each(function () { getParent($(this)).removeClass('open') }) @@ -791,13 +796,12 @@ $(document) .on('click.dropdown.data-api', clearMenus) .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('.dropdown-menu', function (e) { e.stopPropagation() }) .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(window.jQuery); /* ========================================================= - * bootstrap-modal.js v2.3.0 + * bootstrap-modal.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -946,7 +950,7 @@ } , removeBackdrop: function () { - this.$backdrop.remove() + this.$backdrop && this.$backdrop.remove() this.$backdrop = null } @@ -1044,7 +1048,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-tooltip.js v2.3.0 + * bootstrap-tooltip.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -1125,7 +1129,15 @@ } , enter: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) + var defaults = $.fn[this.type].defaults + , options = {} + , self + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }, this) + + self = $(e.currentTarget)[this.type](options).data(this.type) if (!self.options.delay || !self.options.delay.show) return self.show() @@ -1397,7 +1409,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-popover.js v2.3.0 + * bootstrap-popover.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1511,7 +1523,7 @@ }(window.jQuery); /* ============================================================= - * bootstrap-scrollspy.js v2.3.0 + * bootstrap-scrollspy.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1672,7 +1684,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.3.0 + * bootstrap-tab.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1815,7 +1827,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.3.0 + * bootstrap-typeahead.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -2150,7 +2162,7 @@ }(window.jQuery); /* ========================================================== - * bootstrap-affix.js v2.3.0 + * bootstrap-affix.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/ckan/public/base/vendor/bootstrap/js/bootstrap.min.js b/ckan/public/base/vendor/bootstrap/js/bootstrap.min.js index e05923da846..f9cbdae7c50 100644 --- a/ckan/public/base/vendor/bootstrap/js/bootstrap.min.js +++ b/ckan/public/base/vendor/bootstrap/js/bootstrap.min.js @@ -3,4 +3,4 @@ * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ -!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||s.toggleClass("open"),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
          ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

          '}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
            ',item:'
            • ',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file +!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(".dropdown-backdrop").remove(),e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||("ontouchstart"in document.documentElement&&e('
            ').insertBefore(e(this)).on("click",r),s.toggleClass("open")),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
            ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

            '}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
              ',item:'
              • ',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/ckan/public/base/vendor/bootstrap/less/bootstrap.less b/ckan/public/base/vendor/bootstrap/less/bootstrap.less index 47af2c4e449..d4ebf37acc9 100755 --- a/ckan/public/base/vendor/bootstrap/less/bootstrap.less +++ b/ckan/public/base/vendor/bootstrap/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.3.0 + * Bootstrap v2.3.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/ckan/public/base/vendor/bootstrap/less/dropdowns.less b/ckan/public/base/vendor/bootstrap/less/dropdowns.less index bbfe3fd3e3a..9e47b47151f 100755 --- a/ckan/public/base/vendor/bootstrap/less/dropdowns.less +++ b/ckan/public/base/vendor/bootstrap/less/dropdowns.less @@ -135,6 +135,17 @@ } } +// Backdrop to catch body clicks on mobile, etc. +// --------------------------- +.dropdown-backdrop { + position: fixed; + left: 0; + right: 0; + bottom: 0; + top: 0; + z-index: @zindexDropdown - 10; +} + // Right aligned dropdowns // --------------------------- .pull-right > .dropdown-menu { diff --git a/ckan/public/base/vendor/bootstrap/less/responsive.less b/ckan/public/base/vendor/bootstrap/less/responsive.less index df63340688d..9e5f9b1f455 100755 --- a/ckan/public/base/vendor/bootstrap/less/responsive.less +++ b/ckan/public/base/vendor/bootstrap/less/responsive.less @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.3.0 + * Bootstrap Responsive v2.3.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css b/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css index 73fc3bb0d80..17f07766c42 100644 --- a/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css +++ b/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css @@ -1,24 +1,27 @@ /*! - * Font Awesome 3.0.2 - * the iconic font designed for use with Twitter Bootstrap - * ------------------------------------------------------- - * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ + * Font Awesome 3.2.1 + * the iconic font designed for Bootstrap + * ------------------------------------------------------------------------------ + * The full suite of pictographic icons, examples, and documentation can be + * found at http://fontawesome.io. Stay up to date on Twitter at + * http://twitter.com/fontawesome. * * License - * ------------------------------------------------------- - * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - + * ------------------------------------------------------------------------------ + * - The Font Awesome font is licensed under SIL OFL 1.1 - + * http://scripts.sil.org/OFL + * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License - * http://opensource.org/licenses/mit-license.html - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - Font Awesome documentation licensed under CC BY 3.0 - + * http://creativecommons.org/licenses/by/3.0/ * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - - * Contact - * ------------------------------------------------------- - * Email: dave@davegandy.com - * Twitter: http://twitter.com/fortaweso_me - * Work: Lead Product Designer @ http://kyruus.com + * "Font Awesome by Dave Gandy - http://fontawesome.io" + * + * Author - Dave Gandy + * ------------------------------------------------------------------------------ + * Email: dave@fontawesome.io + * Twitter: http://twitter.com/davegandy + * Work: Lead Product Designer @ Kyruus - http://kyruus.com */ .icon-large { font-size: 1.3333333333333333em; @@ -64,10 +67,6 @@ a [class^="icon-"], a [class*=" icon-"] { cursor: pointer; } -ul.icons { - text-indent: -1.5em; - margin-left: 3em; -} .icon-glass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -77,7 +76,7 @@ ul.icons { .icon-search { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.icon-envelope { +.icon-envelope-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .icon-heart { @@ -119,19 +118,25 @@ ul.icons { .icon-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-power-off { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-signal { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-gear { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.icon-file { +.icon-file-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .icon-time { @@ -158,6 +163,9 @@ ul.icons { .icon-repeat { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-rotate-right { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-refresh { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -353,6 +361,9 @@ ul.icons { .icon-share-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-mail-forward { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-resize-full { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -446,13 +457,16 @@ ul.icons { .icon-cogs { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-gears { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-comments { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.icon-thumbs-up { +.icon-thumbs-up-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.icon-thumbs-down { +.icon-thumbs-down-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .icon-star-half { @@ -494,6 +508,9 @@ ul.icons { .icon-check-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-unchecked { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-bookmark-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -593,6 +610,9 @@ ul.icons { .icon-paper-clip { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-paperclip { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-save { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -662,7 +682,7 @@ ul.icons { .icon-sort-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.icon-envelope-alt { +.icon-envelope { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .icon-linkedin { @@ -671,6 +691,9 @@ ul.icons { .icon-undo { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-rotate-left { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-legal { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -725,7 +748,7 @@ ul.icons { .icon-food { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } -.icon-file-alt { +.icon-file-text-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } .icon-building { @@ -806,6 +829,9 @@ ul.icons { .icon-reply { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-mail-reply { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} .icon-github-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } @@ -815,3 +841,363 @@ ul.icons { .icon-folder-open-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-expand-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-collapse-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-smile { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-frown { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-meh { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-gamepad { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-keyboard { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-flag-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-flag-checkered { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-terminal { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-code { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-reply-all { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-mail-reply-all { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-star-half-empty { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-star-half-full { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-location-arrow { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-crop { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-code-fork { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-unlink { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-question { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-info { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-exclamation { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-superscript { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-subscript { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-eraser { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-puzzle-piece { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-microphone { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-microphone-off { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-shield { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-calendar-empty { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-fire-extinguisher { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-rocket { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-maxcdn { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-chevron-sign-left { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-chevron-sign-right { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-chevron-sign-up { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-chevron-sign-down { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-html5 { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-css3 { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-anchor { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-unlock-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-bullseye { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-ellipsis-horizontal { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-ellipsis-vertical { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-rss-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-play-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-ticket { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-minus-sign-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-check-minus { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-level-up { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-level-down { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-check-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-edit-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-external-link-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-share-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-compass { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-collapse { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-collapse-top { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-expand { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-eur { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-euro { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-gbp { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-usd { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-dollar { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-inr { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-rupee { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-jpy { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-yen { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-cny { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-renminbi { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-krw { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-won { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-btc { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-bitcoin { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-file { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-file-text { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-sort-by-alphabet { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-sort-by-alphabet-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-sort-by-attributes { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-sort-by-attributes-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-sort-by-order { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-sort-by-order-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-thumbs-up { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-thumbs-down { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-youtube-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-youtube { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-xing { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-xing-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-youtube-play { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-dropbox { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-stackexchange { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-instagram { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-flickr { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-adn { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-bitbucket { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-bitbucket-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-tumblr { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-tumblr-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-long-arrow-down { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-long-arrow-up { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-long-arrow-left { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-long-arrow-right { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-apple { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-windows { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-android { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-linux { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-dribbble { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-skype { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-foursquare { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-trello { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-female { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-male { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-gittip { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-sun { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-moon { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-archive { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-bug { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-vk { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-weibo { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-renren { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} diff --git a/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css b/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css new file mode 100644 index 00000000000..d3dae63bd8b --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css @@ -0,0 +1,384 @@ +.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle;} +.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;} +.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px;} +.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit;} +.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em;} +a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;} +.icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-music{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-search{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-envelope-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-heart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-star{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-star-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-user{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-film{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-th-large{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-th{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-th-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-ok{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-remove{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-zoom-in{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-zoom-out{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-power-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-signal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-cog{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gear{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-trash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-home{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-file-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-time{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-road{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-download-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-inbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-play-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-repeat{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-rotate-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-refresh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-list-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-lock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-flag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-headphones{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-volume-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-volume-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-volume-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-qrcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-barcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-tag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-tags{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-book{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bookmark{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-print{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-camera{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-font{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bold{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-italic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-text-height{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-text-width{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-align-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-align-center{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-align-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-align-justify{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-indent-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-indent-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-facetime-video{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-picture{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-pencil{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-map-marker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-adjust{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-tint{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-edit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-share{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-check{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-move{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-step-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-fast-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-pause{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-stop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-fast-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-step-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-eject{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-chevron-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-chevron-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-minus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-remove-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-ok-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-question-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-info-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-screenshot{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-remove-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-ok-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-ban-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-share-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-mail-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-resize-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-resize-small{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-asterisk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-exclamation-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gift{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-leaf{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-fire{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-eye-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-eye-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-warning-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-plane{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-calendar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-random{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-comment{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-magnet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-chevron-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-chevron-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-retweet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-shopping-cart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-folder-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-folder-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-resize-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-resize-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bar-chart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-twitter-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-facebook-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-camera-retro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-key{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-cogs{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gears{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-comments{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-thumbs-up-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-star-half{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-heart-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-signout{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-linkedin-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-pushpin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-external-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-signin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-trophy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-github-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-upload-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-lemon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-check-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-unchecked{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bookmark-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-phone-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-twitter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-facebook{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-github{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-credit-card{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-rss{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-hdd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bullhorn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-certificate{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-hand-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-hand-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-hand-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-hand-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-circle-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-circle-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-circle-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-circle-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-globe{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-wrench{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-tasks{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-filter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-briefcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-fullscreen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-group{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-cloud{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-beaker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-cut{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-copy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-paper-clip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-paperclip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-save{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sign-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-reorder{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-list-ul{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-list-ol{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-strikethrough{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-underline{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-table{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-magic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-truck{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-pinterest{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-pinterest-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-google-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-google-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-money{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-caret-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-caret-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-caret-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-caret-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-columns{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-envelope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-linkedin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-undo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-rotate-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-legal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-dashboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-comment-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-comments-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bolt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sitemap{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-umbrella{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-paste{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-lightbulb{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-exchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-cloud-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-cloud-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-user-md{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-stethoscope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-suitcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-coffee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-food{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-file-text-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-building{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-hospital{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-ambulance{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-medkit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-fighter-jet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-beer{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-h-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-plus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-double-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-double-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-double-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-double-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-desktop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-laptop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-tablet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-mobile-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-circle-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-quote-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-quote-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-spinner{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-mail-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-github-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-folder-close-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-folder-open-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-expand-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-collapse-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-smile{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-frown{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-meh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gamepad{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-keyboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-flag-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-flag-checkered{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-terminal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-code{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-mail-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-star-half-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-star-half-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-location-arrow{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-crop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-code-fork{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-unlink{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-question{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-info{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-exclamation{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-superscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-subscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-eraser{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-puzzle-piece{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-microphone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-microphone-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-shield{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-calendar-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-fire-extinguisher{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-rocket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-maxcdn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-chevron-sign-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-chevron-sign-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-chevron-sign-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-chevron-sign-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-html5{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-css3{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-anchor{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-unlock-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bullseye{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-ellipsis-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-ellipsis-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-rss-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-play-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-ticket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-minus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-check-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-level-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-level-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-check-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-edit-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-external-link-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-share-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-compass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-collapse{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-collapse-top{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-expand{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-eur{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-euro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gbp{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-usd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-dollar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-inr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-rupee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-jpy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-yen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-renminbi{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-krw{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-won{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-btc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bitcoin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-file{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-file-text{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort-by-alphabet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort-by-alphabet-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort-by-attributes{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort-by-attributes-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort-by-order{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sort-by-order-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-thumbs-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-thumbs-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-youtube-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-youtube{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-xing{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-xing-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-youtube-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-dropbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-stackexchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-instagram{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-flickr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-adn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bitbucket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bitbucket-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-tumblr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-tumblr-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-long-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-long-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-long-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-long-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-apple{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-windows{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-android{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-linux{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-dribbble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-skype{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-foursquare{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-trello{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-female{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-male{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-gittip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-sun{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-moon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-archive{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-bug{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-vk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-weibo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} +.icon-renren{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} diff --git a/ckan/public/base/vendor/font-awesome/css/font-awesome.css b/ckan/public/base/vendor/font-awesome/css/font-awesome.css old mode 100755 new mode 100644 index 887509896f7..7ede1828a78 --- a/ckan/public/base/vendor/font-awesome/css/font-awesome.css +++ b/ckan/public/base/vendor/font-awesome/css/font-awesome.css @@ -1,36 +1,39 @@ /*! - * Font Awesome 3.0.2 - * the iconic font designed for use with Twitter Bootstrap - * ------------------------------------------------------- - * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ + * Font Awesome 3.2.1 + * the iconic font designed for Bootstrap + * ------------------------------------------------------------------------------ + * The full suite of pictographic icons, examples, and documentation can be + * found at http://fontawesome.io. Stay up to date on Twitter at + * http://twitter.com/fontawesome. * * License - * ------------------------------------------------------- - * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - + * ------------------------------------------------------------------------------ + * - The Font Awesome font is licensed under SIL OFL 1.1 - + * http://scripts.sil.org/OFL + * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License - * http://opensource.org/licenses/mit-license.html - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - Font Awesome documentation licensed under CC BY 3.0 - + * http://creativecommons.org/licenses/by/3.0/ * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - - * Contact - * ------------------------------------------------------- - * Email: dave@davegandy.com - * Twitter: http://twitter.com/fortaweso_me - * Work: Lead Product Designer @ http://kyruus.com + * "Font Awesome by Dave Gandy - http://fontawesome.io" + * + * Author - Dave Gandy + * ------------------------------------------------------------------------------ + * Email: dave@fontawesome.io + * Twitter: http://twitter.com/davegandy + * Work: Lead Product Designer @ Kyruus - http://kyruus.com */ +/* FONT PATH + * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../font/fontawesome-webfont.eot?v=3.0.1'); - src: url('../font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), - url('../font/fontawesome-webfont.woff?v=3.0.1') format('woff'), - url('../font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + src: url('../font/fontawesome-webfont.eot?v=3.2.1'); + src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); font-weight: normal; font-style: normal; } -/* Font Awesome styles - ------------------------------------------------------- */ +/* FONT AWESOME CORE + * -------------------------- */ [class^="icon-"], [class*=" icon-"] { font-family: FontAwesome; @@ -38,33 +41,7 @@ font-style: normal; text-decoration: inherit; -webkit-font-smoothing: antialiased; - - /* sprites.less reset */ - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} -/* more sprites.less reset */ -.icon-white, -.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-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: none; + *margin-right: .3em; } [class^="icon-"]:before, [class*=" icon-"]:before { @@ -72,80 +49,55 @@ display: inline-block; speak: none; } -/* makes sure icons active on rollover in links */ -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; -} /* makes the font 33% larger relative to the icon container */ .icon-large:before { vertical-align: -10%; font-size: 1.3333333333333333em; } -.btn [class^="icon-"], -.nav [class^="icon-"], -.btn [class*=" icon-"], -.nav [class*=" icon-"] { +/* makes sure icons active on rollover in links */ +a [class^="icon-"], +a [class*=" icon-"] { display: inline; - /* keeps button heights with and without icons the same */ - -} -.btn [class^="icon-"].icon-large, -.nav [class^="icon-"].icon-large, -.btn [class*=" icon-"].icon-large, -.nav [class*=" icon-"].icon-large { - line-height: .9em; } -.btn [class^="icon-"].icon-spin, -.nav [class^="icon-"].icon-spin, -.btn [class*=" icon-"].icon-spin, -.nav [class*=" icon-"].icon-spin { +/* increased font size for icon-large */ +[class^="icon-"].icon-fixed-width, +[class*=" icon-"].icon-fixed-width { display: inline-block; + width: 1.1428571428571428em; + text-align: right; + padding-right: 0.2857142857142857em; } -.nav-tabs [class^="icon-"], -.nav-pills [class^="icon-"], -.nav-tabs [class*=" icon-"], -.nav-pills [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - +[class^="icon-"].icon-fixed-width.icon-large, +[class*=" icon-"].icon-fixed-width.icon-large { + width: 1.4285714285714286em; } -.nav-tabs [class^="icon-"], -.nav-pills [class^="icon-"], -.nav-tabs [class*=" icon-"], -.nav-pills [class*=" icon-"], -.nav-tabs [class^="icon-"].icon-large, -.nav-pills [class^="icon-"].icon-large, -.nav-tabs [class*=" icon-"].icon-large, -.nav-pills [class*=" icon-"].icon-large { - line-height: .9em; -} -li [class^="icon-"], -.nav li [class^="icon-"], -li [class*=" icon-"], -.nav li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.icons-ul { + margin-left: 2.142857142857143em; + list-style-type: none; } -li [class^="icon-"].icon-large, -.nav li [class^="icon-"].icon-large, -li [class*=" icon-"].icon-large, -.nav li [class*=" icon-"].icon-large { - /* increased font size for icon-large */ - - width: 1.5625em; +.icons-ul > li { + position: relative; } -ul.icons { - list-style-type: none; - text-indent: -0.75em; +.icons-ul .icon-li { + position: absolute; + left: -2.142857142857143em; + width: 2.142857142857143em; + text-align: center; + line-height: inherit; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .75em; +[class^="icon-"].hide, +[class*=" icon-"].hide { + display: none; } .icon-muted { color: #eeeeee; } +.icon-light { + color: #ffffff; +} +.icon-dark { + color: #333333; +} .icon-border { border: solid 1px #eeeeee; padding: .2em .25em .15em; @@ -180,6 +132,15 @@ ul.icons li [class*=" icon-"] { -moz-border-radius: 6px; border-radius: 6px; } +.icon-5x { + font-size: 5em; +} +.icon-5x.icon-border { + border-width: 5px; + -webkit-border-radius: 7px; + -moz-border-radius: 7px; + border-radius: 7px; +} .pull-right { float: right; } @@ -194,6 +155,60 @@ ul.icons li [class*=" icon-"] { [class*=" icon-"].pull-right { margin-left: .3em; } +/* BOOTSTRAP SPECIFIC CLASSES + * -------------------------- */ +/* Bootstrap 2.0 sprites.less reset */ +[class^="icon-"], +[class*=" icon-"] { + display: inline; + width: auto; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; +} +/* more sprites.less reset */ +.icon-white, +.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-submenu:hover > a > [class^="icon-"], +.dropdown-submenu:hover > a > [class*=" icon-"] { + background-image: none; +} +/* keeps Bootstrap styles with and without icons the same */ +.btn [class^="icon-"].icon-large, +.nav [class^="icon-"].icon-large, +.btn [class*=" icon-"].icon-large, +.nav [class*=" icon-"].icon-large { + line-height: .9em; +} +.btn [class^="icon-"].icon-spin, +.nav [class^="icon-"].icon-spin, +.btn [class*=" icon-"].icon-spin, +.nav [class*=" icon-"].icon-spin { + display: inline-block; +} +.nav-tabs [class^="icon-"], +.nav-pills [class^="icon-"], +.nav-tabs [class*=" icon-"], +.nav-pills [class*=" icon-"], +.nav-tabs [class^="icon-"].icon-large, +.nav-pills [class^="icon-"].icon-large, +.nav-tabs [class*=" icon-"].icon-large, +.nav-pills [class*=" icon-"].icon-large { + line-height: .9em; +} .btn [class^="icon-"].pull-left.icon-2x, .btn [class*=" icon-"].pull-left.icon-2x, .btn [class^="icon-"].pull-right.icon-2x, @@ -228,6 +243,38 @@ ul.icons li [class*=" icon-"] { .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } +/* Fixes alignment in nav lists */ +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} +/* EXTRAS + * -------------------------- */ +/* Stacked and layered icon */ +.icon-stack { + position: relative; + display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: -35%; +} +.icon-stack [class^="icon-"], +.icon-stack [class*=" icon-"] { + display: block; + text-align: center; + position: absolute; + width: 100%; + height: 100%; + font-size: 1em; + line-height: inherit; + *line-height: 2em; +} +.icon-stack .icon-stack-base { + font-size: 2em; + *line-height: 1em; +} +/* Animated rotating icon */ .icon-spin { display: inline-block; -moz-animation: spin 2s infinite linear; @@ -235,306 +282,1198 @@ ul.icons li [class*=" icon-"] { -webkit-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +/* Prevent stack and spinners from being taken inline when inside a link */ +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} @-moz-keyframes spin { - 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } @-webkit-keyframes spin { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } @-o-keyframes spin { - 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } @-ms-keyframes spin { - 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } -} -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } -} -@-moz-document url-prefix() { - .icon-spin { - height: .9em; + 0% { + -ms-transform: rotate(0deg); } - .btn .icon-spin { - height: auto; + 100% { + -ms-transform: rotate(359deg); } - .icon-spin.icon-large { - height: 1.25em; +} +@keyframes spin { + 0% { + transform: rotate(0deg); } - .btn .icon-spin.icon-large { - height: .75em; + 100% { + transform: rotate(359deg); } } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { content: "\f000"; } -.icon-music:before { content: "\f001"; } -.icon-search:before { content: "\f002"; } -.icon-envelope:before { content: "\f003"; } -.icon-heart:before { content: "\f004"; } -.icon-star:before { content: "\f005"; } -.icon-star-empty:before { content: "\f006"; } -.icon-user:before { content: "\f007"; } -.icon-film:before { content: "\f008"; } -.icon-th-large:before { content: "\f009"; } -.icon-th:before { content: "\f00a"; } -.icon-th-list:before { content: "\f00b"; } -.icon-ok:before { content: "\f00c"; } -.icon-remove:before { content: "\f00d"; } -.icon-zoom-in:before { content: "\f00e"; } - -.icon-zoom-out:before { content: "\f010"; } -.icon-off:before { content: "\f011"; } -.icon-signal:before { content: "\f012"; } -.icon-cog:before { content: "\f013"; } -.icon-trash:before { content: "\f014"; } -.icon-home:before { content: "\f015"; } -.icon-file:before { content: "\f016"; } -.icon-time:before { content: "\f017"; } -.icon-road:before { content: "\f018"; } -.icon-download-alt:before { content: "\f019"; } -.icon-download:before { content: "\f01a"; } -.icon-upload:before { content: "\f01b"; } -.icon-inbox:before { content: "\f01c"; } -.icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before { content: "\f01e"; } - -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { content: "\f021"; } -.icon-list-alt:before { content: "\f022"; } -.icon-lock:before { content: "\f023"; } -.icon-flag:before { content: "\f024"; } -.icon-headphones:before { content: "\f025"; } -.icon-volume-off:before { content: "\f026"; } -.icon-volume-down:before { content: "\f027"; } -.icon-volume-up:before { content: "\f028"; } -.icon-qrcode:before { content: "\f029"; } -.icon-barcode:before { content: "\f02a"; } -.icon-tag:before { content: "\f02b"; } -.icon-tags:before { content: "\f02c"; } -.icon-book:before { content: "\f02d"; } -.icon-bookmark:before { content: "\f02e"; } -.icon-print:before { content: "\f02f"; } - -.icon-camera:before { content: "\f030"; } -.icon-font:before { content: "\f031"; } -.icon-bold:before { content: "\f032"; } -.icon-italic:before { content: "\f033"; } -.icon-text-height:before { content: "\f034"; } -.icon-text-width:before { content: "\f035"; } -.icon-align-left:before { content: "\f036"; } -.icon-align-center:before { content: "\f037"; } -.icon-align-right:before { content: "\f038"; } -.icon-align-justify:before { content: "\f039"; } -.icon-list:before { content: "\f03a"; } -.icon-indent-left:before { content: "\f03b"; } -.icon-indent-right:before { content: "\f03c"; } -.icon-facetime-video:before { content: "\f03d"; } -.icon-picture:before { content: "\f03e"; } - -.icon-pencil:before { content: "\f040"; } -.icon-map-marker:before { content: "\f041"; } -.icon-adjust:before { content: "\f042"; } -.icon-tint:before { content: "\f043"; } -.icon-edit:before { content: "\f044"; } -.icon-share:before { content: "\f045"; } -.icon-check:before { content: "\f046"; } -.icon-move:before { content: "\f047"; } -.icon-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { content: "\f049"; } -.icon-backward:before { content: "\f04a"; } -.icon-play:before { content: "\f04b"; } -.icon-pause:before { content: "\f04c"; } -.icon-stop:before { content: "\f04d"; } -.icon-forward:before { content: "\f04e"; } - -.icon-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { content: "\f051"; } -.icon-eject:before { content: "\f052"; } -.icon-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { content: "\f055"; } -.icon-minus-sign:before { content: "\f056"; } -.icon-remove-sign:before { content: "\f057"; } -.icon-ok-sign:before { content: "\f058"; } -.icon-question-sign:before { content: "\f059"; } -.icon-info-sign:before { content: "\f05a"; } -.icon-screenshot:before { content: "\f05b"; } -.icon-remove-circle:before { content: "\f05c"; } -.icon-ok-circle:before { content: "\f05d"; } -.icon-ban-circle:before { content: "\f05e"; } - -.icon-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before { content: "\f064"; } -.icon-resize-full:before { content: "\f065"; } -.icon-resize-small:before { content: "\f066"; } -.icon-plus:before { content: "\f067"; } -.icon-minus:before { content: "\f068"; } -.icon-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { content: "\f06a"; } -.icon-gift:before { content: "\f06b"; } -.icon-leaf:before { content: "\f06c"; } -.icon-fire:before { content: "\f06d"; } -.icon-eye-open:before { content: "\f06e"; } - -.icon-eye-close:before { content: "\f070"; } -.icon-warning-sign:before { content: "\f071"; } -.icon-plane:before { content: "\f072"; } -.icon-calendar:before { content: "\f073"; } -.icon-random:before { content: "\f074"; } -.icon-comment:before { content: "\f075"; } -.icon-magnet:before { content: "\f076"; } -.icon-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { content: "\f078"; } -.icon-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { content: "\f07b"; } -.icon-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { content: "\f07d"; } -.icon-resize-horizontal:before { content: "\f07e"; } - -.icon-bar-chart:before { content: "\f080"; } -.icon-twitter-sign:before { content: "\f081"; } -.icon-facebook-sign:before { content: "\f082"; } -.icon-camera-retro:before { content: "\f083"; } -.icon-key:before { content: "\f084"; } -.icon-cogs:before { content: "\f085"; } -.icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { content: "\f087"; } -.icon-thumbs-down:before { content: "\f088"; } -.icon-star-half:before { content: "\f089"; } -.icon-heart-empty:before { content: "\f08a"; } -.icon-signout:before { content: "\f08b"; } -.icon-linkedin-sign:before { content: "\f08c"; } -.icon-pushpin:before { content: "\f08d"; } -.icon-external-link:before { content: "\f08e"; } - -.icon-signin:before { content: "\f090"; } -.icon-trophy:before { content: "\f091"; } -.icon-github-sign:before { content: "\f092"; } -.icon-upload-alt:before { content: "\f093"; } -.icon-lemon:before { content: "\f094"; } -.icon-phone:before { content: "\f095"; } -.icon-check-empty:before { content: "\f096"; } -.icon-bookmark-empty:before { content: "\f097"; } -.icon-phone-sign:before { content: "\f098"; } -.icon-twitter:before { content: "\f099"; } -.icon-facebook:before { content: "\f09a"; } -.icon-github:before { content: "\f09b"; } -.icon-unlock:before { content: "\f09c"; } -.icon-credit-card:before { content: "\f09d"; } -.icon-rss:before { content: "\f09e"; } - -.icon-hdd:before { content: "\f0a0"; } -.icon-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { content: "\f0a2"; } -.icon-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { content: "\f0a4"; } -.icon-hand-left:before { content: "\f0a5"; } -.icon-hand-up:before { content: "\f0a6"; } -.icon-hand-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { content: "\f0ab"; } -.icon-globe:before { content: "\f0ac"; } -.icon-wrench:before { content: "\f0ad"; } -.icon-tasks:before { content: "\f0ae"; } - -.icon-filter:before { content: "\f0b0"; } -.icon-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { content: "\f0b2"; } - -.icon-group:before { content: "\f0c0"; } -.icon-link:before { content: "\f0c1"; } -.icon-cloud:before { content: "\f0c2"; } -.icon-beaker:before { content: "\f0c3"; } -.icon-cut:before { content: "\f0c4"; } -.icon-copy:before { content: "\f0c5"; } -.icon-paper-clip:before { content: "\f0c6"; } -.icon-save:before { content: "\f0c7"; } -.icon-sign-blank:before { content: "\f0c8"; } -.icon-reorder:before { content: "\f0c9"; } -.icon-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { content: "\f0cd"; } -.icon-table:before { content: "\f0ce"; } - -.icon-magic:before { content: "\f0d0"; } -.icon-truck:before { content: "\f0d1"; } -.icon-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { content: "\f0d3"; } -.icon-google-plus-sign:before { content: "\f0d4"; } -.icon-google-plus:before { content: "\f0d5"; } -.icon-money:before { content: "\f0d6"; } -.icon-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { content: "\f0da"; } -.icon-columns:before { content: "\f0db"; } -.icon-sort:before { content: "\f0dc"; } -.icon-sort-down:before { content: "\f0dd"; } -.icon-sort-up:before { content: "\f0de"; } - -.icon-envelope-alt:before { content: "\f0e0"; } -.icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before { content: "\f0e2"; } -.icon-legal:before { content: "\f0e3"; } -.icon-dashboard:before { content: "\f0e4"; } -.icon-comment-alt:before { content: "\f0e5"; } -.icon-comments-alt:before { content: "\f0e6"; } -.icon-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { content: "\f0e9"; } -.icon-paste:before { content: "\f0ea"; } -.icon-lightbulb:before { content: "\f0eb"; } -.icon-exchange:before { content: "\f0ec"; } -.icon-cloud-download:before { content: "\f0ed"; } -.icon-cloud-upload:before { content: "\f0ee"; } - -.icon-user-md:before { content: "\f0f0"; } -.icon-stethoscope:before { content: "\f0f1"; } -.icon-suitcase:before { content: "\f0f2"; } -.icon-bell-alt:before { content: "\f0f3"; } -.icon-coffee:before { content: "\f0f4"; } -.icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { content: "\f0f6"; } -.icon-building:before { content: "\f0f7"; } -.icon-hospital:before { content: "\f0f8"; } -.icon-ambulance:before { content: "\f0f9"; } -.icon-medkit:before { content: "\f0fa"; } -.icon-fighter-jet:before { content: "\f0fb"; } -.icon-beer:before { content: "\f0fc"; } -.icon-h-sign:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { content: "\f0fe"; } - -.icon-double-angle-left:before { content: "\f100"; } -.icon-double-angle-right:before { content: "\f101"; } -.icon-double-angle-up:before { content: "\f102"; } -.icon-double-angle-down:before { content: "\f103"; } -.icon-angle-left:before { content: "\f104"; } -.icon-angle-right:before { content: "\f105"; } -.icon-angle-up:before { content: "\f106"; } -.icon-angle-down:before { content: "\f107"; } -.icon-desktop:before { content: "\f108"; } -.icon-laptop:before { content: "\f109"; } -.icon-tablet:before { content: "\f10a"; } -.icon-mobile-phone:before { content: "\f10b"; } -.icon-circle-blank:before { content: "\f10c"; } -.icon-quote-left:before { content: "\f10d"; } -.icon-quote-right:before { content: "\f10e"; } - -.icon-spinner:before { content: "\f110"; } -.icon-circle:before { content: "\f111"; } -.icon-reply:before { content: "\f112"; } -.icon-github-alt:before { content: "\f113"; } -.icon-folder-close-alt:before { content: "\f114"; } -.icon-folder-open-alt:before { content: "\f115"; } +/* Icon rotations and mirroring */ +.icon-rotate-90:before { + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); + -o-transform: rotate(90deg); + transform: rotate(90deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); +} +.icon-rotate-180:before { + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -ms-transform: rotate(180deg); + -o-transform: rotate(180deg); + transform: rotate(180deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); +} +.icon-rotate-270:before { + -webkit-transform: rotate(270deg); + -moz-transform: rotate(270deg); + -ms-transform: rotate(270deg); + -o-transform: rotate(270deg); + transform: rotate(270deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); +} +.icon-flip-horizontal:before { + -webkit-transform: scale(-1, 1); + -moz-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + -o-transform: scale(-1, 1); + transform: scale(-1, 1); +} +.icon-flip-vertical:before { + -webkit-transform: scale(1, -1); + -moz-transform: scale(1, -1); + -ms-transform: scale(1, -1); + -o-transform: scale(1, -1); + transform: scale(1, -1); +} +/* ensure rotation occurs inside anchor tags */ +a .icon-rotate-90:before, +a .icon-rotate-180:before, +a .icon-rotate-270:before, +a .icon-flip-horizontal:before, +a .icon-flip-vertical:before { + display: inline-block; +} +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; +} +.icon-music:before { + content: "\f001"; +} +.icon-search:before { + content: "\f002"; +} +.icon-envelope-alt:before { + content: "\f003"; +} +.icon-heart:before { + content: "\f004"; +} +.icon-star:before { + content: "\f005"; +} +.icon-star-empty:before { + content: "\f006"; +} +.icon-user:before { + content: "\f007"; +} +.icon-film:before { + content: "\f008"; +} +.icon-th-large:before { + content: "\f009"; +} +.icon-th:before { + content: "\f00a"; +} +.icon-th-list:before { + content: "\f00b"; +} +.icon-ok:before { + content: "\f00c"; +} +.icon-remove:before { + content: "\f00d"; +} +.icon-zoom-in:before { + content: "\f00e"; +} +.icon-zoom-out:before { + content: "\f010"; +} +.icon-power-off:before, +.icon-off:before { + content: "\f011"; +} +.icon-signal:before { + content: "\f012"; +} +.icon-gear:before, +.icon-cog:before { + content: "\f013"; +} +.icon-trash:before { + content: "\f014"; +} +.icon-home:before { + content: "\f015"; +} +.icon-file-alt:before { + content: "\f016"; +} +.icon-time:before { + content: "\f017"; +} +.icon-road:before { + content: "\f018"; +} +.icon-download-alt:before { + content: "\f019"; +} +.icon-download:before { + content: "\f01a"; +} +.icon-upload:before { + content: "\f01b"; +} +.icon-inbox:before { + content: "\f01c"; +} +.icon-play-circle:before { + content: "\f01d"; +} +.icon-rotate-right:before, +.icon-repeat:before { + content: "\f01e"; +} +.icon-refresh:before { + content: "\f021"; +} +.icon-list-alt:before { + content: "\f022"; +} +.icon-lock:before { + content: "\f023"; +} +.icon-flag:before { + content: "\f024"; +} +.icon-headphones:before { + content: "\f025"; +} +.icon-volume-off:before { + content: "\f026"; +} +.icon-volume-down:before { + content: "\f027"; +} +.icon-volume-up:before { + content: "\f028"; +} +.icon-qrcode:before { + content: "\f029"; +} +.icon-barcode:before { + content: "\f02a"; +} +.icon-tag:before { + content: "\f02b"; +} +.icon-tags:before { + content: "\f02c"; +} +.icon-book:before { + content: "\f02d"; +} +.icon-bookmark:before { + content: "\f02e"; +} +.icon-print:before { + content: "\f02f"; +} +.icon-camera:before { + content: "\f030"; +} +.icon-font:before { + content: "\f031"; +} +.icon-bold:before { + content: "\f032"; +} +.icon-italic:before { + content: "\f033"; +} +.icon-text-height:before { + content: "\f034"; +} +.icon-text-width:before { + content: "\f035"; +} +.icon-align-left:before { + content: "\f036"; +} +.icon-align-center:before { + content: "\f037"; +} +.icon-align-right:before { + content: "\f038"; +} +.icon-align-justify:before { + content: "\f039"; +} +.icon-list:before { + content: "\f03a"; +} +.icon-indent-left:before { + content: "\f03b"; +} +.icon-indent-right:before { + content: "\f03c"; +} +.icon-facetime-video:before { + content: "\f03d"; +} +.icon-picture:before { + content: "\f03e"; +} +.icon-pencil:before { + content: "\f040"; +} +.icon-map-marker:before { + content: "\f041"; +} +.icon-adjust:before { + content: "\f042"; +} +.icon-tint:before { + content: "\f043"; +} +.icon-edit:before { + content: "\f044"; +} +.icon-share:before { + content: "\f045"; +} +.icon-check:before { + content: "\f046"; +} +.icon-move:before { + content: "\f047"; +} +.icon-step-backward:before { + content: "\f048"; +} +.icon-fast-backward:before { + content: "\f049"; +} +.icon-backward:before { + content: "\f04a"; +} +.icon-play:before { + content: "\f04b"; +} +.icon-pause:before { + content: "\f04c"; +} +.icon-stop:before { + content: "\f04d"; +} +.icon-forward:before { + content: "\f04e"; +} +.icon-fast-forward:before { + content: "\f050"; +} +.icon-step-forward:before { + content: "\f051"; +} +.icon-eject:before { + content: "\f052"; +} +.icon-chevron-left:before { + content: "\f053"; +} +.icon-chevron-right:before { + content: "\f054"; +} +.icon-plus-sign:before { + content: "\f055"; +} +.icon-minus-sign:before { + content: "\f056"; +} +.icon-remove-sign:before { + content: "\f057"; +} +.icon-ok-sign:before { + content: "\f058"; +} +.icon-question-sign:before { + content: "\f059"; +} +.icon-info-sign:before { + content: "\f05a"; +} +.icon-screenshot:before { + content: "\f05b"; +} +.icon-remove-circle:before { + content: "\f05c"; +} +.icon-ok-circle:before { + content: "\f05d"; +} +.icon-ban-circle:before { + content: "\f05e"; +} +.icon-arrow-left:before { + content: "\f060"; +} +.icon-arrow-right:before { + content: "\f061"; +} +.icon-arrow-up:before { + content: "\f062"; +} +.icon-arrow-down:before { + content: "\f063"; +} +.icon-mail-forward:before, +.icon-share-alt:before { + content: "\f064"; +} +.icon-resize-full:before { + content: "\f065"; +} +.icon-resize-small:before { + content: "\f066"; +} +.icon-plus:before { + content: "\f067"; +} +.icon-minus:before { + content: "\f068"; +} +.icon-asterisk:before { + content: "\f069"; +} +.icon-exclamation-sign:before { + content: "\f06a"; +} +.icon-gift:before { + content: "\f06b"; +} +.icon-leaf:before { + content: "\f06c"; +} +.icon-fire:before { + content: "\f06d"; +} +.icon-eye-open:before { + content: "\f06e"; +} +.icon-eye-close:before { + content: "\f070"; +} +.icon-warning-sign:before { + content: "\f071"; +} +.icon-plane:before { + content: "\f072"; +} +.icon-calendar:before { + content: "\f073"; +} +.icon-random:before { + content: "\f074"; +} +.icon-comment:before { + content: "\f075"; +} +.icon-magnet:before { + content: "\f076"; +} +.icon-chevron-up:before { + content: "\f077"; +} +.icon-chevron-down:before { + content: "\f078"; +} +.icon-retweet:before { + content: "\f079"; +} +.icon-shopping-cart:before { + content: "\f07a"; +} +.icon-folder-close:before { + content: "\f07b"; +} +.icon-folder-open:before { + content: "\f07c"; +} +.icon-resize-vertical:before { + content: "\f07d"; +} +.icon-resize-horizontal:before { + content: "\f07e"; +} +.icon-bar-chart:before { + content: "\f080"; +} +.icon-twitter-sign:before { + content: "\f081"; +} +.icon-facebook-sign:before { + content: "\f082"; +} +.icon-camera-retro:before { + content: "\f083"; +} +.icon-key:before { + content: "\f084"; +} +.icon-gears:before, +.icon-cogs:before { + content: "\f085"; +} +.icon-comments:before { + content: "\f086"; +} +.icon-thumbs-up-alt:before { + content: "\f087"; +} +.icon-thumbs-down-alt:before { + content: "\f088"; +} +.icon-star-half:before { + content: "\f089"; +} +.icon-heart-empty:before { + content: "\f08a"; +} +.icon-signout:before { + content: "\f08b"; +} +.icon-linkedin-sign:before { + content: "\f08c"; +} +.icon-pushpin:before { + content: "\f08d"; +} +.icon-external-link:before { + content: "\f08e"; +} +.icon-signin:before { + content: "\f090"; +} +.icon-trophy:before { + content: "\f091"; +} +.icon-github-sign:before { + content: "\f092"; +} +.icon-upload-alt:before { + content: "\f093"; +} +.icon-lemon:before { + content: "\f094"; +} +.icon-phone:before { + content: "\f095"; +} +.icon-unchecked:before, +.icon-check-empty:before { + content: "\f096"; +} +.icon-bookmark-empty:before { + content: "\f097"; +} +.icon-phone-sign:before { + content: "\f098"; +} +.icon-twitter:before { + content: "\f099"; +} +.icon-facebook:before { + content: "\f09a"; +} +.icon-github:before { + content: "\f09b"; +} +.icon-unlock:before { + content: "\f09c"; +} +.icon-credit-card:before { + content: "\f09d"; +} +.icon-rss:before { + content: "\f09e"; +} +.icon-hdd:before { + content: "\f0a0"; +} +.icon-bullhorn:before { + content: "\f0a1"; +} +.icon-bell:before { + content: "\f0a2"; +} +.icon-certificate:before { + content: "\f0a3"; +} +.icon-hand-right:before { + content: "\f0a4"; +} +.icon-hand-left:before { + content: "\f0a5"; +} +.icon-hand-up:before { + content: "\f0a6"; +} +.icon-hand-down:before { + content: "\f0a7"; +} +.icon-circle-arrow-left:before { + content: "\f0a8"; +} +.icon-circle-arrow-right:before { + content: "\f0a9"; +} +.icon-circle-arrow-up:before { + content: "\f0aa"; +} +.icon-circle-arrow-down:before { + content: "\f0ab"; +} +.icon-globe:before { + content: "\f0ac"; +} +.icon-wrench:before { + content: "\f0ad"; +} +.icon-tasks:before { + content: "\f0ae"; +} +.icon-filter:before { + content: "\f0b0"; +} +.icon-briefcase:before { + content: "\f0b1"; +} +.icon-fullscreen:before { + content: "\f0b2"; +} +.icon-group:before { + content: "\f0c0"; +} +.icon-link:before { + content: "\f0c1"; +} +.icon-cloud:before { + content: "\f0c2"; +} +.icon-beaker:before { + content: "\f0c3"; +} +.icon-cut:before { + content: "\f0c4"; +} +.icon-copy:before { + content: "\f0c5"; +} +.icon-paperclip:before, +.icon-paper-clip:before { + content: "\f0c6"; +} +.icon-save:before { + content: "\f0c7"; +} +.icon-sign-blank:before { + content: "\f0c8"; +} +.icon-reorder:before { + content: "\f0c9"; +} +.icon-list-ul:before { + content: "\f0ca"; +} +.icon-list-ol:before { + content: "\f0cb"; +} +.icon-strikethrough:before { + content: "\f0cc"; +} +.icon-underline:before { + content: "\f0cd"; +} +.icon-table:before { + content: "\f0ce"; +} +.icon-magic:before { + content: "\f0d0"; +} +.icon-truck:before { + content: "\f0d1"; +} +.icon-pinterest:before { + content: "\f0d2"; +} +.icon-pinterest-sign:before { + content: "\f0d3"; +} +.icon-google-plus-sign:before { + content: "\f0d4"; +} +.icon-google-plus:before { + content: "\f0d5"; +} +.icon-money:before { + content: "\f0d6"; +} +.icon-caret-down:before { + content: "\f0d7"; +} +.icon-caret-up:before { + content: "\f0d8"; +} +.icon-caret-left:before { + content: "\f0d9"; +} +.icon-caret-right:before { + content: "\f0da"; +} +.icon-columns:before { + content: "\f0db"; +} +.icon-sort:before { + content: "\f0dc"; +} +.icon-sort-down:before { + content: "\f0dd"; +} +.icon-sort-up:before { + content: "\f0de"; +} +.icon-envelope:before { + content: "\f0e0"; +} +.icon-linkedin:before { + content: "\f0e1"; +} +.icon-rotate-left:before, +.icon-undo:before { + content: "\f0e2"; +} +.icon-legal:before { + content: "\f0e3"; +} +.icon-dashboard:before { + content: "\f0e4"; +} +.icon-comment-alt:before { + content: "\f0e5"; +} +.icon-comments-alt:before { + content: "\f0e6"; +} +.icon-bolt:before { + content: "\f0e7"; +} +.icon-sitemap:before { + content: "\f0e8"; +} +.icon-umbrella:before { + content: "\f0e9"; +} +.icon-paste:before { + content: "\f0ea"; +} +.icon-lightbulb:before { + content: "\f0eb"; +} +.icon-exchange:before { + content: "\f0ec"; +} +.icon-cloud-download:before { + content: "\f0ed"; +} +.icon-cloud-upload:before { + content: "\f0ee"; +} +.icon-user-md:before { + content: "\f0f0"; +} +.icon-stethoscope:before { + content: "\f0f1"; +} +.icon-suitcase:before { + content: "\f0f2"; +} +.icon-bell-alt:before { + content: "\f0f3"; +} +.icon-coffee:before { + content: "\f0f4"; +} +.icon-food:before { + content: "\f0f5"; +} +.icon-file-text-alt:before { + content: "\f0f6"; +} +.icon-building:before { + content: "\f0f7"; +} +.icon-hospital:before { + content: "\f0f8"; +} +.icon-ambulance:before { + content: "\f0f9"; +} +.icon-medkit:before { + content: "\f0fa"; +} +.icon-fighter-jet:before { + content: "\f0fb"; +} +.icon-beer:before { + content: "\f0fc"; +} +.icon-h-sign:before { + content: "\f0fd"; +} +.icon-plus-sign-alt:before { + content: "\f0fe"; +} +.icon-double-angle-left:before { + content: "\f100"; +} +.icon-double-angle-right:before { + content: "\f101"; +} +.icon-double-angle-up:before { + content: "\f102"; +} +.icon-double-angle-down:before { + content: "\f103"; +} +.icon-angle-left:before { + content: "\f104"; +} +.icon-angle-right:before { + content: "\f105"; +} +.icon-angle-up:before { + content: "\f106"; +} +.icon-angle-down:before { + content: "\f107"; +} +.icon-desktop:before { + content: "\f108"; +} +.icon-laptop:before { + content: "\f109"; +} +.icon-tablet:before { + content: "\f10a"; +} +.icon-mobile-phone:before { + content: "\f10b"; +} +.icon-circle-blank:before { + content: "\f10c"; +} +.icon-quote-left:before { + content: "\f10d"; +} +.icon-quote-right:before { + content: "\f10e"; +} +.icon-spinner:before { + content: "\f110"; +} +.icon-circle:before { + content: "\f111"; +} +.icon-mail-reply:before, +.icon-reply:before { + content: "\f112"; +} +.icon-github-alt:before { + content: "\f113"; +} +.icon-folder-close-alt:before { + content: "\f114"; +} +.icon-folder-open-alt:before { + content: "\f115"; +} +.icon-expand-alt:before { + content: "\f116"; +} +.icon-collapse-alt:before { + content: "\f117"; +} +.icon-smile:before { + content: "\f118"; +} +.icon-frown:before { + content: "\f119"; +} +.icon-meh:before { + content: "\f11a"; +} +.icon-gamepad:before { + content: "\f11b"; +} +.icon-keyboard:before { + content: "\f11c"; +} +.icon-flag-alt:before { + content: "\f11d"; +} +.icon-flag-checkered:before { + content: "\f11e"; +} +.icon-terminal:before { + content: "\f120"; +} +.icon-code:before { + content: "\f121"; +} +.icon-reply-all:before { + content: "\f122"; +} +.icon-mail-reply-all:before { + content: "\f122"; +} +.icon-star-half-full:before, +.icon-star-half-empty:before { + content: "\f123"; +} +.icon-location-arrow:before { + content: "\f124"; +} +.icon-crop:before { + content: "\f125"; +} +.icon-code-fork:before { + content: "\f126"; +} +.icon-unlink:before { + content: "\f127"; +} +.icon-question:before { + content: "\f128"; +} +.icon-info:before { + content: "\f129"; +} +.icon-exclamation:before { + content: "\f12a"; +} +.icon-superscript:before { + content: "\f12b"; +} +.icon-subscript:before { + content: "\f12c"; +} +.icon-eraser:before { + content: "\f12d"; +} +.icon-puzzle-piece:before { + content: "\f12e"; +} +.icon-microphone:before { + content: "\f130"; +} +.icon-microphone-off:before { + content: "\f131"; +} +.icon-shield:before { + content: "\f132"; +} +.icon-calendar-empty:before { + content: "\f133"; +} +.icon-fire-extinguisher:before { + content: "\f134"; +} +.icon-rocket:before { + content: "\f135"; +} +.icon-maxcdn:before { + content: "\f136"; +} +.icon-chevron-sign-left:before { + content: "\f137"; +} +.icon-chevron-sign-right:before { + content: "\f138"; +} +.icon-chevron-sign-up:before { + content: "\f139"; +} +.icon-chevron-sign-down:before { + content: "\f13a"; +} +.icon-html5:before { + content: "\f13b"; +} +.icon-css3:before { + content: "\f13c"; +} +.icon-anchor:before { + content: "\f13d"; +} +.icon-unlock-alt:before { + content: "\f13e"; +} +.icon-bullseye:before { + content: "\f140"; +} +.icon-ellipsis-horizontal:before { + content: "\f141"; +} +.icon-ellipsis-vertical:before { + content: "\f142"; +} +.icon-rss-sign:before { + content: "\f143"; +} +.icon-play-sign:before { + content: "\f144"; +} +.icon-ticket:before { + content: "\f145"; +} +.icon-minus-sign-alt:before { + content: "\f146"; +} +.icon-check-minus:before { + content: "\f147"; +} +.icon-level-up:before { + content: "\f148"; +} +.icon-level-down:before { + content: "\f149"; +} +.icon-check-sign:before { + content: "\f14a"; +} +.icon-edit-sign:before { + content: "\f14b"; +} +.icon-external-link-sign:before { + content: "\f14c"; +} +.icon-share-sign:before { + content: "\f14d"; +} +.icon-compass:before { + content: "\f14e"; +} +.icon-collapse:before { + content: "\f150"; +} +.icon-collapse-top:before { + content: "\f151"; +} +.icon-expand:before { + content: "\f152"; +} +.icon-euro:before, +.icon-eur:before { + content: "\f153"; +} +.icon-gbp:before { + content: "\f154"; +} +.icon-dollar:before, +.icon-usd:before { + content: "\f155"; +} +.icon-rupee:before, +.icon-inr:before { + content: "\f156"; +} +.icon-yen:before, +.icon-jpy:before { + content: "\f157"; +} +.icon-renminbi:before, +.icon-cny:before { + content: "\f158"; +} +.icon-won:before, +.icon-krw:before { + content: "\f159"; +} +.icon-bitcoin:before, +.icon-btc:before { + content: "\f15a"; +} +.icon-file:before { + content: "\f15b"; +} +.icon-file-text:before { + content: "\f15c"; +} +.icon-sort-by-alphabet:before { + content: "\f15d"; +} +.icon-sort-by-alphabet-alt:before { + content: "\f15e"; +} +.icon-sort-by-attributes:before { + content: "\f160"; +} +.icon-sort-by-attributes-alt:before { + content: "\f161"; +} +.icon-sort-by-order:before { + content: "\f162"; +} +.icon-sort-by-order-alt:before { + content: "\f163"; +} +.icon-thumbs-up:before { + content: "\f164"; +} +.icon-thumbs-down:before { + content: "\f165"; +} +.icon-youtube-sign:before { + content: "\f166"; +} +.icon-youtube:before { + content: "\f167"; +} +.icon-xing:before { + content: "\f168"; +} +.icon-xing-sign:before { + content: "\f169"; +} +.icon-youtube-play:before { + content: "\f16a"; +} +.icon-dropbox:before { + content: "\f16b"; +} +.icon-stackexchange:before { + content: "\f16c"; +} +.icon-instagram:before { + content: "\f16d"; +} +.icon-flickr:before { + content: "\f16e"; +} +.icon-adn:before { + content: "\f170"; +} +.icon-bitbucket:before { + content: "\f171"; +} +.icon-bitbucket-sign:before { + content: "\f172"; +} +.icon-tumblr:before { + content: "\f173"; +} +.icon-tumblr-sign:before { + content: "\f174"; +} +.icon-long-arrow-down:before { + content: "\f175"; +} +.icon-long-arrow-up:before { + content: "\f176"; +} +.icon-long-arrow-left:before { + content: "\f177"; +} +.icon-long-arrow-right:before { + content: "\f178"; +} +.icon-apple:before { + content: "\f179"; +} +.icon-windows:before { + content: "\f17a"; +} +.icon-android:before { + content: "\f17b"; +} +.icon-linux:before { + content: "\f17c"; +} +.icon-dribbble:before { + content: "\f17d"; +} +.icon-skype:before { + content: "\f17e"; +} +.icon-foursquare:before { + content: "\f180"; +} +.icon-trello:before { + content: "\f181"; +} +.icon-female:before { + content: "\f182"; +} +.icon-male:before { + content: "\f183"; +} +.icon-gittip:before { + content: "\f184"; +} +.icon-sun:before { + content: "\f185"; +} +.icon-moon:before { + content: "\f186"; +} +.icon-archive:before { + content: "\f187"; +} +.icon-bug:before { + content: "\f188"; +} +.icon-vk:before { + content: "\f189"; +} +.icon-weibo:before { + content: "\f18a"; +} +.icon-renren:before { + content: "\f18b"; +} diff --git a/ckan/public/base/vendor/font-awesome/css/font-awesome.min.css b/ckan/public/base/vendor/font-awesome/css/font-awesome.min.css new file mode 100644 index 00000000000..866437fa415 --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/css/font-awesome.min.css @@ -0,0 +1,403 @@ +@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;} +[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;} +.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;} +a [class^="icon-"],a [class*=" icon-"]{display:inline;} +[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em;}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em;} +.icons-ul{margin-left:2.142857142857143em;list-style-type:none;}.icons-ul>li{position:relative;} +.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit;} +[class^="icon-"].hide,[class*=" icon-"].hide{display:none;} +.icon-muted{color:#eeeeee;} +.icon-light{color:#ffffff;} +.icon-dark{color:#333333;} +.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.icon-2x{font-size:2em;}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.icon-3x{font-size:3em;}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.icon-4x{font-size:4em;}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.icon-5x{font-size:5em;}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px;} +.pull-right{float:right;} +.pull-left{float:left;} +[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em;} +[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em;} +[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;} +.icon-white,.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-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none;} +.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em;} +.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block;} +.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"],.nav-tabs [class^="icon-"].icon-large,.nav-pills [class^="icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large{line-height:.9em;} +.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em;} +.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em;} +.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em;} +.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;} +.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;} +.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;} +.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit;} +.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;} +.icon-stack .icon-stack-base{font-size:2em;*line-height:1em;} +.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;} +a .icon-stack,a .icon-spin{display:inline-block;text-decoration:none;} +@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}.icon-rotate-90:before{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);} +.icon-rotate-180:before{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);} +.icon-rotate-270:before{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);} +.icon-flip-horizontal:before{-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1);} +.icon-flip-vertical:before{-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1);} +a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .icon-flip-horizontal:before,a .icon-flip-vertical:before{display:inline-block;} +.icon-glass:before{content:"\f000";} +.icon-music:before{content:"\f001";} +.icon-search:before{content:"\f002";} +.icon-envelope-alt:before{content:"\f003";} +.icon-heart:before{content:"\f004";} +.icon-star:before{content:"\f005";} +.icon-star-empty:before{content:"\f006";} +.icon-user:before{content:"\f007";} +.icon-film:before{content:"\f008";} +.icon-th-large:before{content:"\f009";} +.icon-th:before{content:"\f00a";} +.icon-th-list:before{content:"\f00b";} +.icon-ok:before{content:"\f00c";} +.icon-remove:before{content:"\f00d";} +.icon-zoom-in:before{content:"\f00e";} +.icon-zoom-out:before{content:"\f010";} +.icon-power-off:before,.icon-off:before{content:"\f011";} +.icon-signal:before{content:"\f012";} +.icon-gear:before,.icon-cog:before{content:"\f013";} +.icon-trash:before{content:"\f014";} +.icon-home:before{content:"\f015";} +.icon-file-alt:before{content:"\f016";} +.icon-time:before{content:"\f017";} +.icon-road:before{content:"\f018";} +.icon-download-alt:before{content:"\f019";} +.icon-download:before{content:"\f01a";} +.icon-upload:before{content:"\f01b";} +.icon-inbox:before{content:"\f01c";} +.icon-play-circle:before{content:"\f01d";} +.icon-rotate-right:before,.icon-repeat:before{content:"\f01e";} +.icon-refresh:before{content:"\f021";} +.icon-list-alt:before{content:"\f022";} +.icon-lock:before{content:"\f023";} +.icon-flag:before{content:"\f024";} +.icon-headphones:before{content:"\f025";} +.icon-volume-off:before{content:"\f026";} +.icon-volume-down:before{content:"\f027";} +.icon-volume-up:before{content:"\f028";} +.icon-qrcode:before{content:"\f029";} +.icon-barcode:before{content:"\f02a";} +.icon-tag:before{content:"\f02b";} +.icon-tags:before{content:"\f02c";} +.icon-book:before{content:"\f02d";} +.icon-bookmark:before{content:"\f02e";} +.icon-print:before{content:"\f02f";} +.icon-camera:before{content:"\f030";} +.icon-font:before{content:"\f031";} +.icon-bold:before{content:"\f032";} +.icon-italic:before{content:"\f033";} +.icon-text-height:before{content:"\f034";} +.icon-text-width:before{content:"\f035";} +.icon-align-left:before{content:"\f036";} +.icon-align-center:before{content:"\f037";} +.icon-align-right:before{content:"\f038";} +.icon-align-justify:before{content:"\f039";} +.icon-list:before{content:"\f03a";} +.icon-indent-left:before{content:"\f03b";} +.icon-indent-right:before{content:"\f03c";} +.icon-facetime-video:before{content:"\f03d";} +.icon-picture:before{content:"\f03e";} +.icon-pencil:before{content:"\f040";} +.icon-map-marker:before{content:"\f041";} +.icon-adjust:before{content:"\f042";} +.icon-tint:before{content:"\f043";} +.icon-edit:before{content:"\f044";} +.icon-share:before{content:"\f045";} +.icon-check:before{content:"\f046";} +.icon-move:before{content:"\f047";} +.icon-step-backward:before{content:"\f048";} +.icon-fast-backward:before{content:"\f049";} +.icon-backward:before{content:"\f04a";} +.icon-play:before{content:"\f04b";} +.icon-pause:before{content:"\f04c";} +.icon-stop:before{content:"\f04d";} +.icon-forward:before{content:"\f04e";} +.icon-fast-forward:before{content:"\f050";} +.icon-step-forward:before{content:"\f051";} +.icon-eject:before{content:"\f052";} +.icon-chevron-left:before{content:"\f053";} +.icon-chevron-right:before{content:"\f054";} +.icon-plus-sign:before{content:"\f055";} +.icon-minus-sign:before{content:"\f056";} +.icon-remove-sign:before{content:"\f057";} +.icon-ok-sign:before{content:"\f058";} +.icon-question-sign:before{content:"\f059";} +.icon-info-sign:before{content:"\f05a";} +.icon-screenshot:before{content:"\f05b";} +.icon-remove-circle:before{content:"\f05c";} +.icon-ok-circle:before{content:"\f05d";} +.icon-ban-circle:before{content:"\f05e";} +.icon-arrow-left:before{content:"\f060";} +.icon-arrow-right:before{content:"\f061";} +.icon-arrow-up:before{content:"\f062";} +.icon-arrow-down:before{content:"\f063";} +.icon-mail-forward:before,.icon-share-alt:before{content:"\f064";} +.icon-resize-full:before{content:"\f065";} +.icon-resize-small:before{content:"\f066";} +.icon-plus:before{content:"\f067";} +.icon-minus:before{content:"\f068";} +.icon-asterisk:before{content:"\f069";} +.icon-exclamation-sign:before{content:"\f06a";} +.icon-gift:before{content:"\f06b";} +.icon-leaf:before{content:"\f06c";} +.icon-fire:before{content:"\f06d";} +.icon-eye-open:before{content:"\f06e";} +.icon-eye-close:before{content:"\f070";} +.icon-warning-sign:before{content:"\f071";} +.icon-plane:before{content:"\f072";} +.icon-calendar:before{content:"\f073";} +.icon-random:before{content:"\f074";} +.icon-comment:before{content:"\f075";} +.icon-magnet:before{content:"\f076";} +.icon-chevron-up:before{content:"\f077";} +.icon-chevron-down:before{content:"\f078";} +.icon-retweet:before{content:"\f079";} +.icon-shopping-cart:before{content:"\f07a";} +.icon-folder-close:before{content:"\f07b";} +.icon-folder-open:before{content:"\f07c";} +.icon-resize-vertical:before{content:"\f07d";} +.icon-resize-horizontal:before{content:"\f07e";} +.icon-bar-chart:before{content:"\f080";} +.icon-twitter-sign:before{content:"\f081";} +.icon-facebook-sign:before{content:"\f082";} +.icon-camera-retro:before{content:"\f083";} +.icon-key:before{content:"\f084";} +.icon-gears:before,.icon-cogs:before{content:"\f085";} +.icon-comments:before{content:"\f086";} +.icon-thumbs-up-alt:before{content:"\f087";} +.icon-thumbs-down-alt:before{content:"\f088";} +.icon-star-half:before{content:"\f089";} +.icon-heart-empty:before{content:"\f08a";} +.icon-signout:before{content:"\f08b";} +.icon-linkedin-sign:before{content:"\f08c";} +.icon-pushpin:before{content:"\f08d";} +.icon-external-link:before{content:"\f08e";} +.icon-signin:before{content:"\f090";} +.icon-trophy:before{content:"\f091";} +.icon-github-sign:before{content:"\f092";} +.icon-upload-alt:before{content:"\f093";} +.icon-lemon:before{content:"\f094";} +.icon-phone:before{content:"\f095";} +.icon-unchecked:before,.icon-check-empty:before{content:"\f096";} +.icon-bookmark-empty:before{content:"\f097";} +.icon-phone-sign:before{content:"\f098";} +.icon-twitter:before{content:"\f099";} +.icon-facebook:before{content:"\f09a";} +.icon-github:before{content:"\f09b";} +.icon-unlock:before{content:"\f09c";} +.icon-credit-card:before{content:"\f09d";} +.icon-rss:before{content:"\f09e";} +.icon-hdd:before{content:"\f0a0";} +.icon-bullhorn:before{content:"\f0a1";} +.icon-bell:before{content:"\f0a2";} +.icon-certificate:before{content:"\f0a3";} +.icon-hand-right:before{content:"\f0a4";} +.icon-hand-left:before{content:"\f0a5";} +.icon-hand-up:before{content:"\f0a6";} +.icon-hand-down:before{content:"\f0a7";} +.icon-circle-arrow-left:before{content:"\f0a8";} +.icon-circle-arrow-right:before{content:"\f0a9";} +.icon-circle-arrow-up:before{content:"\f0aa";} +.icon-circle-arrow-down:before{content:"\f0ab";} +.icon-globe:before{content:"\f0ac";} +.icon-wrench:before{content:"\f0ad";} +.icon-tasks:before{content:"\f0ae";} +.icon-filter:before{content:"\f0b0";} +.icon-briefcase:before{content:"\f0b1";} +.icon-fullscreen:before{content:"\f0b2";} +.icon-group:before{content:"\f0c0";} +.icon-link:before{content:"\f0c1";} +.icon-cloud:before{content:"\f0c2";} +.icon-beaker:before{content:"\f0c3";} +.icon-cut:before{content:"\f0c4";} +.icon-copy:before{content:"\f0c5";} +.icon-paperclip:before,.icon-paper-clip:before{content:"\f0c6";} +.icon-save:before{content:"\f0c7";} +.icon-sign-blank:before{content:"\f0c8";} +.icon-reorder:before{content:"\f0c9";} +.icon-list-ul:before{content:"\f0ca";} +.icon-list-ol:before{content:"\f0cb";} +.icon-strikethrough:before{content:"\f0cc";} +.icon-underline:before{content:"\f0cd";} +.icon-table:before{content:"\f0ce";} +.icon-magic:before{content:"\f0d0";} +.icon-truck:before{content:"\f0d1";} +.icon-pinterest:before{content:"\f0d2";} +.icon-pinterest-sign:before{content:"\f0d3";} +.icon-google-plus-sign:before{content:"\f0d4";} +.icon-google-plus:before{content:"\f0d5";} +.icon-money:before{content:"\f0d6";} +.icon-caret-down:before{content:"\f0d7";} +.icon-caret-up:before{content:"\f0d8";} +.icon-caret-left:before{content:"\f0d9";} +.icon-caret-right:before{content:"\f0da";} +.icon-columns:before{content:"\f0db";} +.icon-sort:before{content:"\f0dc";} +.icon-sort-down:before{content:"\f0dd";} +.icon-sort-up:before{content:"\f0de";} +.icon-envelope:before{content:"\f0e0";} +.icon-linkedin:before{content:"\f0e1";} +.icon-rotate-left:before,.icon-undo:before{content:"\f0e2";} +.icon-legal:before{content:"\f0e3";} +.icon-dashboard:before{content:"\f0e4";} +.icon-comment-alt:before{content:"\f0e5";} +.icon-comments-alt:before{content:"\f0e6";} +.icon-bolt:before{content:"\f0e7";} +.icon-sitemap:before{content:"\f0e8";} +.icon-umbrella:before{content:"\f0e9";} +.icon-paste:before{content:"\f0ea";} +.icon-lightbulb:before{content:"\f0eb";} +.icon-exchange:before{content:"\f0ec";} +.icon-cloud-download:before{content:"\f0ed";} +.icon-cloud-upload:before{content:"\f0ee";} +.icon-user-md:before{content:"\f0f0";} +.icon-stethoscope:before{content:"\f0f1";} +.icon-suitcase:before{content:"\f0f2";} +.icon-bell-alt:before{content:"\f0f3";} +.icon-coffee:before{content:"\f0f4";} +.icon-food:before{content:"\f0f5";} +.icon-file-text-alt:before{content:"\f0f6";} +.icon-building:before{content:"\f0f7";} +.icon-hospital:before{content:"\f0f8";} +.icon-ambulance:before{content:"\f0f9";} +.icon-medkit:before{content:"\f0fa";} +.icon-fighter-jet:before{content:"\f0fb";} +.icon-beer:before{content:"\f0fc";} +.icon-h-sign:before{content:"\f0fd";} +.icon-plus-sign-alt:before{content:"\f0fe";} +.icon-double-angle-left:before{content:"\f100";} +.icon-double-angle-right:before{content:"\f101";} +.icon-double-angle-up:before{content:"\f102";} +.icon-double-angle-down:before{content:"\f103";} +.icon-angle-left:before{content:"\f104";} +.icon-angle-right:before{content:"\f105";} +.icon-angle-up:before{content:"\f106";} +.icon-angle-down:before{content:"\f107";} +.icon-desktop:before{content:"\f108";} +.icon-laptop:before{content:"\f109";} +.icon-tablet:before{content:"\f10a";} +.icon-mobile-phone:before{content:"\f10b";} +.icon-circle-blank:before{content:"\f10c";} +.icon-quote-left:before{content:"\f10d";} +.icon-quote-right:before{content:"\f10e";} +.icon-spinner:before{content:"\f110";} +.icon-circle:before{content:"\f111";} +.icon-mail-reply:before,.icon-reply:before{content:"\f112";} +.icon-github-alt:before{content:"\f113";} +.icon-folder-close-alt:before{content:"\f114";} +.icon-folder-open-alt:before{content:"\f115";} +.icon-expand-alt:before{content:"\f116";} +.icon-collapse-alt:before{content:"\f117";} +.icon-smile:before{content:"\f118";} +.icon-frown:before{content:"\f119";} +.icon-meh:before{content:"\f11a";} +.icon-gamepad:before{content:"\f11b";} +.icon-keyboard:before{content:"\f11c";} +.icon-flag-alt:before{content:"\f11d";} +.icon-flag-checkered:before{content:"\f11e";} +.icon-terminal:before{content:"\f120";} +.icon-code:before{content:"\f121";} +.icon-reply-all:before{content:"\f122";} +.icon-mail-reply-all:before{content:"\f122";} +.icon-star-half-full:before,.icon-star-half-empty:before{content:"\f123";} +.icon-location-arrow:before{content:"\f124";} +.icon-crop:before{content:"\f125";} +.icon-code-fork:before{content:"\f126";} +.icon-unlink:before{content:"\f127";} +.icon-question:before{content:"\f128";} +.icon-info:before{content:"\f129";} +.icon-exclamation:before{content:"\f12a";} +.icon-superscript:before{content:"\f12b";} +.icon-subscript:before{content:"\f12c";} +.icon-eraser:before{content:"\f12d";} +.icon-puzzle-piece:before{content:"\f12e";} +.icon-microphone:before{content:"\f130";} +.icon-microphone-off:before{content:"\f131";} +.icon-shield:before{content:"\f132";} +.icon-calendar-empty:before{content:"\f133";} +.icon-fire-extinguisher:before{content:"\f134";} +.icon-rocket:before{content:"\f135";} +.icon-maxcdn:before{content:"\f136";} +.icon-chevron-sign-left:before{content:"\f137";} +.icon-chevron-sign-right:before{content:"\f138";} +.icon-chevron-sign-up:before{content:"\f139";} +.icon-chevron-sign-down:before{content:"\f13a";} +.icon-html5:before{content:"\f13b";} +.icon-css3:before{content:"\f13c";} +.icon-anchor:before{content:"\f13d";} +.icon-unlock-alt:before{content:"\f13e";} +.icon-bullseye:before{content:"\f140";} +.icon-ellipsis-horizontal:before{content:"\f141";} +.icon-ellipsis-vertical:before{content:"\f142";} +.icon-rss-sign:before{content:"\f143";} +.icon-play-sign:before{content:"\f144";} +.icon-ticket:before{content:"\f145";} +.icon-minus-sign-alt:before{content:"\f146";} +.icon-check-minus:before{content:"\f147";} +.icon-level-up:before{content:"\f148";} +.icon-level-down:before{content:"\f149";} +.icon-check-sign:before{content:"\f14a";} +.icon-edit-sign:before{content:"\f14b";} +.icon-external-link-sign:before{content:"\f14c";} +.icon-share-sign:before{content:"\f14d";} +.icon-compass:before{content:"\f14e";} +.icon-collapse:before{content:"\f150";} +.icon-collapse-top:before{content:"\f151";} +.icon-expand:before{content:"\f152";} +.icon-euro:before,.icon-eur:before{content:"\f153";} +.icon-gbp:before{content:"\f154";} +.icon-dollar:before,.icon-usd:before{content:"\f155";} +.icon-rupee:before,.icon-inr:before{content:"\f156";} +.icon-yen:before,.icon-jpy:before{content:"\f157";} +.icon-renminbi:before,.icon-cny:before{content:"\f158";} +.icon-won:before,.icon-krw:before{content:"\f159";} +.icon-bitcoin:before,.icon-btc:before{content:"\f15a";} +.icon-file:before{content:"\f15b";} +.icon-file-text:before{content:"\f15c";} +.icon-sort-by-alphabet:before{content:"\f15d";} +.icon-sort-by-alphabet-alt:before{content:"\f15e";} +.icon-sort-by-attributes:before{content:"\f160";} +.icon-sort-by-attributes-alt:before{content:"\f161";} +.icon-sort-by-order:before{content:"\f162";} +.icon-sort-by-order-alt:before{content:"\f163";} +.icon-thumbs-up:before{content:"\f164";} +.icon-thumbs-down:before{content:"\f165";} +.icon-youtube-sign:before{content:"\f166";} +.icon-youtube:before{content:"\f167";} +.icon-xing:before{content:"\f168";} +.icon-xing-sign:before{content:"\f169";} +.icon-youtube-play:before{content:"\f16a";} +.icon-dropbox:before{content:"\f16b";} +.icon-stackexchange:before{content:"\f16c";} +.icon-instagram:before{content:"\f16d";} +.icon-flickr:before{content:"\f16e";} +.icon-adn:before{content:"\f170";} +.icon-bitbucket:before{content:"\f171";} +.icon-bitbucket-sign:before{content:"\f172";} +.icon-tumblr:before{content:"\f173";} +.icon-tumblr-sign:before{content:"\f174";} +.icon-long-arrow-down:before{content:"\f175";} +.icon-long-arrow-up:before{content:"\f176";} +.icon-long-arrow-left:before{content:"\f177";} +.icon-long-arrow-right:before{content:"\f178";} +.icon-apple:before{content:"\f179";} +.icon-windows:before{content:"\f17a";} +.icon-android:before{content:"\f17b";} +.icon-linux:before{content:"\f17c";} +.icon-dribbble:before{content:"\f17d";} +.icon-skype:before{content:"\f17e";} +.icon-foursquare:before{content:"\f180";} +.icon-trello:before{content:"\f181";} +.icon-female:before{content:"\f182";} +.icon-male:before{content:"\f183";} +.icon-gittip:before{content:"\f184";} +.icon-sun:before{content:"\f185";} +.icon-moon:before{content:"\f186";} +.icon-archive:before{content:"\f187";} +.icon-bug:before{content:"\f188";} +.icon-vk:before{content:"\f189";} +.icon-weibo:before{content:"\f18a";} +.icon-renren:before{content:"\f18b";} diff --git a/ckan/public/base/vendor/font-awesome/font/FontAwesome.otf b/ckan/public/base/vendor/font-awesome/font/FontAwesome.otf old mode 100755 new mode 100644 index 64049bf2e79..70125459f7d Binary files a/ckan/public/base/vendor/font-awesome/font/FontAwesome.otf and b/ckan/public/base/vendor/font-awesome/font/FontAwesome.otf differ diff --git a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot b/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot index 7d81019e4f1..0662cb96bfb 100755 Binary files a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot and b/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot differ diff --git a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg b/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg index ba0afe5ef67..2edb4ec34cb 100755 --- a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg +++ b/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg @@ -52,25 +52,25 @@ - - + + - - - + + + - - + + - + - + @@ -89,11 +89,11 @@ - + - + @@ -115,12 +115,12 @@ - - + + - - - + + + @@ -132,13 +132,13 @@ - + - + @@ -152,8 +152,8 @@ - - + + @@ -163,22 +163,22 @@ - + - - + + - + - - - - + + + + @@ -186,18 +186,18 @@ - + - + - + - + @@ -230,8 +230,8 @@ - - + + @@ -250,13 +250,13 @@ - + - - + + @@ -271,7 +271,7 @@ - + @@ -280,5 +280,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf b/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf index d46172476a3..d3659246915 100755 Binary files a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf and b/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf differ diff --git a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff b/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff index 3c89ae09b88..b9bd17e158d 100755 Binary files a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff and b/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff differ diff --git a/ckan/public/base/vendor/font-awesome/less/bootstrap.less b/ckan/public/base/vendor/font-awesome/less/bootstrap.less new file mode 100644 index 00000000000..a2c96046b4c --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/bootstrap.less @@ -0,0 +1,84 @@ +/* BOOTSTRAP SPECIFIC CLASSES + * -------------------------- */ + +/* Bootstrap 2.0 sprites.less reset */ +[class^="icon-"], +[class*=" icon-"] { + display: inline; + width: auto; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; +} + +/* more sprites.less reset */ +.icon-white, +.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-submenu:hover > a > [class^="icon-"], +.dropdown-submenu:hover > a > [class*=" icon-"] { + background-image: none; +} + + +/* keeps Bootstrap styles with and without icons the same */ +.btn, .nav { + [class^="icon-"], + [class*=" icon-"] { +// display: inline; + &.icon-large { line-height: .9em; } + &.icon-spin { display: inline-block; } + } +} +.nav-tabs, .nav-pills { + [class^="icon-"], + [class*=" icon-"] { + &, &.icon-large { line-height: .9em; } + } +} +.btn { + [class^="icon-"], + [class*=" icon-"] { + &.pull-left, &.pull-right { + &.icon-2x { margin-top: .18em; } + } + &.icon-spin.icon-large { line-height: .8em; } + } +} +.btn.btn-small { + [class^="icon-"], + [class*=" icon-"] { + &.pull-left, &.pull-right { + &.icon-2x { margin-top: .25em; } + } + } +} +.btn.btn-large { + [class^="icon-"], + [class*=" icon-"] { + margin-top: 0; // overrides bootstrap default + &.pull-left, &.pull-right { + &.icon-2x { margin-top: .05em; } + } + &.pull-left.icon-2x { margin-right: .2em; } + &.pull-right.icon-2x { margin-left: .2em; } + } +} + +/* Fixes alignment in nav lists */ +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + line-height: inherit; +} diff --git a/ckan/public/base/vendor/font-awesome/less/core.less b/ckan/public/base/vendor/font-awesome/less/core.less new file mode 100644 index 00000000000..1ef7e223542 --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/core.less @@ -0,0 +1,129 @@ +/* FONT AWESOME CORE + * -------------------------- */ + +[class^="icon-"], +[class*=" icon-"] { + .icon-FontAwesome(); +} + +[class^="icon-"]:before, +[class*=" icon-"]:before { + text-decoration: inherit; + display: inline-block; + speak: none; +} + +/* makes the font 33% larger relative to the icon container */ +.icon-large:before { + vertical-align: -10%; + font-size: 4/3em; +} + +/* makes sure icons active on rollover in links */ +a { + [class^="icon-"], + [class*=" icon-"] { + display: inline; + } +} + +/* increased font size for icon-large */ +[class^="icon-"], +[class*=" icon-"] { + &.icon-fixed-width { + display: inline-block; + width: 16/14em; + text-align: right; + padding-right: 4/14em; + &.icon-large { + width: 20/14em; + } + } +} + +.icons-ul { + margin-left: @icons-li-width; + list-style-type: none; + + > li { position: relative; } + + .icon-li { + position: absolute; + left: -@icons-li-width; + width: @icons-li-width; + text-align: center; + line-height: inherit; + } +} + +// allows usage of the hide class directly on font awesome icons +[class^="icon-"], +[class*=" icon-"] { + &.hide { + display: none; + } +} + +.icon-muted { color: @iconMuted; } +.icon-light { color: @iconLight; } +.icon-dark { color: @iconDark; } + +// Icon Borders +// ------------------------- + +.icon-border { + border: solid 1px @borderColor; + padding: .2em .25em .15em; + .border-radius(3px); +} + +// Icon Sizes +// ------------------------- + +.icon-2x { + font-size: 2em; + &.icon-border { + border-width: 2px; + .border-radius(4px); + } +} +.icon-3x { + font-size: 3em; + &.icon-border { + border-width: 3px; + .border-radius(5px); + } +} +.icon-4x { + font-size: 4em; + &.icon-border { + border-width: 4px; + .border-radius(6px); + } +} + +.icon-5x { + font-size: 5em; + &.icon-border { + border-width: 5px; + .border-radius(7px); + } +} + + +// Floats & Margins +// ------------------------- + +// Quick floats +.pull-right { float: right; } +.pull-left { float: left; } + +[class^="icon-"], +[class*=" icon-"] { + &.pull-left { + margin-right: .3em; + } + &.pull-right { + margin-left: .3em; + } +} diff --git a/ckan/public/base/vendor/font-awesome/less/extras.less b/ckan/public/base/vendor/font-awesome/less/extras.less new file mode 100644 index 00000000000..c93c260c850 --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/extras.less @@ -0,0 +1,93 @@ +/* EXTRAS + * -------------------------- */ + +/* Stacked and layered icon */ +.icon-stack(); + +/* Animated rotating icon */ +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} + +/* Prevent stack and spinners from being taken inline when inside a link */ +a .icon-stack, +a .icon-spin { + display: inline-block; + text-decoration: none; +} + +@-moz-keyframes spin { + 0% { -moz-transform: rotate(0deg); } + 100% { -moz-transform: rotate(359deg); } +} +@-webkit-keyframes spin { + 0% { -webkit-transform: rotate(0deg); } + 100% { -webkit-transform: rotate(359deg); } +} +@-o-keyframes spin { + 0% { -o-transform: rotate(0deg); } + 100% { -o-transform: rotate(359deg); } +} +@-ms-keyframes spin { + 0% { -ms-transform: rotate(0deg); } + 100% { -ms-transform: rotate(359deg); } +} +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(359deg); } +} + +/* Icon rotations and mirroring */ +.icon-rotate-90:before { + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); + -o-transform: rotate(90deg); + transform: rotate(90deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); +} + +.icon-rotate-180:before { + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -ms-transform: rotate(180deg); + -o-transform: rotate(180deg); + transform: rotate(180deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); +} + +.icon-rotate-270:before { + -webkit-transform: rotate(270deg); + -moz-transform: rotate(270deg); + -ms-transform: rotate(270deg); + -o-transform: rotate(270deg); + transform: rotate(270deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); +} + +.icon-flip-horizontal:before { + -webkit-transform: scale(-1, 1); + -moz-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + -o-transform: scale(-1, 1); + transform: scale(-1, 1); +} + +.icon-flip-vertical:before { + -webkit-transform: scale(1, -1); + -moz-transform: scale(1, -1); + -ms-transform: scale(1, -1); + -o-transform: scale(1, -1); + transform: scale(1, -1); +} + +/* ensure rotation occurs inside anchor tags */ +a { + .icon-rotate-90, .icon-rotate-180, .icon-rotate-270, .icon-flip-horizontal, .icon-flip-vertical { + &:before { display: inline-block; } + } +} diff --git a/ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less b/ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less old mode 100755 new mode 100644 index 2bb1b5c156b..6675c49892f --- a/ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less +++ b/ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less @@ -1,24 +1,27 @@ /*! - * Font Awesome 3.0.2 - * the iconic font designed for use with Twitter Bootstrap - * ------------------------------------------------------- - * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ + * Font Awesome 3.2.1 + * the iconic font designed for Bootstrap + * ------------------------------------------------------------------------------ + * The full suite of pictographic icons, examples, and documentation can be + * found at http://fontawesome.io. Stay up to date on Twitter at + * http://twitter.com/fontawesome. * * License - * ------------------------------------------------------- - * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - + * ------------------------------------------------------------------------------ + * - The Font Awesome font is licensed under SIL OFL 1.1 - + * http://scripts.sil.org/OFL + * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License - * http://opensource.org/licenses/mit-license.html - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - Font Awesome documentation licensed under CC BY 3.0 - + * http://creativecommons.org/licenses/by/3.0/ * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - - * Contact - * ------------------------------------------------------- - * Email: dave@davegandy.com - * Twitter: http://twitter.com/fortaweso_me - * Work: Lead Product Designer @ http://kyruus.com + * "Font Awesome by Dave Gandy - http://fontawesome.io" + * + * Author - Dave Gandy + * ------------------------------------------------------------------------------ + * Email: dave@fontawesome.io + * Twitter: http://twitter.com/davegandy + * Work: Lead Product Designer @ Kyruus - http://kyruus.com */ .icon-large { @@ -72,279 +75,1879 @@ a [class*=" icon-"] { cursor: pointer; } -ul.icons { - text-indent: -1.5em; - margin-left: 3em; -} - - -.ie7icon(@inner) { - *zoom: ~"expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '@{inner}')"; -} - -.icon-glass { .ie7icon(''); } -.icon-music { .ie7icon(''); } -.icon-search { .ie7icon(''); } -.icon-envelope { .ie7icon(''); } -.icon-heart { .ie7icon(''); } -.icon-star { .ie7icon(''); } -.icon-star-empty { .ie7icon(''); } -.icon-user { .ie7icon(''); } -.icon-film { .ie7icon(''); } -.icon-th-large { .ie7icon(''); } -.icon-th { .ie7icon(''); } -.icon-th-list { .ie7icon(''); } -.icon-ok { .ie7icon(''); } -.icon-remove { .ie7icon(''); } -.icon-zoom-in { .ie7icon(''); } - -.icon-zoom-out { .ie7icon(''); } -.icon-off { .ie7icon(''); } -.icon-signal { .ie7icon(''); } -.icon-cog { .ie7icon(''); } -.icon-trash { .ie7icon(''); } -.icon-home { .ie7icon(''); } -.icon-file { .ie7icon(''); } -.icon-time { .ie7icon(''); } -.icon-road { .ie7icon(''); } -.icon-download-alt { .ie7icon(''); } -.icon-download { .ie7icon(''); } -.icon-upload { .ie7icon(''); } -.icon-inbox { .ie7icon(''); } -.icon-play-circle { .ie7icon(''); } -.icon-repeat { .ie7icon(''); } - -.icon-refresh { .ie7icon(''); } -.icon-list-alt { .ie7icon(''); } -.icon-lock { .ie7icon(''); } -.icon-flag { .ie7icon(''); } -.icon-headphones { .ie7icon(''); } -.icon-volume-off { .ie7icon(''); } -.icon-volume-down { .ie7icon(''); } -.icon-volume-up { .ie7icon(''); } -.icon-qrcode { .ie7icon(''); } -.icon-barcode { .ie7icon(''); } -.icon-tag { .ie7icon(''); } -.icon-tags { .ie7icon(''); } -.icon-book { .ie7icon(''); } -.icon-bookmark { .ie7icon(''); } -.icon-print { .ie7icon(''); } - -.icon-camera { .ie7icon(''); } -.icon-font { .ie7icon(''); } -.icon-bold { .ie7icon(''); } -.icon-italic { .ie7icon(''); } -.icon-text-height { .ie7icon(''); } -.icon-text-width { .ie7icon(''); } -.icon-align-left { .ie7icon(''); } -.icon-align-center { .ie7icon(''); } -.icon-align-right { .ie7icon(''); } -.icon-align-justify { .ie7icon(''); } -.icon-list { .ie7icon(''); } -.icon-indent-left { .ie7icon(''); } -.icon-indent-right { .ie7icon(''); } -.icon-facetime-video { .ie7icon(''); } -.icon-picture { .ie7icon(''); } - -.icon-pencil { .ie7icon(''); } -.icon-map-marker { .ie7icon(''); } -.icon-adjust { .ie7icon(''); } -.icon-tint { .ie7icon(''); } -.icon-edit { .ie7icon(''); } -.icon-share { .ie7icon(''); } -.icon-check { .ie7icon(''); } -.icon-move { .ie7icon(''); } -.icon-step-backward { .ie7icon(''); } -.icon-fast-backward { .ie7icon(''); } -.icon-backward { .ie7icon(''); } -.icon-play { .ie7icon(''); } -.icon-pause { .ie7icon(''); } -.icon-stop { .ie7icon(''); } -.icon-forward { .ie7icon(''); } - -.icon-fast-forward { .ie7icon(''); } -.icon-step-forward { .ie7icon(''); } -.icon-eject { .ie7icon(''); } -.icon-chevron-left { .ie7icon(''); } -.icon-chevron-right { .ie7icon(''); } -.icon-plus-sign { .ie7icon(''); } -.icon-minus-sign { .ie7icon(''); } -.icon-remove-sign { .ie7icon(''); } -.icon-ok-sign { .ie7icon(''); } -.icon-question-sign { .ie7icon(''); } -.icon-info-sign { .ie7icon(''); } -.icon-screenshot { .ie7icon(''); } -.icon-remove-circle { .ie7icon(''); } -.icon-ok-circle { .ie7icon(''); } -.icon-ban-circle { .ie7icon(''); } - -.icon-arrow-left { .ie7icon(''); } -.icon-arrow-right { .ie7icon(''); } -.icon-arrow-up { .ie7icon(''); } -.icon-arrow-down { .ie7icon(''); } -.icon-share-alt { .ie7icon(''); } -.icon-resize-full { .ie7icon(''); } -.icon-resize-small { .ie7icon(''); } -.icon-plus { .ie7icon(''); } -.icon-minus { .ie7icon(''); } -.icon-asterisk { .ie7icon(''); } -.icon-exclamation-sign { .ie7icon(''); } -.icon-gift { .ie7icon(''); } -.icon-leaf { .ie7icon(''); } -.icon-fire { .ie7icon(''); } -.icon-eye-open { .ie7icon(''); } - -.icon-eye-close { .ie7icon(''); } -.icon-warning-sign { .ie7icon(''); } -.icon-plane { .ie7icon(''); } -.icon-calendar { .ie7icon(''); } -.icon-random { .ie7icon(''); } -.icon-comment { .ie7icon(''); } -.icon-magnet { .ie7icon(''); } -.icon-chevron-up { .ie7icon(''); } -.icon-chevron-down { .ie7icon(''); } -.icon-retweet { .ie7icon(''); } -.icon-shopping-cart { .ie7icon(''); } -.icon-folder-close { .ie7icon(''); } -.icon-folder-open { .ie7icon(''); } -.icon-resize-vertical { .ie7icon(''); } -.icon-resize-horizontal { .ie7icon(''); } - -.icon-bar-chart { .ie7icon(''); } -.icon-twitter-sign { .ie7icon(''); } -.icon-facebook-sign { .ie7icon(''); } -.icon-camera-retro { .ie7icon(''); } -.icon-key { .ie7icon(''); } -.icon-cogs { .ie7icon(''); } -.icon-comments { .ie7icon(''); } -.icon-thumbs-up { .ie7icon(''); } -.icon-thumbs-down { .ie7icon(''); } -.icon-star-half { .ie7icon(''); } -.icon-heart-empty { .ie7icon(''); } -.icon-signout { .ie7icon(''); } -.icon-linkedin-sign { .ie7icon(''); } -.icon-pushpin { .ie7icon(''); } -.icon-external-link { .ie7icon(''); } - -.icon-signin { .ie7icon(''); } -.icon-trophy { .ie7icon(''); } -.icon-github-sign { .ie7icon(''); } -.icon-upload-alt { .ie7icon(''); } -.icon-lemon { .ie7icon(''); } -.icon-phone { .ie7icon(''); } -.icon-check-empty { .ie7icon(''); } -.icon-bookmark-empty { .ie7icon(''); } -.icon-phone-sign { .ie7icon(''); } -.icon-twitter { .ie7icon(''); } -.icon-facebook { .ie7icon(''); } -.icon-github { .ie7icon(''); } -.icon-unlock { .ie7icon(''); } -.icon-credit-card { .ie7icon(''); } -.icon-rss { .ie7icon(''); } - -.icon-hdd { .ie7icon(''); } -.icon-bullhorn { .ie7icon(''); } -.icon-bell { .ie7icon(''); } -.icon-certificate { .ie7icon(''); } -.icon-hand-right { .ie7icon(''); } -.icon-hand-left { .ie7icon(''); } -.icon-hand-up { .ie7icon(''); } -.icon-hand-down { .ie7icon(''); } -.icon-circle-arrow-left { .ie7icon(''); } -.icon-circle-arrow-right { .ie7icon(''); } -.icon-circle-arrow-up { .ie7icon(''); } -.icon-circle-arrow-down { .ie7icon(''); } -.icon-globe { .ie7icon(''); } -.icon-wrench { .ie7icon(''); } -.icon-tasks { .ie7icon(''); } - -.icon-filter { .ie7icon(''); } -.icon-briefcase { .ie7icon(''); } -.icon-fullscreen { .ie7icon(''); } - -.icon-group { .ie7icon(''); } -.icon-link { .ie7icon(''); } -.icon-cloud { .ie7icon(''); } -.icon-beaker { .ie7icon(''); } -.icon-cut { .ie7icon(''); } -.icon-copy { .ie7icon(''); } -.icon-paper-clip { .ie7icon(''); } -.icon-save { .ie7icon(''); } -.icon-sign-blank { .ie7icon(''); } -.icon-reorder { .ie7icon(''); } -.icon-list-ul { .ie7icon(''); } -.icon-list-ol { .ie7icon(''); } -.icon-strikethrough { .ie7icon(''); } -.icon-underline { .ie7icon(''); } -.icon-table { .ie7icon(''); } - -.icon-magic { .ie7icon(''); } -.icon-truck { .ie7icon(''); } -.icon-pinterest { .ie7icon(''); } -.icon-pinterest-sign { .ie7icon(''); } -.icon-google-plus-sign { .ie7icon(''); } -.icon-google-plus { .ie7icon(''); } -.icon-money { .ie7icon(''); } -.icon-caret-down { .ie7icon(''); } -.icon-caret-up { .ie7icon(''); } -.icon-caret-left { .ie7icon(''); } -.icon-caret-right { .ie7icon(''); } -.icon-columns { .ie7icon(''); } -.icon-sort { .ie7icon(''); } -.icon-sort-down { .ie7icon(''); } -.icon-sort-up { .ie7icon(''); } - -.icon-envelope-alt { .ie7icon(''); } -.icon-linkedin { .ie7icon(''); } -.icon-undo { .ie7icon(''); } -.icon-legal { .ie7icon(''); } -.icon-dashboard { .ie7icon(''); } -.icon-comment-alt { .ie7icon(''); } -.icon-comments-alt { .ie7icon(''); } -.icon-bolt { .ie7icon(''); } -.icon-sitemap { .ie7icon(''); } -.icon-umbrella { .ie7icon(''); } -.icon-paste { .ie7icon(''); } -.icon-lightbulb { .ie7icon(''); } -.icon-exchange { .ie7icon(''); } -.icon-cloud-download { .ie7icon(''); } -.icon-cloud-upload { .ie7icon(''); } - -.icon-user-md { .ie7icon(''); } -.icon-stethoscope { .ie7icon(''); } -.icon-suitcase { .ie7icon(''); } -.icon-bell-alt { .ie7icon(''); } -.icon-coffee { .ie7icon(''); } -.icon-food { .ie7icon(''); } -.icon-file-alt { .ie7icon(''); } -.icon-building { .ie7icon(''); } -.icon-hospital { .ie7icon(''); } -.icon-ambulance { .ie7icon(''); } -.icon-medkit { .ie7icon(''); } -.icon-fighter-jet { .ie7icon(''); } -.icon-beer { .ie7icon(''); } -.icon-h-sign { .ie7icon(''); } -.icon-plus-sign-alt { .ie7icon(''); } - -.icon-double-angle-left { .ie7icon(''); } -.icon-double-angle-right { .ie7icon(''); } -.icon-double-angle-up { .ie7icon(''); } -.icon-double-angle-down { .ie7icon(''); } -.icon-angle-left { .ie7icon(''); } -.icon-angle-right { .ie7icon(''); } -.icon-angle-up { .ie7icon(''); } -.icon-angle-down { .ie7icon(''); } -.icon-desktop { .ie7icon(''); } -.icon-laptop { .ie7icon(''); } -.icon-tablet { .ie7icon(''); } -.icon-mobile-phone { .ie7icon(''); } -.icon-circle-blank { .ie7icon(''); } -.icon-quote-left { .ie7icon(''); } -.icon-quote-right { .ie7icon(''); } - -.icon-spinner { .ie7icon(''); } -.icon-circle { .ie7icon(''); } -.icon-reply { .ie7icon(''); } -.icon-github-alt { .ie7icon(''); } -.icon-folder-close-alt { .ie7icon(''); } -.icon-folder-open-alt { .ie7icon(''); } +.ie7icon(@inner) { *zoom: ~"expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '@{inner}')"; } + + +.icon-glass { + .ie7icon(''); +} + + +.icon-music { + .ie7icon(''); +} + + +.icon-search { + .ie7icon(''); +} + + +.icon-envelope-alt { + .ie7icon(''); +} + + +.icon-heart { + .ie7icon(''); +} + + +.icon-star { + .ie7icon(''); +} + + +.icon-star-empty { + .ie7icon(''); +} + + +.icon-user { + .ie7icon(''); +} + + +.icon-film { + .ie7icon(''); +} + + +.icon-th-large { + .ie7icon(''); +} + + +.icon-th { + .ie7icon(''); +} + + +.icon-th-list { + .ie7icon(''); +} + + +.icon-ok { + .ie7icon(''); +} + + +.icon-remove { + .ie7icon(''); +} + + +.icon-zoom-in { + .ie7icon(''); +} + + +.icon-zoom-out { + .ie7icon(''); +} + + +.icon-off { + .ie7icon(''); +} + +.icon-power-off { + .ie7icon(''); +} + + +.icon-signal { + .ie7icon(''); +} + + +.icon-cog { + .ie7icon(''); +} + +.icon-gear { + .ie7icon(''); +} + + +.icon-trash { + .ie7icon(''); +} + + +.icon-home { + .ie7icon(''); +} + + +.icon-file-alt { + .ie7icon(''); +} + + +.icon-time { + .ie7icon(''); +} + + +.icon-road { + .ie7icon(''); +} + + +.icon-download-alt { + .ie7icon(''); +} + + +.icon-download { + .ie7icon(''); +} + + +.icon-upload { + .ie7icon(''); +} + + +.icon-inbox { + .ie7icon(''); +} + + +.icon-play-circle { + .ie7icon(''); +} + + +.icon-repeat { + .ie7icon(''); +} + +.icon-rotate-right { + .ie7icon(''); +} + + +.icon-refresh { + .ie7icon(''); +} + + +.icon-list-alt { + .ie7icon(''); +} + + +.icon-lock { + .ie7icon(''); +} + + +.icon-flag { + .ie7icon(''); +} + + +.icon-headphones { + .ie7icon(''); +} + + +.icon-volume-off { + .ie7icon(''); +} + + +.icon-volume-down { + .ie7icon(''); +} + + +.icon-volume-up { + .ie7icon(''); +} + + +.icon-qrcode { + .ie7icon(''); +} + + +.icon-barcode { + .ie7icon(''); +} + + +.icon-tag { + .ie7icon(''); +} + + +.icon-tags { + .ie7icon(''); +} + + +.icon-book { + .ie7icon(''); +} + + +.icon-bookmark { + .ie7icon(''); +} + + +.icon-print { + .ie7icon(''); +} + + +.icon-camera { + .ie7icon(''); +} + + +.icon-font { + .ie7icon(''); +} + + +.icon-bold { + .ie7icon(''); +} + + +.icon-italic { + .ie7icon(''); +} + + +.icon-text-height { + .ie7icon(''); +} + + +.icon-text-width { + .ie7icon(''); +} + + +.icon-align-left { + .ie7icon(''); +} + + +.icon-align-center { + .ie7icon(''); +} + + +.icon-align-right { + .ie7icon(''); +} + + +.icon-align-justify { + .ie7icon(''); +} + + +.icon-list { + .ie7icon(''); +} + + +.icon-indent-left { + .ie7icon(''); +} + + +.icon-indent-right { + .ie7icon(''); +} + + +.icon-facetime-video { + .ie7icon(''); +} + + +.icon-picture { + .ie7icon(''); +} + + +.icon-pencil { + .ie7icon(''); +} + + +.icon-map-marker { + .ie7icon(''); +} + + +.icon-adjust { + .ie7icon(''); +} + + +.icon-tint { + .ie7icon(''); +} + + +.icon-edit { + .ie7icon(''); +} + + +.icon-share { + .ie7icon(''); +} + + +.icon-check { + .ie7icon(''); +} + + +.icon-move { + .ie7icon(''); +} + + +.icon-step-backward { + .ie7icon(''); +} + + +.icon-fast-backward { + .ie7icon(''); +} + + +.icon-backward { + .ie7icon(''); +} + + +.icon-play { + .ie7icon(''); +} + + +.icon-pause { + .ie7icon(''); +} + + +.icon-stop { + .ie7icon(''); +} + + +.icon-forward { + .ie7icon(''); +} + + +.icon-fast-forward { + .ie7icon(''); +} + + +.icon-step-forward { + .ie7icon(''); +} + + +.icon-eject { + .ie7icon(''); +} + + +.icon-chevron-left { + .ie7icon(''); +} + + +.icon-chevron-right { + .ie7icon(''); +} + + +.icon-plus-sign { + .ie7icon(''); +} + + +.icon-minus-sign { + .ie7icon(''); +} + + +.icon-remove-sign { + .ie7icon(''); +} + + +.icon-ok-sign { + .ie7icon(''); +} + + +.icon-question-sign { + .ie7icon(''); +} + + +.icon-info-sign { + .ie7icon(''); +} + + +.icon-screenshot { + .ie7icon(''); +} + + +.icon-remove-circle { + .ie7icon(''); +} + + +.icon-ok-circle { + .ie7icon(''); +} + + +.icon-ban-circle { + .ie7icon(''); +} + + +.icon-arrow-left { + .ie7icon(''); +} + + +.icon-arrow-right { + .ie7icon(''); +} + + +.icon-arrow-up { + .ie7icon(''); +} + + +.icon-arrow-down { + .ie7icon(''); +} + + +.icon-share-alt { + .ie7icon(''); +} + +.icon-mail-forward { + .ie7icon(''); +} + + +.icon-resize-full { + .ie7icon(''); +} + + +.icon-resize-small { + .ie7icon(''); +} + + +.icon-plus { + .ie7icon(''); +} + + +.icon-minus { + .ie7icon(''); +} + + +.icon-asterisk { + .ie7icon(''); +} + + +.icon-exclamation-sign { + .ie7icon(''); +} + + +.icon-gift { + .ie7icon(''); +} + + +.icon-leaf { + .ie7icon(''); +} + + +.icon-fire { + .ie7icon(''); +} + + +.icon-eye-open { + .ie7icon(''); +} + + +.icon-eye-close { + .ie7icon(''); +} + + +.icon-warning-sign { + .ie7icon(''); +} + + +.icon-plane { + .ie7icon(''); +} + + +.icon-calendar { + .ie7icon(''); +} + + +.icon-random { + .ie7icon(''); +} + + +.icon-comment { + .ie7icon(''); +} + + +.icon-magnet { + .ie7icon(''); +} + + +.icon-chevron-up { + .ie7icon(''); +} + + +.icon-chevron-down { + .ie7icon(''); +} + + +.icon-retweet { + .ie7icon(''); +} + + +.icon-shopping-cart { + .ie7icon(''); +} + + +.icon-folder-close { + .ie7icon(''); +} + + +.icon-folder-open { + .ie7icon(''); +} + + +.icon-resize-vertical { + .ie7icon(''); +} + + +.icon-resize-horizontal { + .ie7icon(''); +} + + +.icon-bar-chart { + .ie7icon(''); +} + + +.icon-twitter-sign { + .ie7icon(''); +} + + +.icon-facebook-sign { + .ie7icon(''); +} + + +.icon-camera-retro { + .ie7icon(''); +} + + +.icon-key { + .ie7icon(''); +} + + +.icon-cogs { + .ie7icon(''); +} + +.icon-gears { + .ie7icon(''); +} + + +.icon-comments { + .ie7icon(''); +} + + +.icon-thumbs-up-alt { + .ie7icon(''); +} + + +.icon-thumbs-down-alt { + .ie7icon(''); +} + + +.icon-star-half { + .ie7icon(''); +} + + +.icon-heart-empty { + .ie7icon(''); +} + + +.icon-signout { + .ie7icon(''); +} + + +.icon-linkedin-sign { + .ie7icon(''); +} + + +.icon-pushpin { + .ie7icon(''); +} + + +.icon-external-link { + .ie7icon(''); +} + + +.icon-signin { + .ie7icon(''); +} + + +.icon-trophy { + .ie7icon(''); +} + + +.icon-github-sign { + .ie7icon(''); +} + + +.icon-upload-alt { + .ie7icon(''); +} + + +.icon-lemon { + .ie7icon(''); +} + + +.icon-phone { + .ie7icon(''); +} + + +.icon-check-empty { + .ie7icon(''); +} + +.icon-unchecked { + .ie7icon(''); +} + + +.icon-bookmark-empty { + .ie7icon(''); +} + + +.icon-phone-sign { + .ie7icon(''); +} + + +.icon-twitter { + .ie7icon(''); +} + + +.icon-facebook { + .ie7icon(''); +} + + +.icon-github { + .ie7icon(''); +} + + +.icon-unlock { + .ie7icon(''); +} + + +.icon-credit-card { + .ie7icon(''); +} + + +.icon-rss { + .ie7icon(''); +} + + +.icon-hdd { + .ie7icon(''); +} + + +.icon-bullhorn { + .ie7icon(''); +} + + +.icon-bell { + .ie7icon(''); +} + + +.icon-certificate { + .ie7icon(''); +} + + +.icon-hand-right { + .ie7icon(''); +} + + +.icon-hand-left { + .ie7icon(''); +} + + +.icon-hand-up { + .ie7icon(''); +} + + +.icon-hand-down { + .ie7icon(''); +} + + +.icon-circle-arrow-left { + .ie7icon(''); +} + + +.icon-circle-arrow-right { + .ie7icon(''); +} + + +.icon-circle-arrow-up { + .ie7icon(''); +} + + +.icon-circle-arrow-down { + .ie7icon(''); +} + + +.icon-globe { + .ie7icon(''); +} + + +.icon-wrench { + .ie7icon(''); +} + + +.icon-tasks { + .ie7icon(''); +} + + +.icon-filter { + .ie7icon(''); +} + + +.icon-briefcase { + .ie7icon(''); +} + + +.icon-fullscreen { + .ie7icon(''); +} + + +.icon-group { + .ie7icon(''); +} + + +.icon-link { + .ie7icon(''); +} + + +.icon-cloud { + .ie7icon(''); +} + + +.icon-beaker { + .ie7icon(''); +} + + +.icon-cut { + .ie7icon(''); +} + + +.icon-copy { + .ie7icon(''); +} + + +.icon-paper-clip { + .ie7icon(''); +} + +.icon-paperclip { + .ie7icon(''); +} + + +.icon-save { + .ie7icon(''); +} + + +.icon-sign-blank { + .ie7icon(''); +} + + +.icon-reorder { + .ie7icon(''); +} + + +.icon-list-ul { + .ie7icon(''); +} + + +.icon-list-ol { + .ie7icon(''); +} + + +.icon-strikethrough { + .ie7icon(''); +} + + +.icon-underline { + .ie7icon(''); +} + + +.icon-table { + .ie7icon(''); +} + + +.icon-magic { + .ie7icon(''); +} + + +.icon-truck { + .ie7icon(''); +} + + +.icon-pinterest { + .ie7icon(''); +} + + +.icon-pinterest-sign { + .ie7icon(''); +} + + +.icon-google-plus-sign { + .ie7icon(''); +} + + +.icon-google-plus { + .ie7icon(''); +} + + +.icon-money { + .ie7icon(''); +} + + +.icon-caret-down { + .ie7icon(''); +} + + +.icon-caret-up { + .ie7icon(''); +} + + +.icon-caret-left { + .ie7icon(''); +} + + +.icon-caret-right { + .ie7icon(''); +} + + +.icon-columns { + .ie7icon(''); +} + + +.icon-sort { + .ie7icon(''); +} + + +.icon-sort-down { + .ie7icon(''); +} + + +.icon-sort-up { + .ie7icon(''); +} + + +.icon-envelope { + .ie7icon(''); +} + + +.icon-linkedin { + .ie7icon(''); +} + + +.icon-undo { + .ie7icon(''); +} + +.icon-rotate-left { + .ie7icon(''); +} + + +.icon-legal { + .ie7icon(''); +} + + +.icon-dashboard { + .ie7icon(''); +} + + +.icon-comment-alt { + .ie7icon(''); +} + + +.icon-comments-alt { + .ie7icon(''); +} + + +.icon-bolt { + .ie7icon(''); +} + + +.icon-sitemap { + .ie7icon(''); +} + + +.icon-umbrella { + .ie7icon(''); +} + + +.icon-paste { + .ie7icon(''); +} + + +.icon-lightbulb { + .ie7icon(''); +} + + +.icon-exchange { + .ie7icon(''); +} + + +.icon-cloud-download { + .ie7icon(''); +} + + +.icon-cloud-upload { + .ie7icon(''); +} + + +.icon-user-md { + .ie7icon(''); +} + + +.icon-stethoscope { + .ie7icon(''); +} + + +.icon-suitcase { + .ie7icon(''); +} + + +.icon-bell-alt { + .ie7icon(''); +} + + +.icon-coffee { + .ie7icon(''); +} + + +.icon-food { + .ie7icon(''); +} + + +.icon-file-text-alt { + .ie7icon(''); +} + + +.icon-building { + .ie7icon(''); +} + + +.icon-hospital { + .ie7icon(''); +} + + +.icon-ambulance { + .ie7icon(''); +} + + +.icon-medkit { + .ie7icon(''); +} + + +.icon-fighter-jet { + .ie7icon(''); +} + + +.icon-beer { + .ie7icon(''); +} + + +.icon-h-sign { + .ie7icon(''); +} + + +.icon-plus-sign-alt { + .ie7icon(''); +} + + +.icon-double-angle-left { + .ie7icon(''); +} + + +.icon-double-angle-right { + .ie7icon(''); +} + + +.icon-double-angle-up { + .ie7icon(''); +} + + +.icon-double-angle-down { + .ie7icon(''); +} + + +.icon-angle-left { + .ie7icon(''); +} + + +.icon-angle-right { + .ie7icon(''); +} + + +.icon-angle-up { + .ie7icon(''); +} + + +.icon-angle-down { + .ie7icon(''); +} + + +.icon-desktop { + .ie7icon(''); +} + + +.icon-laptop { + .ie7icon(''); +} + + +.icon-tablet { + .ie7icon(''); +} + + +.icon-mobile-phone { + .ie7icon(''); +} + + +.icon-circle-blank { + .ie7icon(''); +} + + +.icon-quote-left { + .ie7icon(''); +} + + +.icon-quote-right { + .ie7icon(''); +} + + +.icon-spinner { + .ie7icon(''); +} + + +.icon-circle { + .ie7icon(''); +} + + +.icon-reply { + .ie7icon(''); +} + +.icon-mail-reply { + .ie7icon(''); +} + + +.icon-github-alt { + .ie7icon(''); +} + + +.icon-folder-close-alt { + .ie7icon(''); +} + + +.icon-folder-open-alt { + .ie7icon(''); +} + + +.icon-expand-alt { + .ie7icon(''); +} + + +.icon-collapse-alt { + .ie7icon(''); +} + + +.icon-smile { + .ie7icon(''); +} + + +.icon-frown { + .ie7icon(''); +} + + +.icon-meh { + .ie7icon(''); +} + + +.icon-gamepad { + .ie7icon(''); +} + + +.icon-keyboard { + .ie7icon(''); +} + + +.icon-flag-alt { + .ie7icon(''); +} + + +.icon-flag-checkered { + .ie7icon(''); +} + + +.icon-terminal { + .ie7icon(''); +} + + +.icon-code { + .ie7icon(''); +} + + +.icon-reply-all { + .ie7icon(''); +} + + +.icon-mail-reply-all { + .ie7icon(''); +} + + +.icon-star-half-empty { + .ie7icon(''); +} + +.icon-star-half-full { + .ie7icon(''); +} + + +.icon-location-arrow { + .ie7icon(''); +} + + +.icon-crop { + .ie7icon(''); +} + + +.icon-code-fork { + .ie7icon(''); +} + + +.icon-unlink { + .ie7icon(''); +} + + +.icon-question { + .ie7icon(''); +} + + +.icon-info { + .ie7icon(''); +} + + +.icon-exclamation { + .ie7icon(''); +} + + +.icon-superscript { + .ie7icon(''); +} + + +.icon-subscript { + .ie7icon(''); +} + + +.icon-eraser { + .ie7icon(''); +} + + +.icon-puzzle-piece { + .ie7icon(''); +} + + +.icon-microphone { + .ie7icon(''); +} + + +.icon-microphone-off { + .ie7icon(''); +} + + +.icon-shield { + .ie7icon(''); +} + + +.icon-calendar-empty { + .ie7icon(''); +} + + +.icon-fire-extinguisher { + .ie7icon(''); +} + + +.icon-rocket { + .ie7icon(''); +} + + +.icon-maxcdn { + .ie7icon(''); +} + + +.icon-chevron-sign-left { + .ie7icon(''); +} + + +.icon-chevron-sign-right { + .ie7icon(''); +} + + +.icon-chevron-sign-up { + .ie7icon(''); +} + + +.icon-chevron-sign-down { + .ie7icon(''); +} + + +.icon-html5 { + .ie7icon(''); +} + + +.icon-css3 { + .ie7icon(''); +} + + +.icon-anchor { + .ie7icon(''); +} + + +.icon-unlock-alt { + .ie7icon(''); +} + + +.icon-bullseye { + .ie7icon(''); +} + + +.icon-ellipsis-horizontal { + .ie7icon(''); +} + + +.icon-ellipsis-vertical { + .ie7icon(''); +} + + +.icon-rss-sign { + .ie7icon(''); +} + + +.icon-play-sign { + .ie7icon(''); +} + + +.icon-ticket { + .ie7icon(''); +} + + +.icon-minus-sign-alt { + .ie7icon(''); +} + + +.icon-check-minus { + .ie7icon(''); +} + + +.icon-level-up { + .ie7icon(''); +} + + +.icon-level-down { + .ie7icon(''); +} + + +.icon-check-sign { + .ie7icon(''); +} + + +.icon-edit-sign { + .ie7icon(''); +} + + +.icon-external-link-sign { + .ie7icon(''); +} + + +.icon-share-sign { + .ie7icon(''); +} + + +.icon-compass { + .ie7icon(''); +} + + +.icon-collapse { + .ie7icon(''); +} + + +.icon-collapse-top { + .ie7icon(''); +} + + +.icon-expand { + .ie7icon(''); +} + + +.icon-eur { + .ie7icon(''); +} + +.icon-euro { + .ie7icon(''); +} + + +.icon-gbp { + .ie7icon(''); +} + + +.icon-usd { + .ie7icon(''); +} + +.icon-dollar { + .ie7icon(''); +} + + +.icon-inr { + .ie7icon(''); +} + +.icon-rupee { + .ie7icon(''); +} + + +.icon-jpy { + .ie7icon(''); +} + +.icon-yen { + .ie7icon(''); +} + + +.icon-cny { + .ie7icon(''); +} + +.icon-renminbi { + .ie7icon(''); +} + + +.icon-krw { + .ie7icon(''); +} + +.icon-won { + .ie7icon(''); +} + + +.icon-btc { + .ie7icon(''); +} + +.icon-bitcoin { + .ie7icon(''); +} + + +.icon-file { + .ie7icon(''); +} + + +.icon-file-text { + .ie7icon(''); +} + + +.icon-sort-by-alphabet { + .ie7icon(''); +} + + +.icon-sort-by-alphabet-alt { + .ie7icon(''); +} + + +.icon-sort-by-attributes { + .ie7icon(''); +} + + +.icon-sort-by-attributes-alt { + .ie7icon(''); +} + + +.icon-sort-by-order { + .ie7icon(''); +} + + +.icon-sort-by-order-alt { + .ie7icon(''); +} + + +.icon-thumbs-up { + .ie7icon(''); +} + + +.icon-thumbs-down { + .ie7icon(''); +} + + +.icon-youtube-sign { + .ie7icon(''); +} + + +.icon-youtube { + .ie7icon(''); +} + + +.icon-xing { + .ie7icon(''); +} + + +.icon-xing-sign { + .ie7icon(''); +} + + +.icon-youtube-play { + .ie7icon(''); +} + + +.icon-dropbox { + .ie7icon(''); +} + + +.icon-stackexchange { + .ie7icon(''); +} + + +.icon-instagram { + .ie7icon(''); +} + + +.icon-flickr { + .ie7icon(''); +} + + +.icon-adn { + .ie7icon(''); +} + + +.icon-bitbucket { + .ie7icon(''); +} + + +.icon-bitbucket-sign { + .ie7icon(''); +} + + +.icon-tumblr { + .ie7icon(''); +} + + +.icon-tumblr-sign { + .ie7icon(''); +} + + +.icon-long-arrow-down { + .ie7icon(''); +} + + +.icon-long-arrow-up { + .ie7icon(''); +} + + +.icon-long-arrow-left { + .ie7icon(''); +} + + +.icon-long-arrow-right { + .ie7icon(''); +} + + +.icon-apple { + .ie7icon(''); +} + + +.icon-windows { + .ie7icon(''); +} + + +.icon-android { + .ie7icon(''); +} + + +.icon-linux { + .ie7icon(''); +} + + +.icon-dribbble { + .ie7icon(''); +} + + +.icon-skype { + .ie7icon(''); +} + + +.icon-foursquare { + .ie7icon(''); +} + + +.icon-trello { + .ie7icon(''); +} + + +.icon-female { + .ie7icon(''); +} + + +.icon-male { + .ie7icon(''); +} + + +.icon-gittip { + .ie7icon(''); +} + + +.icon-sun { + .ie7icon(''); +} + + +.icon-moon { + .ie7icon(''); +} + + +.icon-archive { + .ie7icon(''); +} + + +.icon-bug { + .ie7icon(''); +} + + +.icon-vk { + .ie7icon(''); +} + + +.icon-weibo { + .ie7icon(''); +} + + +.icon-renren { + .ie7icon(''); +} + + diff --git a/ckan/public/base/vendor/font-awesome/less/font-awesome.less b/ckan/public/base/vendor/font-awesome/less/font-awesome.less old mode 100755 new mode 100644 index bf6cdd6f6eb..0f454612b93 --- a/ckan/public/base/vendor/font-awesome/less/font-awesome.less +++ b/ckan/public/base/vendor/font-awesome/less/font-awesome.less @@ -1,537 +1,33 @@ /*! - * Font Awesome 3.0.2 - * the iconic font designed for use with Twitter Bootstrap - * ------------------------------------------------------- - * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ + * Font Awesome 3.2.1 + * the iconic font designed for Bootstrap + * ------------------------------------------------------------------------------ + * The full suite of pictographic icons, examples, and documentation can be + * found at http://fontawesome.io. Stay up to date on Twitter at + * http://twitter.com/fontawesome. * * License - * ------------------------------------------------------- - * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - + * ------------------------------------------------------------------------------ + * - The Font Awesome font is licensed under SIL OFL 1.1 - + * http://scripts.sil.org/OFL + * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License - * http://opensource.org/licenses/mit-license.html - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - Font Awesome documentation licensed under CC BY 3.0 - + * http://creativecommons.org/licenses/by/3.0/ * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - - * Contact - * ------------------------------------------------------- - * Email: dave@davegandy.com - * Twitter: http://twitter.com/fortaweso_me - * Work: Lead Product Designer @ http://kyruus.com + * "Font Awesome by Dave Gandy - http://fontawesome.io" + * + * Author - Dave Gandy + * ------------------------------------------------------------------------------ + * Email: dave@fontawesome.io + * Twitter: http://twitter.com/davegandy + * Work: Lead Product Designer @ Kyruus - http://kyruus.com */ -@FontAwesomePath: "../font"; -@borderColor: #eee; -@iconMuted: #eee; -.border-radius(@radius) { -webkit-border-radius: @radius; -moz-border-radius: @radius; border-radius: @radius; } - -@font-face { - font-family: 'FontAwesome'; - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=3.0.1'); - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), - url('@{FontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format('woff'), - url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); -// url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=3.0.1') format('svg'); - -// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); - - font-weight: normal; - font-style: normal; -} - -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"], -[class*=" icon-"] { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - -/* sprites.less reset */ - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} - -/* more sprites.less reset */ -// .icon-white, -// .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-submenu:hover > a > [class^="icon-"], -// .dropdown-submenu:hover > a > [class*=" icon-"] { -// background-image: none; -// } - -// [class^="icon-"]:before, -// [class*=" icon-"]:before { -// text-decoration: inherit; -// display: inline-block; -// speak: none; -// } - -/* makes sure icons active on rollover in links */ -// a { -// [class^="icon-"], -// [class*=" icon-"] { -// display: inline-block; -// } -// } - -/* makes the font 33% larger relative to the icon container */ -// .icon-large:before { -// vertical-align: -10%; -// font-size: 4/3em; -// } - -// .btn, .nav { -// [class^="icon-"], -// [class*=" icon-"] { -// display: inline; -// /* keeps button heights with and without icons the same */ -// &.icon-large { line-height: .9em; } -// &.icon-spin { display: inline-block; } -// } -// } - -// .nav-tabs, .nav-pills { -// [class^="icon-"], -// [class*=" icon-"] { -// /* keeps button heights with and without icons the same */ -// &, &.icon-large { line-height: .9em; } -// } -// } - -// li, .nav li { -// [class^="icon-"], -// [class*=" icon-"] { -// display: inline-block; -// width: 1.25em; -// text-align: center; -// &.icon-large { -// /* increased font size for icon-large */ -// width: 1.25*1.25em; -// } -// } -// } - -// ul.icons { -// list-style-type: none; -// text-indent: -.75em; - -// li { -// [class^="icon-"], -// [class*=" icon-"] { -// width: .75em; -// } -// } -// } - -// .icon-muted { -// color: @iconMuted; -// } - -// Icon Borders -// ------------------------- - -// .icon-border { -// border: solid 1px @borderColor; -// padding: .2em .25em .15em; -// .border-radius(3px); -// } - -// Icon Sizes -// ------------------------- - -// .icon-2x { -// font-size: 2em; -// &.icon-border { -// border-width: 2px; -// .border-radius(4px); -// } -// } -// .icon-3x { -// font-size: 3em; -// &.icon-border { -// border-width: 3px; -// .border-radius(5px); -// } -// } -// .icon-4x { -// font-size: 4em; -// &.icon-border { -// border-width: 4px; -// .border-radius(6px); -// } -// } - -// // Floats -// // ------------------------- - -// // Quick floats -// .pull-right { float: right; } -// .pull-left { float: left; } - -// [class^="icon-"], -// [class*=" icon-"] { -// &.pull-left { -// margin-right: .3em; -// } -// &.pull-right { -// margin-left: .3em; -// } -// } - -// .btn { -// [class^="icon-"], -// [class*=" icon-"] { -// &.pull-left, &.pull-right { -// &.icon-2x { margin-top: .18em; } -// } -// &.icon-spin.icon-large { line-height: .8em; } -// } -// } - -// .btn.btn-small { -// [class^="icon-"], -// [class*=" icon-"] { -// &.pull-left, &.pull-right { -// &.icon-2x { margin-top: .25em; } -// } -// } -// } - -// .btn.btn-large { -// [class^="icon-"], -// [class*=" icon-"] { -// margin-top: 0; // overrides bootstrap default -// &.pull-left, &.pull-right { -// &.icon-2x { margin-top: .05em; } -// } -// &.pull-left.icon-2x { margin-right: .2em; } -// &.pull-right.icon-2x { margin-left: .2em; } -// } -// } - - -.icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -@-moz-keyframes spin { - 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } -} -@-webkit-keyframes spin { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } -} -@-o-keyframes spin { - 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } -} -@-ms-keyframes spin { - 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } -} -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } -} - -@-moz-document url-prefix() { - .icon-spin { height: .9em; } - .btn .icon-spin { height: auto; } - .icon-spin.icon-large { height: 1.25em; } - .btn .icon-spin.icon-large { height: .75em; } -} - -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { content: "\f000"; } -.icon-music:before { content: "\f001"; } -.icon-search:before { content: "\f002"; } -.icon-envelope:before { content: "\f003"; } -.icon-heart:before { content: "\f004"; } -.icon-star:before { content: "\f005"; } -.icon-star-empty:before { content: "\f006"; } -.icon-user:before { content: "\f007"; } -.icon-film:before { content: "\f008"; } -.icon-th-large:before { content: "\f009"; } -.icon-th:before { content: "\f00a"; } -.icon-th-list:before { content: "\f00b"; } -.icon-ok:before { content: "\f00c"; } -.icon-remove:before { content: "\f00d"; } -.icon-zoom-in:before { content: "\f00e"; } - -.icon-zoom-out:before { content: "\f010"; } -.icon-off:before { content: "\f011"; } -.icon-signal:before { content: "\f012"; } -.icon-cog:before { content: "\f013"; } -.icon-trash:before { content: "\f014"; } -.icon-home:before { content: "\f015"; } -.icon-file:before { content: "\f016"; } -.icon-time:before { content: "\f017"; } -.icon-road:before { content: "\f018"; } -.icon-download-alt:before { content: "\f019"; } -.icon-download:before { content: "\f01a"; } -.icon-upload:before { content: "\f01b"; } -.icon-inbox:before { content: "\f01c"; } -.icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before { content: "\f01e"; } - -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { content: "\f021"; } -.icon-list-alt:before { content: "\f022"; } -.icon-lock:before { content: "\f023"; } -.icon-flag:before { content: "\f024"; } -.icon-headphones:before { content: "\f025"; } -.icon-volume-off:before { content: "\f026"; } -.icon-volume-down:before { content: "\f027"; } -.icon-volume-up:before { content: "\f028"; } -.icon-qrcode:before { content: "\f029"; } -.icon-barcode:before { content: "\f02a"; } -.icon-tag:before { content: "\f02b"; } -.icon-tags:before { content: "\f02c"; } -.icon-book:before { content: "\f02d"; } -.icon-bookmark:before { content: "\f02e"; } -.icon-print:before { content: "\f02f"; } - -.icon-camera:before { content: "\f030"; } -.icon-font:before { content: "\f031"; } -.icon-bold:before { content: "\f032"; } -.icon-italic:before { content: "\f033"; } -.icon-text-height:before { content: "\f034"; } -.icon-text-width:before { content: "\f035"; } -.icon-align-left:before { content: "\f036"; } -.icon-align-center:before { content: "\f037"; } -.icon-align-right:before { content: "\f038"; } -.icon-align-justify:before { content: "\f039"; } -.icon-list:before { content: "\f03a"; } -.icon-indent-left:before { content: "\f03b"; } -.icon-indent-right:before { content: "\f03c"; } -.icon-facetime-video:before { content: "\f03d"; } -.icon-picture:before { content: "\f03e"; } - -.icon-pencil:before { content: "\f040"; } -.icon-map-marker:before { content: "\f041"; } -.icon-adjust:before { content: "\f042"; } -.icon-tint:before { content: "\f043"; } -.icon-edit:before { content: "\f044"; } -.icon-share:before { content: "\f045"; } -.icon-check:before { content: "\f046"; } -.icon-move:before { content: "\f047"; } -.icon-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { content: "\f049"; } -.icon-backward:before { content: "\f04a"; } -.icon-play:before { content: "\f04b"; } -.icon-pause:before { content: "\f04c"; } -.icon-stop:before { content: "\f04d"; } -.icon-forward:before { content: "\f04e"; } - -.icon-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { content: "\f051"; } -.icon-eject:before { content: "\f052"; } -.icon-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { content: "\f055"; } -.icon-minus-sign:before { content: "\f056"; } -.icon-remove-sign:before { content: "\f057"; } -.icon-ok-sign:before { content: "\f058"; } -.icon-question-sign:before { content: "\f059"; } -.icon-info-sign:before { content: "\f05a"; } -.icon-screenshot:before { content: "\f05b"; } -.icon-remove-circle:before { content: "\f05c"; } -.icon-ok-circle:before { content: "\f05d"; } -.icon-ban-circle:before { content: "\f05e"; } - -.icon-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before { content: "\f064"; } -.icon-resize-full:before { content: "\f065"; } -.icon-resize-small:before { content: "\f066"; } -.icon-plus:before { content: "\f067"; } -.icon-minus:before { content: "\f068"; } -.icon-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { content: "\f06a"; } -.icon-gift:before { content: "\f06b"; } -.icon-leaf:before { content: "\f06c"; } -.icon-fire:before { content: "\f06d"; } -.icon-eye-open:before { content: "\f06e"; } - -.icon-eye-close:before { content: "\f070"; } -.icon-warning-sign:before { content: "\f071"; } -.icon-plane:before { content: "\f072"; } -.icon-calendar:before { content: "\f073"; } -.icon-random:before { content: "\f074"; } -.icon-comment:before { content: "\f075"; } -.icon-magnet:before { content: "\f076"; } -.icon-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { content: "\f078"; } -.icon-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { content: "\f07b"; } -.icon-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { content: "\f07d"; } -.icon-resize-horizontal:before { content: "\f07e"; } - -.icon-bar-chart:before { content: "\f080"; } -.icon-twitter-sign:before { content: "\f081"; } -.icon-facebook-sign:before { content: "\f082"; } -.icon-camera-retro:before { content: "\f083"; } -.icon-key:before { content: "\f084"; } -.icon-cogs:before { content: "\f085"; } -.icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { content: "\f087"; } -.icon-thumbs-down:before { content: "\f088"; } -.icon-star-half:before { content: "\f089"; } -.icon-heart-empty:before { content: "\f08a"; } -.icon-signout:before { content: "\f08b"; } -.icon-linkedin-sign:before { content: "\f08c"; } -.icon-pushpin:before { content: "\f08d"; } -.icon-external-link:before { content: "\f08e"; } - -.icon-signin:before { content: "\f090"; } -.icon-trophy:before { content: "\f091"; } -.icon-github-sign:before { content: "\f092"; } -.icon-upload-alt:before { content: "\f093"; } -.icon-lemon:before { content: "\f094"; } -.icon-phone:before { content: "\f095"; } -.icon-check-empty:before { content: "\f096"; } -.icon-bookmark-empty:before { content: "\f097"; } -.icon-phone-sign:before { content: "\f098"; } -.icon-twitter:before { content: "\f099"; } -.icon-facebook:before { content: "\f09a"; } -.icon-github:before { content: "\f09b"; } -.icon-unlock:before { content: "\f09c"; } -.icon-credit-card:before { content: "\f09d"; } -.icon-rss:before { content: "\f09e"; } - -.icon-hdd:before { content: "\f0a0"; } -.icon-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { content: "\f0a2"; } -.icon-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { content: "\f0a4"; } -.icon-hand-left:before { content: "\f0a5"; } -.icon-hand-up:before { content: "\f0a6"; } -.icon-hand-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { content: "\f0ab"; } -.icon-globe:before { content: "\f0ac"; } -.icon-wrench:before { content: "\f0ad"; } -.icon-tasks:before { content: "\f0ae"; } - -.icon-filter:before { content: "\f0b0"; } -.icon-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { content: "\f0b2"; } - -.icon-group:before { content: "\f0c0"; } -.icon-link:before { content: "\f0c1"; } -.icon-cloud:before { content: "\f0c2"; } -.icon-beaker:before { content: "\f0c3"; } -.icon-cut:before { content: "\f0c4"; } -.icon-copy:before { content: "\f0c5"; } -.icon-paper-clip:before { content: "\f0c6"; } -.icon-save:before { content: "\f0c7"; } -.icon-sign-blank:before { content: "\f0c8"; } -.icon-reorder:before { content: "\f0c9"; } -.icon-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { content: "\f0cd"; } -.icon-table:before { content: "\f0ce"; } - -.icon-magic:before { content: "\f0d0"; } -.icon-truck:before { content: "\f0d1"; } -.icon-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { content: "\f0d3"; } -.icon-google-plus-sign:before { content: "\f0d4"; } -.icon-google-plus:before { content: "\f0d5"; } -.icon-money:before { content: "\f0d6"; } -.icon-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { content: "\f0da"; } -.icon-columns:before { content: "\f0db"; } -.icon-sort:before { content: "\f0dc"; } -.icon-sort-down:before { content: "\f0dd"; } -.icon-sort-up:before { content: "\f0de"; } - -.icon-envelope-alt:before { content: "\f0e0"; } -.icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before { content: "\f0e2"; } -.icon-legal:before { content: "\f0e3"; } -.icon-dashboard:before { content: "\f0e4"; } -.icon-comment-alt:before { content: "\f0e5"; } -.icon-comments-alt:before { content: "\f0e6"; } -.icon-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { content: "\f0e9"; } -.icon-paste:before { content: "\f0ea"; } -.icon-lightbulb:before { content: "\f0eb"; } -.icon-exchange:before { content: "\f0ec"; } -.icon-cloud-download:before { content: "\f0ed"; } -.icon-cloud-upload:before { content: "\f0ee"; } - -.icon-user-md:before { content: "\f0f0"; } -.icon-stethoscope:before { content: "\f0f1"; } -.icon-suitcase:before { content: "\f0f2"; } -.icon-bell-alt:before { content: "\f0f3"; } -.icon-coffee:before { content: "\f0f4"; } -.icon-food:before { content: "\f0f5"; } -.icon-file-alt:before { content: "\f0f6"; } -.icon-building:before { content: "\f0f7"; } -.icon-hospital:before { content: "\f0f8"; } -.icon-ambulance:before { content: "\f0f9"; } -.icon-medkit:before { content: "\f0fa"; } -.icon-fighter-jet:before { content: "\f0fb"; } -.icon-beer:before { content: "\f0fc"; } -.icon-h-sign:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { content: "\f0fe"; } - -.icon-double-angle-left:before { content: "\f100"; } -.icon-double-angle-right:before { content: "\f101"; } -.icon-double-angle-up:before { content: "\f102"; } -.icon-double-angle-down:before { content: "\f103"; } -.icon-angle-left:before { content: "\f104"; } -.icon-angle-right:before { content: "\f105"; } -.icon-angle-up:before { content: "\f106"; } -.icon-angle-down:before { content: "\f107"; } -.icon-desktop:before { content: "\f108"; } -.icon-laptop:before { content: "\f109"; } -.icon-tablet:before { content: "\f10a"; } -.icon-mobile-phone:before { content: "\f10b"; } -.icon-circle-blank:before { content: "\f10c"; } -.icon-quote-left:before { content: "\f10d"; } -.icon-quote-right:before { content: "\f10e"; } - -.icon-spinner:before { content: "\f110"; } -.icon-circle:before { content: "\f111"; } -.icon-reply:before { content: "\f112"; } -.icon-github-alt:before { content: "\f113"; } -.icon-folder-close-alt:before { content: "\f114"; } -.icon-folder-open-alt:before { content: "\f115"; } +@import "variables.less"; +@import "mixins.less"; +@import "path.less"; +@import "core.less"; +@import "bootstrap.less"; +@import "extras.less"; +@import "icons.less"; diff --git a/ckan/public/base/vendor/font-awesome/less/icons.less b/ckan/public/base/vendor/font-awesome/less/icons.less new file mode 100644 index 00000000000..476d201ec69 --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/icons.less @@ -0,0 +1,381 @@ +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ + +.icon-glass:before { content: @glass; } +.icon-music:before { content: @music; } +.icon-search:before { content: @search; } +.icon-envelope-alt:before { content: @envelope-alt; } +.icon-heart:before { content: @heart; } +.icon-star:before { content: @star; } +.icon-star-empty:before { content: @star-empty; } +.icon-user:before { content: @user; } +.icon-film:before { content: @film; } +.icon-th-large:before { content: @th-large; } +.icon-th:before { content: @th; } +.icon-th-list:before { content: @th-list; } +.icon-ok:before { content: @ok; } +.icon-remove:before { content: @remove; } +.icon-zoom-in:before { content: @zoom-in; } +.icon-zoom-out:before { content: @zoom-out; } +.icon-power-off:before, +.icon-off:before { content: @off; } +.icon-signal:before { content: @signal; } +.icon-gear:before, +.icon-cog:before { content: @cog; } +.icon-trash:before { content: @trash; } +.icon-home:before { content: @home; } +.icon-file-alt:before { content: @file-alt; } +.icon-time:before { content: @time; } +.icon-road:before { content: @road; } +.icon-download-alt:before { content: @download-alt; } +.icon-download:before { content: @download; } +.icon-upload:before { content: @upload; } +.icon-inbox:before { content: @inbox; } +.icon-play-circle:before { content: @play-circle; } +.icon-rotate-right:before, +.icon-repeat:before { content: @repeat; } +.icon-refresh:before { content: @refresh; } +.icon-list-alt:before { content: @list-alt; } +.icon-lock:before { content: @lock; } +.icon-flag:before { content: @flag; } +.icon-headphones:before { content: @headphones; } +.icon-volume-off:before { content: @volume-off; } +.icon-volume-down:before { content: @volume-down; } +.icon-volume-up:before { content: @volume-up; } +.icon-qrcode:before { content: @qrcode; } +.icon-barcode:before { content: @barcode; } +.icon-tag:before { content: @tag; } +.icon-tags:before { content: @tags; } +.icon-book:before { content: @book; } +.icon-bookmark:before { content: @bookmark; } +.icon-print:before { content: @print; } +.icon-camera:before { content: @camera; } +.icon-font:before { content: @font; } +.icon-bold:before { content: @bold; } +.icon-italic:before { content: @italic; } +.icon-text-height:before { content: @text-height; } +.icon-text-width:before { content: @text-width; } +.icon-align-left:before { content: @align-left; } +.icon-align-center:before { content: @align-center; } +.icon-align-right:before { content: @align-right; } +.icon-align-justify:before { content: @align-justify; } +.icon-list:before { content: @list; } +.icon-indent-left:before { content: @indent-left; } +.icon-indent-right:before { content: @indent-right; } +.icon-facetime-video:before { content: @facetime-video; } +.icon-picture:before { content: @picture; } +.icon-pencil:before { content: @pencil; } +.icon-map-marker:before { content: @map-marker; } +.icon-adjust:before { content: @adjust; } +.icon-tint:before { content: @tint; } +.icon-edit:before { content: @edit; } +.icon-share:before { content: @share; } +.icon-check:before { content: @check; } +.icon-move:before { content: @move; } +.icon-step-backward:before { content: @step-backward; } +.icon-fast-backward:before { content: @fast-backward; } +.icon-backward:before { content: @backward; } +.icon-play:before { content: @play; } +.icon-pause:before { content: @pause; } +.icon-stop:before { content: @stop; } +.icon-forward:before { content: @forward; } +.icon-fast-forward:before { content: @fast-forward; } +.icon-step-forward:before { content: @step-forward; } +.icon-eject:before { content: @eject; } +.icon-chevron-left:before { content: @chevron-left; } +.icon-chevron-right:before { content: @chevron-right; } +.icon-plus-sign:before { content: @plus-sign; } +.icon-minus-sign:before { content: @minus-sign; } +.icon-remove-sign:before { content: @remove-sign; } +.icon-ok-sign:before { content: @ok-sign; } +.icon-question-sign:before { content: @question-sign; } +.icon-info-sign:before { content: @info-sign; } +.icon-screenshot:before { content: @screenshot; } +.icon-remove-circle:before { content: @remove-circle; } +.icon-ok-circle:before { content: @ok-circle; } +.icon-ban-circle:before { content: @ban-circle; } +.icon-arrow-left:before { content: @arrow-left; } +.icon-arrow-right:before { content: @arrow-right; } +.icon-arrow-up:before { content: @arrow-up; } +.icon-arrow-down:before { content: @arrow-down; } +.icon-mail-forward:before, +.icon-share-alt:before { content: @share-alt; } +.icon-resize-full:before { content: @resize-full; } +.icon-resize-small:before { content: @resize-small; } +.icon-plus:before { content: @plus; } +.icon-minus:before { content: @minus; } +.icon-asterisk:before { content: @asterisk; } +.icon-exclamation-sign:before { content: @exclamation-sign; } +.icon-gift:before { content: @gift; } +.icon-leaf:before { content: @leaf; } +.icon-fire:before { content: @fire; } +.icon-eye-open:before { content: @eye-open; } +.icon-eye-close:before { content: @eye-close; } +.icon-warning-sign:before { content: @warning-sign; } +.icon-plane:before { content: @plane; } +.icon-calendar:before { content: @calendar; } +.icon-random:before { content: @random; } +.icon-comment:before { content: @comment; } +.icon-magnet:before { content: @magnet; } +.icon-chevron-up:before { content: @chevron-up; } +.icon-chevron-down:before { content: @chevron-down; } +.icon-retweet:before { content: @retweet; } +.icon-shopping-cart:before { content: @shopping-cart; } +.icon-folder-close:before { content: @folder-close; } +.icon-folder-open:before { content: @folder-open; } +.icon-resize-vertical:before { content: @resize-vertical; } +.icon-resize-horizontal:before { content: @resize-horizontal; } +.icon-bar-chart:before { content: @bar-chart; } +.icon-twitter-sign:before { content: @twitter-sign; } +.icon-facebook-sign:before { content: @facebook-sign; } +.icon-camera-retro:before { content: @camera-retro; } +.icon-key:before { content: @key; } +.icon-gears:before, +.icon-cogs:before { content: @cogs; } +.icon-comments:before { content: @comments; } +.icon-thumbs-up-alt:before { content: @thumbs-up-alt; } +.icon-thumbs-down-alt:before { content: @thumbs-down-alt; } +.icon-star-half:before { content: @star-half; } +.icon-heart-empty:before { content: @heart-empty; } +.icon-signout:before { content: @signout; } +.icon-linkedin-sign:before { content: @linkedin-sign; } +.icon-pushpin:before { content: @pushpin; } +.icon-external-link:before { content: @external-link; } +.icon-signin:before { content: @signin; } +.icon-trophy:before { content: @trophy; } +.icon-github-sign:before { content: @github-sign; } +.icon-upload-alt:before { content: @upload-alt; } +.icon-lemon:before { content: @lemon; } +.icon-phone:before { content: @phone; } +.icon-unchecked:before, +.icon-check-empty:before { content: @check-empty; } +.icon-bookmark-empty:before { content: @bookmark-empty; } +.icon-phone-sign:before { content: @phone-sign; } +.icon-twitter:before { content: @twitter; } +.icon-facebook:before { content: @facebook; } +.icon-github:before { content: @github; } +.icon-unlock:before { content: @unlock; } +.icon-credit-card:before { content: @credit-card; } +.icon-rss:before { content: @rss; } +.icon-hdd:before { content: @hdd; } +.icon-bullhorn:before { content: @bullhorn; } +.icon-bell:before { content: @bell; } +.icon-certificate:before { content: @certificate; } +.icon-hand-right:before { content: @hand-right; } +.icon-hand-left:before { content: @hand-left; } +.icon-hand-up:before { content: @hand-up; } +.icon-hand-down:before { content: @hand-down; } +.icon-circle-arrow-left:before { content: @circle-arrow-left; } +.icon-circle-arrow-right:before { content: @circle-arrow-right; } +.icon-circle-arrow-up:before { content: @circle-arrow-up; } +.icon-circle-arrow-down:before { content: @circle-arrow-down; } +.icon-globe:before { content: @globe; } +.icon-wrench:before { content: @wrench; } +.icon-tasks:before { content: @tasks; } +.icon-filter:before { content: @filter; } +.icon-briefcase:before { content: @briefcase; } +.icon-fullscreen:before { content: @fullscreen; } +.icon-group:before { content: @group; } +.icon-link:before { content: @link; } +.icon-cloud:before { content: @cloud; } +.icon-beaker:before { content: @beaker; } +.icon-cut:before { content: @cut; } +.icon-copy:before { content: @copy; } +.icon-paperclip:before, +.icon-paper-clip:before { content: @paper-clip; } +.icon-save:before { content: @save; } +.icon-sign-blank:before { content: @sign-blank; } +.icon-reorder:before { content: @reorder; } +.icon-list-ul:before { content: @list-ul; } +.icon-list-ol:before { content: @list-ol; } +.icon-strikethrough:before { content: @strikethrough; } +.icon-underline:before { content: @underline; } +.icon-table:before { content: @table; } +.icon-magic:before { content: @magic; } +.icon-truck:before { content: @truck; } +.icon-pinterest:before { content: @pinterest; } +.icon-pinterest-sign:before { content: @pinterest-sign; } +.icon-google-plus-sign:before { content: @google-plus-sign; } +.icon-google-plus:before { content: @google-plus; } +.icon-money:before { content: @money; } +.icon-caret-down:before { content: @caret-down; } +.icon-caret-up:before { content: @caret-up; } +.icon-caret-left:before { content: @caret-left; } +.icon-caret-right:before { content: @caret-right; } +.icon-columns:before { content: @columns; } +.icon-sort:before { content: @sort; } +.icon-sort-down:before { content: @sort-down; } +.icon-sort-up:before { content: @sort-up; } +.icon-envelope:before { content: @envelope; } +.icon-linkedin:before { content: @linkedin; } +.icon-rotate-left:before, +.icon-undo:before { content: @undo; } +.icon-legal:before { content: @legal; } +.icon-dashboard:before { content: @dashboard; } +.icon-comment-alt:before { content: @comment-alt; } +.icon-comments-alt:before { content: @comments-alt; } +.icon-bolt:before { content: @bolt; } +.icon-sitemap:before { content: @sitemap; } +.icon-umbrella:before { content: @umbrella; } +.icon-paste:before { content: @paste; } +.icon-lightbulb:before { content: @lightbulb; } +.icon-exchange:before { content: @exchange; } +.icon-cloud-download:before { content: @cloud-download; } +.icon-cloud-upload:before { content: @cloud-upload; } +.icon-user-md:before { content: @user-md; } +.icon-stethoscope:before { content: @stethoscope; } +.icon-suitcase:before { content: @suitcase; } +.icon-bell-alt:before { content: @bell-alt; } +.icon-coffee:before { content: @coffee; } +.icon-food:before { content: @food; } +.icon-file-text-alt:before { content: @file-text-alt; } +.icon-building:before { content: @building; } +.icon-hospital:before { content: @hospital; } +.icon-ambulance:before { content: @ambulance; } +.icon-medkit:before { content: @medkit; } +.icon-fighter-jet:before { content: @fighter-jet; } +.icon-beer:before { content: @beer; } +.icon-h-sign:before { content: @h-sign; } +.icon-plus-sign-alt:before { content: @plus-sign-alt; } +.icon-double-angle-left:before { content: @double-angle-left; } +.icon-double-angle-right:before { content: @double-angle-right; } +.icon-double-angle-up:before { content: @double-angle-up; } +.icon-double-angle-down:before { content: @double-angle-down; } +.icon-angle-left:before { content: @angle-left; } +.icon-angle-right:before { content: @angle-right; } +.icon-angle-up:before { content: @angle-up; } +.icon-angle-down:before { content: @angle-down; } +.icon-desktop:before { content: @desktop; } +.icon-laptop:before { content: @laptop; } +.icon-tablet:before { content: @tablet; } +.icon-mobile-phone:before { content: @mobile-phone; } +.icon-circle-blank:before { content: @circle-blank; } +.icon-quote-left:before { content: @quote-left; } +.icon-quote-right:before { content: @quote-right; } +.icon-spinner:before { content: @spinner; } +.icon-circle:before { content: @circle; } +.icon-mail-reply:before, +.icon-reply:before { content: @reply; } +.icon-github-alt:before { content: @github-alt; } +.icon-folder-close-alt:before { content: @folder-close-alt; } +.icon-folder-open-alt:before { content: @folder-open-alt; } +.icon-expand-alt:before { content: @expand-alt; } +.icon-collapse-alt:before { content: @collapse-alt; } +.icon-smile:before { content: @smile; } +.icon-frown:before { content: @frown; } +.icon-meh:before { content: @meh; } +.icon-gamepad:before { content: @gamepad; } +.icon-keyboard:before { content: @keyboard; } +.icon-flag-alt:before { content: @flag-alt; } +.icon-flag-checkered:before { content: @flag-checkered; } +.icon-terminal:before { content: @terminal; } +.icon-code:before { content: @code; } +.icon-reply-all:before { content: @reply-all; } +.icon-mail-reply-all:before { content: @mail-reply-all; } +.icon-star-half-full:before, +.icon-star-half-empty:before { content: @star-half-empty; } +.icon-location-arrow:before { content: @location-arrow; } +.icon-crop:before { content: @crop; } +.icon-code-fork:before { content: @code-fork; } +.icon-unlink:before { content: @unlink; } +.icon-question:before { content: @question; } +.icon-info:before { content: @info; } +.icon-exclamation:before { content: @exclamation; } +.icon-superscript:before { content: @superscript; } +.icon-subscript:before { content: @subscript; } +.icon-eraser:before { content: @eraser; } +.icon-puzzle-piece:before { content: @puzzle-piece; } +.icon-microphone:before { content: @microphone; } +.icon-microphone-off:before { content: @microphone-off; } +.icon-shield:before { content: @shield; } +.icon-calendar-empty:before { content: @calendar-empty; } +.icon-fire-extinguisher:before { content: @fire-extinguisher; } +.icon-rocket:before { content: @rocket; } +.icon-maxcdn:before { content: @maxcdn; } +.icon-chevron-sign-left:before { content: @chevron-sign-left; } +.icon-chevron-sign-right:before { content: @chevron-sign-right; } +.icon-chevron-sign-up:before { content: @chevron-sign-up; } +.icon-chevron-sign-down:before { content: @chevron-sign-down; } +.icon-html5:before { content: @html5; } +.icon-css3:before { content: @css3; } +.icon-anchor:before { content: @anchor; } +.icon-unlock-alt:before { content: @unlock-alt; } +.icon-bullseye:before { content: @bullseye; } +.icon-ellipsis-horizontal:before { content: @ellipsis-horizontal; } +.icon-ellipsis-vertical:before { content: @ellipsis-vertical; } +.icon-rss-sign:before { content: @rss-sign; } +.icon-play-sign:before { content: @play-sign; } +.icon-ticket:before { content: @ticket; } +.icon-minus-sign-alt:before { content: @minus-sign-alt; } +.icon-check-minus:before { content: @check-minus; } +.icon-level-up:before { content: @level-up; } +.icon-level-down:before { content: @level-down; } +.icon-check-sign:before { content: @check-sign; } +.icon-edit-sign:before { content: @edit-sign; } +.icon-external-link-sign:before { content: @external-link-sign; } +.icon-share-sign:before { content: @share-sign; } +.icon-compass:before { content: @compass; } +.icon-collapse:before { content: @collapse; } +.icon-collapse-top:before { content: @collapse-top; } +.icon-expand:before { content: @expand; } +.icon-euro:before, +.icon-eur:before { content: @eur; } +.icon-gbp:before { content: @gbp; } +.icon-dollar:before, +.icon-usd:before { content: @usd; } +.icon-rupee:before, +.icon-inr:before { content: @inr; } +.icon-yen:before, +.icon-jpy:before { content: @jpy; } +.icon-renminbi:before, +.icon-cny:before { content: @cny; } +.icon-won:before, +.icon-krw:before { content: @krw; } +.icon-bitcoin:before, +.icon-btc:before { content: @btc; } +.icon-file:before { content: @file; } +.icon-file-text:before { content: @file-text; } +.icon-sort-by-alphabet:before { content: @sort-by-alphabet; } +.icon-sort-by-alphabet-alt:before { content: @sort-by-alphabet-alt; } +.icon-sort-by-attributes:before { content: @sort-by-attributes; } +.icon-sort-by-attributes-alt:before { content: @sort-by-attributes-alt; } +.icon-sort-by-order:before { content: @sort-by-order; } +.icon-sort-by-order-alt:before { content: @sort-by-order-alt; } +.icon-thumbs-up:before { content: @thumbs-up; } +.icon-thumbs-down:before { content: @thumbs-down; } +.icon-youtube-sign:before { content: @youtube-sign; } +.icon-youtube:before { content: @youtube; } +.icon-xing:before { content: @xing; } +.icon-xing-sign:before { content: @xing-sign; } +.icon-youtube-play:before { content: @youtube-play; } +.icon-dropbox:before { content: @dropbox; } +.icon-stackexchange:before { content: @stackexchange; } +.icon-instagram:before { content: @instagram; } +.icon-flickr:before { content: @flickr; } +.icon-adn:before { content: @adn; } +.icon-bitbucket:before { content: @bitbucket; } +.icon-bitbucket-sign:before { content: @bitbucket-sign; } +.icon-tumblr:before { content: @tumblr; } +.icon-tumblr-sign:before { content: @tumblr-sign; } +.icon-long-arrow-down:before { content: @long-arrow-down; } +.icon-long-arrow-up:before { content: @long-arrow-up; } +.icon-long-arrow-left:before { content: @long-arrow-left; } +.icon-long-arrow-right:before { content: @long-arrow-right; } +.icon-apple:before { content: @apple; } +.icon-windows:before { content: @windows; } +.icon-android:before { content: @android; } +.icon-linux:before { content: @linux; } +.icon-dribbble:before { content: @dribbble; } +.icon-skype:before { content: @skype; } +.icon-foursquare:before { content: @foursquare; } +.icon-trello:before { content: @trello; } +.icon-female:before { content: @female; } +.icon-male:before { content: @male; } +.icon-gittip:before { content: @gittip; } +.icon-sun:before { content: @sun; } +.icon-moon:before { content: @moon; } +.icon-archive:before { content: @archive; } +.icon-bug:before { content: @bug; } +.icon-vk:before { content: @vk; } +.icon-weibo:before { content: @weibo; } +.icon-renren:before { content: @renren; } diff --git a/ckan/public/base/vendor/font-awesome/less/mixins.less b/ckan/public/base/vendor/font-awesome/less/mixins.less new file mode 100644 index 00000000000..f7fdda59068 --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/mixins.less @@ -0,0 +1,48 @@ +// Mixins +// -------------------------- + +.icon(@icon) { + .icon-FontAwesome(); + content: @icon; +} + +.icon-FontAwesome() { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + *margin-right: .3em; // fixes ie7 issues +} + +.border-radius(@radius) { + -webkit-border-radius: @radius; + -moz-border-radius: @radius; + border-radius: @radius; +} + +.icon-stack(@width: 2em, @height: 2em, @top-font-size: 1em, @base-font-size: 2em) { + .icon-stack { + position: relative; + display: inline-block; + width: @width; + height: @height; + line-height: @width; + vertical-align: -35%; + [class^="icon-"], + [class*=" icon-"] { + display: block; + text-align: center; + position: absolute; + width: 100%; + height: 100%; + font-size: @top-font-size; + line-height: inherit; + *line-height: @height; + } + .icon-stack-base { + font-size: @base-font-size; + *line-height: @height / @base-font-size; + } + } +} diff --git a/ckan/public/base/vendor/font-awesome/less/path.less b/ckan/public/base/vendor/font-awesome/less/path.less new file mode 100644 index 00000000000..8ccef8cf09b --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/path.less @@ -0,0 +1,14 @@ +/* FONT PATH + * -------------------------- */ + +@font-face { + font-family: 'FontAwesome'; + src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}'); + src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), + url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), + url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'), + url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg'); +// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts + font-weight: normal; + font-style: normal; +} diff --git a/ckan/public/base/vendor/font-awesome/less/variables.less b/ckan/public/base/vendor/font-awesome/less/variables.less new file mode 100644 index 00000000000..9d0879b0ddf --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/variables.less @@ -0,0 +1,735 @@ +// Variables +// -------------------------- + +@FontAwesomePath: "../font"; +//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/3.2.1/font"; // for referencing Bootstrap CDN font files directly +@FontAwesomeVersion: "3.2.1"; +@borderColor: #eee; +@iconMuted: #eee; +@iconLight: #fff; +@iconDark: #333; +@icons-li-width: 30/14em; + + + @glass: "\f000"; + + @music: "\f001"; + + @search: "\f002"; + + @envelope-alt: "\f003"; + + @heart: "\f004"; + + @star: "\f005"; + + @star-empty: "\f006"; + + @user: "\f007"; + + @film: "\f008"; + + @th-large: "\f009"; + + @th: "\f00a"; + + @th-list: "\f00b"; + + @ok: "\f00c"; + + @remove: "\f00d"; + + @zoom-in: "\f00e"; + + @zoom-out: "\f010"; + + @off: "\f011"; + + @signal: "\f012"; + + @cog: "\f013"; + + @trash: "\f014"; + + @home: "\f015"; + + @file-alt: "\f016"; + + @time: "\f017"; + + @road: "\f018"; + + @download-alt: "\f019"; + + @download: "\f01a"; + + @upload: "\f01b"; + + @inbox: "\f01c"; + + @play-circle: "\f01d"; + + @repeat: "\f01e"; + + @refresh: "\f021"; + + @list-alt: "\f022"; + + @lock: "\f023"; + + @flag: "\f024"; + + @headphones: "\f025"; + + @volume-off: "\f026"; + + @volume-down: "\f027"; + + @volume-up: "\f028"; + + @qrcode: "\f029"; + + @barcode: "\f02a"; + + @tag: "\f02b"; + + @tags: "\f02c"; + + @book: "\f02d"; + + @bookmark: "\f02e"; + + @print: "\f02f"; + + @camera: "\f030"; + + @font: "\f031"; + + @bold: "\f032"; + + @italic: "\f033"; + + @text-height: "\f034"; + + @text-width: "\f035"; + + @align-left: "\f036"; + + @align-center: "\f037"; + + @align-right: "\f038"; + + @align-justify: "\f039"; + + @list: "\f03a"; + + @indent-left: "\f03b"; + + @indent-right: "\f03c"; + + @facetime-video: "\f03d"; + + @picture: "\f03e"; + + @pencil: "\f040"; + + @map-marker: "\f041"; + + @adjust: "\f042"; + + @tint: "\f043"; + + @edit: "\f044"; + + @share: "\f045"; + + @check: "\f046"; + + @move: "\f047"; + + @step-backward: "\f048"; + + @fast-backward: "\f049"; + + @backward: "\f04a"; + + @play: "\f04b"; + + @pause: "\f04c"; + + @stop: "\f04d"; + + @forward: "\f04e"; + + @fast-forward: "\f050"; + + @step-forward: "\f051"; + + @eject: "\f052"; + + @chevron-left: "\f053"; + + @chevron-right: "\f054"; + + @plus-sign: "\f055"; + + @minus-sign: "\f056"; + + @remove-sign: "\f057"; + + @ok-sign: "\f058"; + + @question-sign: "\f059"; + + @info-sign: "\f05a"; + + @screenshot: "\f05b"; + + @remove-circle: "\f05c"; + + @ok-circle: "\f05d"; + + @ban-circle: "\f05e"; + + @arrow-left: "\f060"; + + @arrow-right: "\f061"; + + @arrow-up: "\f062"; + + @arrow-down: "\f063"; + + @share-alt: "\f064"; + + @resize-full: "\f065"; + + @resize-small: "\f066"; + + @plus: "\f067"; + + @minus: "\f068"; + + @asterisk: "\f069"; + + @exclamation-sign: "\f06a"; + + @gift: "\f06b"; + + @leaf: "\f06c"; + + @fire: "\f06d"; + + @eye-open: "\f06e"; + + @eye-close: "\f070"; + + @warning-sign: "\f071"; + + @plane: "\f072"; + + @calendar: "\f073"; + + @random: "\f074"; + + @comment: "\f075"; + + @magnet: "\f076"; + + @chevron-up: "\f077"; + + @chevron-down: "\f078"; + + @retweet: "\f079"; + + @shopping-cart: "\f07a"; + + @folder-close: "\f07b"; + + @folder-open: "\f07c"; + + @resize-vertical: "\f07d"; + + @resize-horizontal: "\f07e"; + + @bar-chart: "\f080"; + + @twitter-sign: "\f081"; + + @facebook-sign: "\f082"; + + @camera-retro: "\f083"; + + @key: "\f084"; + + @cogs: "\f085"; + + @comments: "\f086"; + + @thumbs-up-alt: "\f087"; + + @thumbs-down-alt: "\f088"; + + @star-half: "\f089"; + + @heart-empty: "\f08a"; + + @signout: "\f08b"; + + @linkedin-sign: "\f08c"; + + @pushpin: "\f08d"; + + @external-link: "\f08e"; + + @signin: "\f090"; + + @trophy: "\f091"; + + @github-sign: "\f092"; + + @upload-alt: "\f093"; + + @lemon: "\f094"; + + @phone: "\f095"; + + @check-empty: "\f096"; + + @bookmark-empty: "\f097"; + + @phone-sign: "\f098"; + + @twitter: "\f099"; + + @facebook: "\f09a"; + + @github: "\f09b"; + + @unlock: "\f09c"; + + @credit-card: "\f09d"; + + @rss: "\f09e"; + + @hdd: "\f0a0"; + + @bullhorn: "\f0a1"; + + @bell: "\f0a2"; + + @certificate: "\f0a3"; + + @hand-right: "\f0a4"; + + @hand-left: "\f0a5"; + + @hand-up: "\f0a6"; + + @hand-down: "\f0a7"; + + @circle-arrow-left: "\f0a8"; + + @circle-arrow-right: "\f0a9"; + + @circle-arrow-up: "\f0aa"; + + @circle-arrow-down: "\f0ab"; + + @globe: "\f0ac"; + + @wrench: "\f0ad"; + + @tasks: "\f0ae"; + + @filter: "\f0b0"; + + @briefcase: "\f0b1"; + + @fullscreen: "\f0b2"; + + @group: "\f0c0"; + + @link: "\f0c1"; + + @cloud: "\f0c2"; + + @beaker: "\f0c3"; + + @cut: "\f0c4"; + + @copy: "\f0c5"; + + @paper-clip: "\f0c6"; + + @save: "\f0c7"; + + @sign-blank: "\f0c8"; + + @reorder: "\f0c9"; + + @list-ul: "\f0ca"; + + @list-ol: "\f0cb"; + + @strikethrough: "\f0cc"; + + @underline: "\f0cd"; + + @table: "\f0ce"; + + @magic: "\f0d0"; + + @truck: "\f0d1"; + + @pinterest: "\f0d2"; + + @pinterest-sign: "\f0d3"; + + @google-plus-sign: "\f0d4"; + + @google-plus: "\f0d5"; + + @money: "\f0d6"; + + @caret-down: "\f0d7"; + + @caret-up: "\f0d8"; + + @caret-left: "\f0d9"; + + @caret-right: "\f0da"; + + @columns: "\f0db"; + + @sort: "\f0dc"; + + @sort-down: "\f0dd"; + + @sort-up: "\f0de"; + + @envelope: "\f0e0"; + + @linkedin: "\f0e1"; + + @undo: "\f0e2"; + + @legal: "\f0e3"; + + @dashboard: "\f0e4"; + + @comment-alt: "\f0e5"; + + @comments-alt: "\f0e6"; + + @bolt: "\f0e7"; + + @sitemap: "\f0e8"; + + @umbrella: "\f0e9"; + + @paste: "\f0ea"; + + @lightbulb: "\f0eb"; + + @exchange: "\f0ec"; + + @cloud-download: "\f0ed"; + + @cloud-upload: "\f0ee"; + + @user-md: "\f0f0"; + + @stethoscope: "\f0f1"; + + @suitcase: "\f0f2"; + + @bell-alt: "\f0f3"; + + @coffee: "\f0f4"; + + @food: "\f0f5"; + + @file-text-alt: "\f0f6"; + + @building: "\f0f7"; + + @hospital: "\f0f8"; + + @ambulance: "\f0f9"; + + @medkit: "\f0fa"; + + @fighter-jet: "\f0fb"; + + @beer: "\f0fc"; + + @h-sign: "\f0fd"; + + @plus-sign-alt: "\f0fe"; + + @double-angle-left: "\f100"; + + @double-angle-right: "\f101"; + + @double-angle-up: "\f102"; + + @double-angle-down: "\f103"; + + @angle-left: "\f104"; + + @angle-right: "\f105"; + + @angle-up: "\f106"; + + @angle-down: "\f107"; + + @desktop: "\f108"; + + @laptop: "\f109"; + + @tablet: "\f10a"; + + @mobile-phone: "\f10b"; + + @circle-blank: "\f10c"; + + @quote-left: "\f10d"; + + @quote-right: "\f10e"; + + @spinner: "\f110"; + + @circle: "\f111"; + + @reply: "\f112"; + + @github-alt: "\f113"; + + @folder-close-alt: "\f114"; + + @folder-open-alt: "\f115"; + + @expand-alt: "\f116"; + + @collapse-alt: "\f117"; + + @smile: "\f118"; + + @frown: "\f119"; + + @meh: "\f11a"; + + @gamepad: "\f11b"; + + @keyboard: "\f11c"; + + @flag-alt: "\f11d"; + + @flag-checkered: "\f11e"; + + @terminal: "\f120"; + + @code: "\f121"; + + @reply-all: "\f122"; + + @mail-reply-all: "\f122"; + + @star-half-empty: "\f123"; + + @location-arrow: "\f124"; + + @crop: "\f125"; + + @code-fork: "\f126"; + + @unlink: "\f127"; + + @question: "\f128"; + + @info: "\f129"; + + @exclamation: "\f12a"; + + @superscript: "\f12b"; + + @subscript: "\f12c"; + + @eraser: "\f12d"; + + @puzzle-piece: "\f12e"; + + @microphone: "\f130"; + + @microphone-off: "\f131"; + + @shield: "\f132"; + + @calendar-empty: "\f133"; + + @fire-extinguisher: "\f134"; + + @rocket: "\f135"; + + @maxcdn: "\f136"; + + @chevron-sign-left: "\f137"; + + @chevron-sign-right: "\f138"; + + @chevron-sign-up: "\f139"; + + @chevron-sign-down: "\f13a"; + + @html5: "\f13b"; + + @css3: "\f13c"; + + @anchor: "\f13d"; + + @unlock-alt: "\f13e"; + + @bullseye: "\f140"; + + @ellipsis-horizontal: "\f141"; + + @ellipsis-vertical: "\f142"; + + @rss-sign: "\f143"; + + @play-sign: "\f144"; + + @ticket: "\f145"; + + @minus-sign-alt: "\f146"; + + @check-minus: "\f147"; + + @level-up: "\f148"; + + @level-down: "\f149"; + + @check-sign: "\f14a"; + + @edit-sign: "\f14b"; + + @external-link-sign: "\f14c"; + + @share-sign: "\f14d"; + + @compass: "\f14e"; + + @collapse: "\f150"; + + @collapse-top: "\f151"; + + @expand: "\f152"; + + @eur: "\f153"; + + @gbp: "\f154"; + + @usd: "\f155"; + + @inr: "\f156"; + + @jpy: "\f157"; + + @cny: "\f158"; + + @krw: "\f159"; + + @btc: "\f15a"; + + @file: "\f15b"; + + @file-text: "\f15c"; + + @sort-by-alphabet: "\f15d"; + + @sort-by-alphabet-alt: "\f15e"; + + @sort-by-attributes: "\f160"; + + @sort-by-attributes-alt: "\f161"; + + @sort-by-order: "\f162"; + + @sort-by-order-alt: "\f163"; + + @thumbs-up: "\f164"; + + @thumbs-down: "\f165"; + + @youtube-sign: "\f166"; + + @youtube: "\f167"; + + @xing: "\f168"; + + @xing-sign: "\f169"; + + @youtube-play: "\f16a"; + + @dropbox: "\f16b"; + + @stackexchange: "\f16c"; + + @instagram: "\f16d"; + + @flickr: "\f16e"; + + @adn: "\f170"; + + @bitbucket: "\f171"; + + @bitbucket-sign: "\f172"; + + @tumblr: "\f173"; + + @tumblr-sign: "\f174"; + + @long-arrow-down: "\f175"; + + @long-arrow-up: "\f176"; + + @long-arrow-left: "\f177"; + + @long-arrow-right: "\f178"; + + @apple: "\f179"; + + @windows: "\f17a"; + + @android: "\f17b"; + + @linux: "\f17c"; + + @dribbble: "\f17d"; + + @skype: "\f17e"; + + @foursquare: "\f180"; + + @trello: "\f181"; + + @female: "\f182"; + + @male: "\f183"; + + @gittip: "\f184"; + + @sun: "\f185"; + + @moon: "\f186"; + + @archive: "\f187"; + + @bug: "\f188"; + + @vk: "\f189"; + + @weibo: "\f18a"; + + @renren: "\f18b"; + diff --git a/ckan/public/base/vendor/jquery.js b/ckan/public/base/vendor/jquery.js index 34f10869a41..d6f6ac85540 100644 --- a/ckan/public/base/vendor/jquery.js +++ b/ckan/public/base/vendor/jquery.js @@ -1,31 +1,38 @@ /*! - * jQuery JavaScript Library v1.7.2 + * jQuery JavaScript Library v1.10.2 * http://jquery.com/ * - * Copyright 2011, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * * Includes Sizzle.js * http://sizzlejs.com/ - * Copyright 2011, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. * - * Date: Wed Mar 21 12:46:34 2012 -0700 + * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2013-07-03T13:48Z */ (function( window, undefined ) { -// Use the correct document accordingly with window argument (sandbox) -var document = window.document, - navigator = window.navigator, - location = window.location; -var jQuery = (function() { +// Can't do this because several apps including ASP.NET trace +// the stack via arguments.caller.callee and Firefox dies if +// you try to trace through "use strict" call chains. (#13335) +// Support: Firefox 18+ +//"use strict"; +var + // The deferred used on DOM ready + readyList, -// Define a local copy of jQuery -var jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context, rootjQuery ); - }, + // A central reference to the root jQuery(document) + rootjQuery, + + // Support: IE<10 + // For `typeof xmlNode.method` instead of `xmlNode.method !== undefined` + core_strundefined = typeof undefined, + + // Use the correct document accordingly with window argument (sandbox) + location = window.location, + document = window.document, + docElem = document.documentElement, // Map over jQuery in case of overwrite _jQuery = window.jQuery, @@ -33,133 +40,136 @@ var jQuery = function( selector, context ) { // Map over the $ in case of overwrite _$ = window.$, - // A central reference to the root jQuery(document) - rootjQuery, + // [[Class]] -> type pairs + class2type = {}, - // A simple way to check for HTML strings or ID strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, + // List of deleted data cache ids, so we can reuse them + core_deletedIds = [], + + core_version = "1.10.2", + + // Save a reference to some core methods + core_concat = core_deletedIds.concat, + core_push = core_deletedIds.push, + core_slice = core_deletedIds.slice, + core_indexOf = core_deletedIds.indexOf, + core_toString = class2type.toString, + core_hasOwn = class2type.hasOwnProperty, + core_trim = core_version.trim, + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context, rootjQuery ); + }, + + // Used for matching numbers + core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source, - // Check if a string has a non-whitespace character in it - rnotwhite = /\S/, + // Used for splitting on whitespace + core_rnotwhite = /\S+/g, - // Used for trimming whitespace - trimLeft = /^\s+/, - trimRight = /\s+$/, + // Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE) + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, + + // A simple way to check for HTML strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, // Match a standalone tag - rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, + rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, // JSON RegExp rvalidchars = /^[\],:{}\s]*$/, - rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, - rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, - - // Useragent RegExp - rwebkit = /(webkit)[ \/]([\w.]+)/, - ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, - rmsie = /(msie) ([\w.]+)/, - rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, + rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, + rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g, // Matches dashed string for camelizing - rdashAlpha = /-([a-z]|[0-9])/ig, rmsPrefix = /^-ms-/, + rdashAlpha = /-([\da-z])/gi, // Used by jQuery.camelCase as callback to replace() fcamelCase = function( all, letter ) { - return ( letter + "" ).toUpperCase(); + return letter.toUpperCase(); }, - // Keep a UserAgent string for use with jQuery.browser - userAgent = navigator.userAgent, - - // For matching the engine and version of the browser - browserMatch, - - // The deferred used on DOM ready - readyList, - // The ready event handler - DOMContentLoaded, + completed = function( event ) { - // Save a reference to some core methods - toString = Object.prototype.toString, - hasOwn = Object.prototype.hasOwnProperty, - push = Array.prototype.push, - slice = Array.prototype.slice, - trim = String.prototype.trim, - indexOf = Array.prototype.indexOf, + // readyState === "complete" is good enough for us to call the dom ready in oldIE + if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) { + detach(); + jQuery.ready(); + } + }, + // Clean-up method for dom ready events + detach = function() { + if ( document.addEventListener ) { + document.removeEventListener( "DOMContentLoaded", completed, false ); + window.removeEventListener( "load", completed, false ); - // [[Class]] -> type pairs - class2type = {}; + } else { + document.detachEvent( "onreadystatechange", completed ); + window.detachEvent( "onload", completed ); + } + }; jQuery.fn = jQuery.prototype = { + // The current version of jQuery being used + jquery: core_version, + constructor: jQuery, init: function( selector, context, rootjQuery ) { - var match, elem, ret, doc; + var match, elem; - // Handle $(""), $(null), or $(undefined) + // HANDLE: $(""), $(null), $(undefined), $(false) if ( !selector ) { return this; } - // Handle $(DOMElement) - if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - } - - // The body element only exists once, optimize finding it - if ( selector === "body" && !context && document.body ) { - this.context = document; - this[0] = document.body; - this.selector = selector; - this.length = 1; - return this; - } - // Handle HTML strings if ( typeof selector === "string" ) { - // Are we dealing with HTML string or an ID? if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { // Assume that strings that start and end with <> are HTML and skip the regex check match = [ null, selector, null ]; } else { - match = quickExpr.exec( selector ); + match = rquickExpr.exec( selector ); } - // Verify a match, and that no context was specified for #id + // Match html or make sure no context is specified for #id if ( match && (match[1] || !context) ) { // HANDLE: $(html) -> $(array) if ( match[1] ) { context = context instanceof jQuery ? context[0] : context; - doc = ( context ? context.ownerDocument || context : document ); - // If a single string is passed in and it's a single tag - // just do a createElement and skip the rest - ret = rsingleTag.exec( selector ); - - if ( ret ) { - if ( jQuery.isPlainObject( context ) ) { - selector = [ document.createElement( ret[1] ) ]; - jQuery.fn.attr.call( selector, context, true ); - - } else { - selector = [ doc.createElement( ret[1] ) ]; + // scripts is true for back-compat + jQuery.merge( this, jQuery.parseHTML( + match[1], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + // Properties of context are called as methods if possible + if ( jQuery.isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } } - - } else { - ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); - selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes; } - return jQuery.merge( this, selector ); + return this; - // HANDLE: $("#id") + // HANDLE: $(#id) } else { elem = document.getElementById( match[2] ); @@ -192,6 +202,12 @@ jQuery.fn = jQuery.prototype = { return this.constructor( context ).find( selector ); } + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + // HANDLE: $(function) // Shortcut for document ready } else if ( jQuery.isFunction( selector ) ) { @@ -209,19 +225,11 @@ jQuery.fn = jQuery.prototype = { // Start with an empty selector selector: "", - // The current version of jQuery being used - jquery: "1.7.2", - // The default length of a jQuery object is 0 length: 0, - // The number of elements contained in the matched element set - size: function() { - return this.length; - }, - toArray: function() { - return slice.call( this, 0 ); + return core_slice.call( this ); }, // Get the Nth element in the matched element set OR @@ -238,28 +246,15 @@ jQuery.fn = jQuery.prototype = { // Take an array of elements and push it onto the stack // (returning the new matched element set) - pushStack: function( elems, name, selector ) { - // Build a new jQuery matched element set - var ret = this.constructor(); - - if ( jQuery.isArray( elems ) ) { - push.apply( ret, elems ); + pushStack: function( elems ) { - } else { - jQuery.merge( ret, elems ); - } + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); // Add the old object onto the stack (as a reference) ret.prevObject = this; - ret.context = this.context; - if ( name === "find" ) { - ret.selector = this.selector + ( this.selector ? " " : "" ) + selector; - } else if ( name ) { - ret.selector = this.selector + "." + name + "(" + selector + ")"; - } - // Return the newly-formed element set return ret; }, @@ -272,20 +267,14 @@ jQuery.fn = jQuery.prototype = { }, ready: function( fn ) { - // Attach the listeners - jQuery.bindReady(); - // Add the callback - readyList.add( fn ); + jQuery.ready.promise().done( fn ); return this; }, - eq: function( i ) { - i = +i; - return i === -1 ? - this.slice( i ) : - this.slice( i, i + 1 ); + slice: function() { + return this.pushStack( core_slice.apply( this, arguments ) ); }, first: function() { @@ -296,9 +285,10 @@ jQuery.fn = jQuery.prototype = { return this.eq( -1 ); }, - slice: function() { - return this.pushStack( slice.apply( this, arguments ), - "slice", slice.call(arguments).join(",") ); + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); }, map: function( callback ) { @@ -313,7 +303,7 @@ jQuery.fn = jQuery.prototype = { // For internal use only. // Behaves like an Array's method, not like a jQuery method. - push: push, + push: core_push, sort: [].sort, splice: [].splice }; @@ -322,7 +312,7 @@ jQuery.fn = jQuery.prototype = { jQuery.fn.init.prototype = jQuery.fn; jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, + var src, copyIsArray, copy, name, options, clone, target = arguments[0] || {}, i = 1, length = arguments.length, @@ -386,6 +376,10 @@ jQuery.extend = jQuery.fn.extend = function() { }; jQuery.extend({ + // Unique for each copy of jQuery on the page + // Non-digits removed to match rinlinejQuery + expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ), + noConflict: function( deep ) { if ( window.$ === jQuery ) { window.$ = _$; @@ -416,73 +410,31 @@ jQuery.extend({ // Handle when the DOM is ready ready: function( wait ) { - // Either a released hold or an DOMready/load event and not yet ready - if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( !document.body ) { - return setTimeout( jQuery.ready, 1 ); - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.fireWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.trigger ) { - jQuery( document ).trigger( "ready" ).off( "ready" ); - } - } - }, - bindReady: function() { - if ( readyList ) { + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { return; } - readyList = jQuery.Callbacks( "once memory" ); - - // Catch cases where $(document).ready() is called after the - // browser event has already occurred. - if ( document.readyState === "complete" ) { - // Handle it asynchronously to allow scripts the opportunity to delay ready - return setTimeout( jQuery.ready, 1 ); + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( !document.body ) { + return setTimeout( jQuery.ready ); } - // Mozilla, Opera and webkit nightlies currently support this event - if ( document.addEventListener ) { - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", jQuery.ready, false ); - - // If IE event model is used - } else if ( document.attachEvent ) { - // ensure firing before onload, - // maybe late but safe also for iframes - document.attachEvent( "onreadystatechange", DOMContentLoaded ); - - // A fallback to window.onload, that will always work - window.attachEvent( "onload", jQuery.ready ); + // Remember that the DOM is ready + jQuery.isReady = true; - // If IE and not a frame - // continually check to see if the document is ready - var toplevel = false; + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } - try { - toplevel = window.frameElement == null; - } catch(e) {} + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); - if ( document.documentElement.doScroll && toplevel ) { - doScrollCheck(); - } + // Trigger any bound ready events + if ( jQuery.fn.trigger ) { + jQuery( document ).trigger("ready").off("ready"); } }, @@ -498,6 +450,7 @@ jQuery.extend({ }, isWindow: function( obj ) { + /* jshint eqeqeq: false */ return obj != null && obj == obj.window; }, @@ -506,12 +459,17 @@ jQuery.extend({ }, type: function( obj ) { - return obj == null ? - String( obj ) : - class2type[ toString.call(obj) ] || "object"; + if ( obj == null ) { + return String( obj ); + } + return typeof obj === "object" || typeof obj === "function" ? + class2type[ core_toString.call(obj) ] || "object" : + typeof obj; }, isPlainObject: function( obj ) { + var key; + // Must be an Object. // Because of IE, we also have to check the presence of the constructor property. // Make sure that DOM nodes and window objects don't pass through, as well @@ -522,8 +480,8 @@ jQuery.extend({ try { // Not own constructor property must be Object if ( obj.constructor && - !hasOwn.call(obj, "constructor") && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + !core_hasOwn.call(obj, "constructor") && + !core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { return false; } } catch ( e ) { @@ -531,17 +489,24 @@ jQuery.extend({ return false; } + // Support: IE<9 + // Handle iteration over inherited properties before own properties. + if ( jQuery.support.ownLast ) { + for ( key in obj ) { + return core_hasOwn.call( obj, key ); + } + } + // Own properties are enumerated firstly, so to speed up, // if last one is own, then all properties are own. - - var key; for ( key in obj ) {} - return key === undefined || hasOwn.call( obj, key ); + return key === undefined || core_hasOwn.call( obj, key ); }, isEmptyObject: function( obj ) { - for ( var name in obj ) { + var name; + for ( name in obj ) { return false; } return true; @@ -551,37 +516,70 @@ jQuery.extend({ throw new Error( msg ); }, - parseJSON: function( data ) { - if ( typeof data !== "string" || !data ) { + // data: string of html + // context (optional): If specified, the fragment will be created in this context, defaults to document + // keepScripts (optional): If true, will include scripts passed in the html string + parseHTML: function( data, context, keepScripts ) { + if ( !data || typeof data !== "string" ) { return null; } + if ( typeof context === "boolean" ) { + keepScripts = context; + context = false; + } + context = context || document; + + var parsed = rsingleTag.exec( data ), + scripts = !keepScripts && []; + + // Single tag + if ( parsed ) { + return [ context.createElement( parsed[1] ) ]; + } - // Make sure leading/trailing whitespace is removed (IE can't handle it) - data = jQuery.trim( data ); + parsed = jQuery.buildFragment( [ data ], context, scripts ); + if ( scripts ) { + jQuery( scripts ).remove(); + } + return jQuery.merge( [], parsed.childNodes ); + }, + parseJSON: function( data ) { // Attempt to parse using the native JSON parser first if ( window.JSON && window.JSON.parse ) { return window.JSON.parse( data ); } - // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js - if ( rvalidchars.test( data.replace( rvalidescape, "@" ) - .replace( rvalidtokens, "]" ) - .replace( rvalidbraces, "")) ) { + if ( data === null ) { + return data; + } + + if ( typeof data === "string" ) { + + // Make sure leading/trailing whitespace is removed (IE can't handle it) + data = jQuery.trim( data ); - return ( new Function( "return " + data ) )(); + if ( data ) { + // Make sure the incoming data is actual JSON + // Logic borrowed from http://json.org/json2.js + if ( rvalidchars.test( data.replace( rvalidescape, "@" ) + .replace( rvalidtokens, "]" ) + .replace( rvalidbraces, "")) ) { + return ( new Function( "return " + data ) )(); + } + } } + jQuery.error( "Invalid JSON: " + data ); }, // Cross-browser xml parsing parseXML: function( data ) { - if ( typeof data !== "string" || !data ) { + var xml, tmp; + if ( !data || typeof data !== "string" ) { return null; } - var xml, tmp; try { if ( window.DOMParser ) { // Standard tmp = new DOMParser(); @@ -606,7 +604,7 @@ jQuery.extend({ // Workarounds based on findings by Jim Driscoll // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context globalEval: function( data ) { - if ( data && rnotwhite.test( data ) ) { + if ( data && jQuery.trim( data ) ) { // We use execScript on Internet Explorer // We use an anonymous function so that context is window // rather than jQuery in Firefox @@ -623,25 +621,30 @@ jQuery.extend({ }, nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); }, // args is for internal usage only - each: function( object, callback, args ) { - var name, i = 0, - length = object.length, - isObj = length === undefined || jQuery.isFunction( object ); + each: function( obj, callback, args ) { + var value, + i = 0, + length = obj.length, + isArray = isArraylike( obj ); if ( args ) { - if ( isObj ) { - for ( name in object ) { - if ( callback.apply( object[ name ], args ) === false ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { break; } } } else { - for ( ; i < length; ) { - if ( callback.apply( object[ i++ ], args ) === false ) { + for ( i in obj ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { break; } } @@ -649,72 +652,75 @@ jQuery.extend({ // A special, fast, case for the most common use of each } else { - if ( isObj ) { - for ( name in object ) { - if ( callback.call( object[ name ], name, object[ name ] ) === false ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { break; } } } else { - for ( ; i < length; ) { - if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) { + for ( i in obj ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { break; } } } } - return object; + return obj; }, // Use native String.trim function wherever possible - trim: trim ? + trim: core_trim && !core_trim.call("\uFEFF\xA0") ? function( text ) { return text == null ? "" : - trim.call( text ); + core_trim.call( text ); } : // Otherwise use our own trimming functionality function( text ) { return text == null ? "" : - text.toString().replace( trimLeft, "" ).replace( trimRight, "" ); + ( text + "" ).replace( rtrim, "" ); }, // results is for internal usage only - makeArray: function( array, results ) { + makeArray: function( arr, results ) { var ret = results || []; - if ( array != null ) { - // The window, strings (and functions) also have 'length' - // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 - var type = jQuery.type( array ); - - if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { - push.call( ret, array ); + if ( arr != null ) { + if ( isArraylike( Object(arr) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); } else { - jQuery.merge( ret, array ); + core_push.call( ret, arr ); } } return ret; }, - inArray: function( elem, array, i ) { + inArray: function( elem, arr, i ) { var len; - if ( array ) { - if ( indexOf ) { - return indexOf.call( array, elem, i ); + if ( arr ) { + if ( core_indexOf ) { + return core_indexOf.call( arr, elem, i ); } - len = array.length; + len = arr.length; i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; for ( ; i < len; i++ ) { // Skip accessing in sparse arrays - if ( i in array && array[ i ] === elem ) { + if ( i in arr && arr[ i ] === elem ) { return i; } } @@ -724,14 +730,14 @@ jQuery.extend({ }, merge: function( first, second ) { - var i = first.length, + var l = second.length, + i = first.length, j = 0; - if ( typeof second.length === "number" ) { - for ( var l = second.length; j < l; j++ ) { + if ( typeof l === "number" ) { + for ( ; j < l; j++ ) { first[ i++ ] = second[ j ]; } - } else { while ( second[j] !== undefined ) { first[ i++ ] = second[ j++ ]; @@ -744,12 +750,15 @@ jQuery.extend({ }, grep: function( elems, callback, inv ) { - var ret = [], retVal; + var retVal, + ret = [], + i = 0, + length = elems.length; inv = !!inv; // Go through the array, only saving the items // that pass the validator function - for ( var i = 0, length = elems.length; i < length; i++ ) { + for ( ; i < length; i++ ) { retVal = !!callback( elems[ i ], i ); if ( inv !== retVal ) { ret.push( elems[ i ] ); @@ -761,11 +770,11 @@ jQuery.extend({ // arg is for internal usage only map: function( elems, callback, arg ) { - var value, key, ret = [], + var value, i = 0, length = elems.length, - // jquery objects are treated as arrays - isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ; + isArray = isArraylike( elems ), + ret = []; // Go through the array, translating each of the items to their if ( isArray ) { @@ -779,8 +788,8 @@ jQuery.extend({ // Go through every key on the object, } else { - for ( key in elems ) { - value = callback( elems[ key ], key, arg ); + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); if ( value != null ) { ret[ ret.length ] = value; @@ -789,7 +798,7 @@ jQuery.extend({ } // Flatten any nested arrays - return ret.concat.apply( [], ret ); + return core_concat.apply( [], ret ); }, // A global GUID counter for objects @@ -798,8 +807,10 @@ jQuery.extend({ // Bind a function to a context, optionally partially applying any // arguments. proxy: function( fn, context ) { + var args, proxy, tmp; + if ( typeof context === "string" ) { - var tmp = fn[ context ]; + tmp = fn[ context ]; context = fn; fn = tmp; } @@ -811,59 +822,59 @@ jQuery.extend({ } // Simulated bind - var args = slice.call( arguments, 2 ), - proxy = function() { - return fn.apply( context, args.concat( slice.call( arguments ) ) ); - }; + args = core_slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) ); + }; // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; + proxy.guid = fn.guid = fn.guid || jQuery.guid++; return proxy; }, - // Mutifunctional method to get and set values to a collection + // Multifunctional method to get and set values of a collection // The value/s can optionally be executed if it's a function - access: function( elems, fn, key, value, chainable, emptyGet, pass ) { - var exec, - bulk = key == null, - i = 0, - length = elems.length; + access: function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + length = elems.length, + bulk = key == null; // Sets many values - if ( key && typeof key === "object" ) { + if ( jQuery.type( key ) === "object" ) { + chainable = true; for ( i in key ) { - jQuery.access( elems, fn, i, key[i], 1, emptyGet, value ); + jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); } - chainable = 1; // Sets one value } else if ( value !== undefined ) { - // Optionally, function values get executed if exec is true - exec = pass === undefined && jQuery.isFunction( value ); + chainable = true; - if ( bulk ) { - // Bulk operations only iterate when executing function values - if ( exec ) { - exec = fn; - fn = function( elem, key, value ) { - return exec.call( jQuery( elem ), value ); - }; + if ( !jQuery.isFunction( value ) ) { + raw = true; + } - // Otherwise they run against the entire set - } else { + if ( bulk ) { + // Bulk operations run against the entire set + if ( raw ) { fn.call( elems, value ); fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; } } if ( fn ) { - for (; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + for ( ; i < length; i++ ) { + fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); } } - - chainable = 1; } return chainable ? @@ -879,4527 +890,4817 @@ jQuery.extend({ return ( new Date() ).getTime(); }, - // Use of jQuery.browser is frowned upon. - // More details: http://docs.jquery.com/Utilities/jQuery.browser - uaMatch: function( ua ) { - ua = ua.toLowerCase(); + // A method for quickly swapping in/out CSS properties to get correct calculations. + // Note: this method belongs to the css module but it's needed here for the support module. + // If support gets modularized, this method should be moved back to the css module. + swap: function( elem, options, callback, args ) { + var ret, name, + old = {}; - var match = rwebkit.exec( ua ) || - ropera.exec( ua ) || - rmsie.exec( ua ) || - ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || - []; + // Remember the old values, and insert the new ones + for ( name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; + } - return { browser: match[1] || "", version: match[2] || "0" }; - }, + ret = callback.apply( elem, args || [] ); - sub: function() { - function jQuerySub( selector, context ) { - return new jQuerySub.fn.init( selector, context ); + // Revert the old values + for ( name in options ) { + elem.style[ name ] = old[ name ]; } - jQuery.extend( true, jQuerySub, this ); - jQuerySub.superclass = this; - jQuerySub.fn = jQuerySub.prototype = this(); - jQuerySub.fn.constructor = jQuerySub; - jQuerySub.sub = this.sub; - jQuerySub.fn.init = function init( selector, context ) { - if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) { - context = jQuerySub( context ); - } - return jQuery.fn.init.call( this, selector, context, rootjQuerySub ); - }; - jQuerySub.fn.init.prototype = jQuerySub.fn; - var rootjQuerySub = jQuerySub(document); - return jQuerySub; - }, - - browser: {} + return ret; + } }); -// Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -}); +jQuery.ready.promise = function( obj ) { + if ( !readyList ) { -browserMatch = jQuery.uaMatch( userAgent ); -if ( browserMatch.browser ) { - jQuery.browser[ browserMatch.browser ] = true; - jQuery.browser.version = browserMatch.version; -} + readyList = jQuery.Deferred(); -// Deprecated, use jQuery.browser.webkit instead -if ( jQuery.browser.webkit ) { - jQuery.browser.safari = true; -} + // Catch cases where $(document).ready() is called after the browser event has already occurred. + // we once tried to use readyState "interactive" here, but it caused issues like the one + // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + setTimeout( jQuery.ready ); -// IE doesn't match non-breaking spaces with \s -if ( rnotwhite.test( "\xA0" ) ) { - trimLeft = /^[\s\xA0]+/; - trimRight = /[\s\xA0]+$/; -} + // Standards-based browsers support DOMContentLoaded + } else if ( document.addEventListener ) { + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed, false ); -// All jQuery objects should point back to these -rootjQuery = jQuery(document); + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed, false ); -// Cleanup functions for the document ready method -if ( document.addEventListener ) { - DOMContentLoaded = function() { - document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - jQuery.ready(); - }; + // If IE event model is used + } else { + // Ensure firing before onload, maybe late but safe also for iframes + document.attachEvent( "onreadystatechange", completed ); -} else if ( document.attachEvent ) { - DOMContentLoaded = function() { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( document.readyState === "complete" ) { - document.detachEvent( "onreadystatechange", DOMContentLoaded ); - jQuery.ready(); - } - }; -} + // A fallback to window.onload, that will always work + window.attachEvent( "onload", completed ); -// The DOM ready check for Internet Explorer -function doScrollCheck() { - if ( jQuery.isReady ) { - return; - } + // If IE and not a frame + // continually check to see if the document is ready + var top = false; - try { - // If IE is used, use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - document.documentElement.doScroll("left"); - } catch(e) { - setTimeout( doScrollCheck, 1 ); - return; - } + try { + top = window.frameElement == null && document.documentElement; + } catch(e) {} - // and execute any waiting functions - jQuery.ready(); -} + if ( top && top.doScroll ) { + (function doScrollCheck() { + if ( !jQuery.isReady ) { + + try { + // Use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + top.doScroll("left"); + } catch(e) { + return setTimeout( doScrollCheck, 50 ); + } -return jQuery; + // detach all dom ready events + detach(); + + // and execute any waiting functions + jQuery.ready(); + } + })(); + } + } + } + return readyList.promise( obj ); +}; -})(); +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); +function isArraylike( obj ) { + var length = obj.length, + type = jQuery.type( obj ); -// String to Object flags format cache -var flagsCache = {}; + if ( jQuery.isWindow( obj ) ) { + return false; + } -// Convert String-formatted flags into Object-formatted ones and store in cache -function createFlags( flags ) { - var object = flagsCache[ flags ] = {}, - i, length; - flags = flags.split( /\s+/ ); - for ( i = 0, length = flags.length; i < length; i++ ) { - object[ flags[i] ] = true; + if ( obj.nodeType === 1 && length ) { + return true; } - return object; + + return type === "array" || type !== "function" && + ( length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj ); } -/* - * Create a callback list using the following parameters: - * - * flags: an optional list of space-separated flags that will change how - * the callback list behaves - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible flags: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) +// All jQuery objects should point back to these +rootjQuery = jQuery(document); +/*! + * Sizzle CSS Selector Engine v1.10.2 + * http://sizzlejs.com/ * - * stopOnFalse: interrupt callings when a callback returns false + * Copyright 2013 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license * + * Date: 2013-07-03 */ -jQuery.Callbacks = function( flags ) { +(function( window, undefined ) { - // Convert flags from String-formatted to Object-formatted - // (we check in cache first) - flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {}; +var i, + support, + cachedruns, + Expr, + getText, + isXML, + compile, + outermostContext, + sortInput, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + -(new Date()), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + hasDuplicate = false, + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + return 0; + } + return 0; + }, - var // Actual callback list - list = [], - // Stack of fire calls for repeatable lists - stack = [], - // Last fire value (for non-forgettable lists) - memory, - // Flag to know if list was already fired - fired, - // Flag to know if list is currently firing - firing, - // First callback to fire (used internally by add and fireWith) - firingStart, - // End of the loop when firing - firingLength, - // Index of currently firing callback (modified by remove if needed) - firingIndex, - // Add one or several callbacks to the list - add = function( args ) { - var i, - length, - elem, - type, - actual; - for ( i = 0, length = args.length; i < length; i++ ) { - elem = args[ i ]; - type = jQuery.type( elem ); - if ( type === "array" ) { - // Inspect recursively - add( elem ); - } else if ( type === "function" ) { - // Add if not in unique mode and callback is not in - if ( !flags.unique || !self.has( elem ) ) { - list.push( elem ); - } - } - } - }, - // Fire callbacks - fire = function( context, args ) { - args = args || []; - memory = !flags.memory || [ context, args ]; - fired = true; - firing = true; - firingIndex = firingStart || 0; - firingStart = 0; - firingLength = list.length; - for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) { - memory = true; // Mark as halted - break; - } - } - firing = false; - if ( list ) { - if ( !flags.once ) { - if ( stack && stack.length ) { - memory = stack.shift(); - self.fireWith( memory[ 0 ], memory[ 1 ] ); - } - } else if ( memory === true ) { - self.disable(); - } else { - list = []; - } - } - }, - // Actual Callbacks object - self = { - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - var length = list.length; - add( arguments ); - // Do we need to add the callbacks to the - // current firing batch? - if ( firing ) { - firingLength = list.length; - // With memory, if we're not firing then - // we should call right away, unless previous - // firing was halted (stopOnFalse) - } else if ( memory && memory !== true ) { - firingStart = length; - fire( memory[ 0 ], memory[ 1 ] ); - } - } - return this; - }, - // Remove a callback from the list - remove: function() { - if ( list ) { - var args = arguments, - argIndex = 0, - argLength = args.length; - for ( ; argIndex < argLength ; argIndex++ ) { - for ( var i = 0; i < list.length; i++ ) { - if ( args[ argIndex ] === list[ i ] ) { - // Handle firingIndex and firingLength - if ( firing ) { - if ( i <= firingLength ) { - firingLength--; - if ( i <= firingIndex ) { - firingIndex--; - } - } - } - // Remove the element - list.splice( i--, 1 ); - // If we have some unicity property then - // we only need to do this once - if ( flags.unique ) { - break; - } - } - } - } - } - return this; - }, - // Control if a given callback is in the list - has: function( fn ) { - if ( list ) { - var i = 0, - length = list.length; - for ( ; i < length; i++ ) { - if ( fn === list[ i ] ) { - return true; - } - } - } - return false; - }, - // Remove all callbacks from the list - empty: function() { - list = []; - return this; - }, - // Have the list do nothing anymore - disable: function() { - list = stack = memory = undefined; - return this; - }, - // Is it disabled? - disabled: function() { - return !list; - }, - // Lock the list in its current state - lock: function() { - stack = undefined; - if ( !memory || memory === true ) { - self.disable(); - } - return this; - }, - // Is it locked? - locked: function() { - return !stack; - }, - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( stack ) { - if ( firing ) { - if ( !flags.once ) { - stack.push( [ context, args ] ); - } - } else if ( !( flags.once && memory ) ) { - fire( context, args ); - } - } - return this; - }, - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; + // General-purpose constants + strundefined = typeof undefined, + MAX_NEGATIVE = 1 << 31, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf if we can't use a native one + indexOf = arr.indexOf || function( elem ) { + var i = 0, + len = this.length; + for ( ; i < len; i++ ) { + if ( this[i] === elem ) { + return i; } - }; + } + return -1; + }, - return self; -}; + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + // http://www.w3.org/TR/css3-syntax/#characters + characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + + // Loosely modeled on CSS identifier characters + // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors + // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = characterEncoding.replace( "w", "w#" ), + + // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace + + "*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]", + + // Prefer arguments quoted, + // then not containing pseudos/brackets, + // then attribute selectors/non-parenthetical expressions, + // then anything else + // These preferences are here to reduce the number of selectors + // needing tokenize in the PSEUDO preFilter + pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rsibling = new RegExp( whitespace + "*[+~]" ), + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + characterEncoding + ")" ), + "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), + "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rescape = /'|\\/g, + + // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + // BMP codepoint + high < 0 ? + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }; +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} +function Sizzle( selector, context, results, seed ) { + var match, elem, m, nodeType, + // QSA vars + i, groups, old, nid, newContext, newSelector; -var // Static reference to slice - sliceDeferred = [].slice; + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } -jQuery.extend({ + context = context || document; + results = results || []; - Deferred: function( func ) { - var doneList = jQuery.Callbacks( "once memory" ), - failList = jQuery.Callbacks( "once memory" ), - progressList = jQuery.Callbacks( "memory" ), - state = "pending", - lists = { - resolve: doneList, - reject: failList, - notify: progressList - }, - promise = { - done: doneList.add, - fail: failList.add, - progress: progressList.add, + if ( !selector || typeof selector !== "string" ) { + return results; + } - state: function() { - return state; - }, + if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) { + return []; + } - // Deprecated - isResolved: doneList.fired, - isRejected: failList.fired, + if ( documentIsHTML && !seed ) { - then: function( doneCallbacks, failCallbacks, progressCallbacks ) { - deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks ); - return this; - }, - always: function() { - deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments ); - return this; - }, - pipe: function( fnDone, fnFail, fnProgress ) { - return jQuery.Deferred(function( newDefer ) { - jQuery.each( { - done: [ fnDone, "resolve" ], - fail: [ fnFail, "reject" ], - progress: [ fnProgress, "notify" ] - }, function( handler, data ) { - var fn = data[ 0 ], - action = data[ 1 ], - returned; - if ( jQuery.isFunction( fn ) ) { - deferred[ handler ](function() { - returned = fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify ); - } else { - newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] ); - } - }); - } else { - deferred[ handler ]( newDefer[ action ] ); - } - }); - }).promise(); - }, - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - if ( obj == null ) { - obj = promise; - } else { - for ( var key in promise ) { - obj[ key ] = promise[ key ]; + // Shortcuts + if ( (match = rquickExpr.exec( selector )) ) { + // Speed-up: Sizzle("#ID") + if ( (m = match[1]) ) { + if ( nodeType === 9 ) { + elem = context.getElementById( m ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE, Opera, and Webkit return items + // by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; } + } else { + return results; + } + } else { + // Context is not a document + if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && + contains( context, elem ) && elem.id === m ) { + results.push( elem ); + return results; } - return obj; } - }, - deferred = promise.promise({}), - key; - for ( key in lists ) { - deferred[ key ] = lists[ key ].fire; - deferred[ key + "With" ] = lists[ key ].fireWith; - } - - // Handle state - deferred.done( function() { - state = "resolved"; - }, failList.disable, progressList.lock ).fail( function() { - state = "rejected"; - }, doneList.disable, progressList.lock ); + // Speed-up: Sizzle("TAG") + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); + // Speed-up: Sizzle(".CLASS") + } else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) { + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } } - // All done! - return deferred; - }, + // QSA path + if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + nid = old = expando; + newContext = context; + newSelector = nodeType === 9 && selector; - // Deferred helper - when: function( firstParam ) { - var args = sliceDeferred.call( arguments, 0 ), - i = 0, - length = args.length, - pValues = new Array( length ), - count = length, - pCount = length, - deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ? - firstParam : - jQuery.Deferred(), - promise = deferred.promise(); - function resolveFunc( i ) { - return function( value ) { - args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; - if ( !( --count ) ) { - deferred.resolveWith( deferred, args ); - } - }; - } - function progressFunc( i ) { - return function( value ) { - pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; - deferred.notifyWith( promise, pValues ); - }; - } - if ( length > 1 ) { - for ( ; i < length; i++ ) { - if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) { - args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) ); + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + groups = tokenize( selector ); + + if ( (old = context.getAttribute("id")) ) { + nid = old.replace( rescape, "\\$&" ); } else { - --count; + context.setAttribute( "id", nid ); } + nid = "[id='" + nid + "'] "; + + i = groups.length; + while ( i-- ) { + groups[i] = nid + toSelector( groups[i] ); + } + newContext = rsibling.test( selector ) && context.parentNode || context; + newSelector = groups.join(","); } - if ( !count ) { - deferred.resolveWith( deferred, args ); + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch(qsaError) { + } finally { + if ( !old ) { + context.removeAttribute("id"); + } + } } - } else if ( deferred !== firstParam ) { - deferred.resolveWith( deferred, length ? [ firstParam ] : [] ); } - return promise; } -}); - - + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} -jQuery.support = (function() { +/** + * Create key-value caches of limited size + * @returns {Function(string, Object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; - var support, - all, - a, - select, - opt, - input, - fragment, - tds, - events, - eventName, - i, - isSupported, - div = document.createElement( "div" ), - documentElement = document.documentElement; + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key += " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key ] = value); + } + return cache; +} - // Preliminary tests - div.setAttribute("className", "t"); - div.innerHTML = "
              a"; +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} - all = div.getElementsByTagName( "*" ); - a = div.getElementsByTagName( "a" )[ 0 ]; +/** + * Support testing using an element + * @param {Function} fn Passed the created div and expects a boolean result + */ +function assert( fn ) { + var div = document.createElement("div"); - // Can't get basic test support - if ( !all || !all.length || !a ) { - return {}; + try { + return !!fn( div ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( div.parentNode ) { + div.parentNode.removeChild( div ); + } + // release memory in IE + div = null; } +} - // First batch of supports tests - select = document.createElement( "select" ); - opt = select.appendChild( document.createElement("option") ); - input = div.getElementsByTagName( "input" )[ 0 ]; - - support = { - // IE strips leading whitespace when .innerHTML is used - leadingWhitespace: ( div.firstChild.nodeType === 3 ), - - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - tbody: !div.getElementsByTagName("tbody").length, - - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - htmlSerialize: !!div.getElementsByTagName("link").length, - - // Get the style information from getAttribute - // (IE uses .cssText instead) - style: /top/.test( a.getAttribute("style") ), - - // Make sure that URLs aren't manipulated - // (IE normalizes it by default) - hrefNormalized: ( a.getAttribute("href") === "/a" ), - - // Make sure that element opacity exists - // (IE uses filter instead) - // Use a regex to work around a WebKit issue. See #5145 - opacity: /^0.55/.test( a.style.opacity ), - - // Verify style float existence - // (IE uses styleFloat instead of cssFloat) - cssFloat: !!a.style.cssFloat, - - // Make sure that if no value is specified for a checkbox - // that it defaults to "on". - // (WebKit defaults to "" instead) - checkOn: ( input.value === "on" ), - - // Make sure that a selected-by-default option has a working selected property. - // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) - optSelected: opt.selected, - - // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) - getSetAttribute: div.className !== "t", - - // Tests for enctype support on a form(#6743) - enctype: !!document.createElement("form").enctype, - - // Makes sure cloning an html5 element does not cause problems - // Where outerHTML is undefined, this still works - html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>", - - // Will be defined later - submitBubbles: true, - changeBubbles: true, - focusinBubbles: false, - deleteExpando: true, - noCloneEvent: true, - inlineBlockNeedsLayout: false, - shrinkWrapBlocks: false, - reliableMarginRight: true, - pixelMargin: true - }; - - // jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead - jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat"); - - // Make sure checked status is properly cloned - input.checked = true; - support.noCloneChecked = input.cloneNode( true ).checked; +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = attrs.length; - // Make sure that the options inside disabled selects aren't marked as disabled - // (WebKit marks them as disabled) - select.disabled = true; - support.optDisabled = !opt.disabled; + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} - // Test to see if it's possible to delete an expando from an element - // Fails in Internet Explorer - try { - delete div.test; - } catch( e ) { - support.deleteExpando = false; +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + ( ~b.sourceIndex || MAX_NEGATIVE ) - + ( ~a.sourceIndex || MAX_NEGATIVE ); + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; } - if ( !div.addEventListener && div.attachEvent && div.fireEvent ) { - div.attachEvent( "onclick", function() { - // Cloning a node shouldn't copy over any - // bound event handlers (IE does this) - support.noCloneEvent = false; - }); - div.cloneNode( true ).fireEvent( "onclick" ); + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } } - // Check if a radio maintains its value - // after being appended to the DOM - input = document.createElement("input"); - input.value = "t"; - input.setAttribute("type", "radio"); - support.radioValue = input.value === "t"; + return a ? 1 : -1; +} - input.setAttribute("checked", "checked"); +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} - // #11217 - WebKit loses check when the name is after the checked attribute - input.setAttribute( "name", "t" ); +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} - div.appendChild( input ); - fragment = document.createDocumentFragment(); - fragment.appendChild( div.lastChild ); +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; - // WebKit doesn't clone checked state correctly in fragments - support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} - // Check if a disconnected checkbox will retain its checked - // value of true after appended to the DOM (IE6/7) - support.appendChecked = input.checked; +/** + * Detect xml + * @param {Element|Object} elem An element or a document + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; - fragment.removeChild( input ); - fragment.appendChild( div ); +// Expose support vars for convenience +support = Sizzle.support = {}; - // Technique from Juriy Zaytsev - // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/ - // We only care about the case where non-standard event systems - // are used, namely in IE. Short-circuiting here helps us to - // avoid an eval call (in setAttribute) which can cause CSP - // to go haywire. See: https://developer.mozilla.org/en/Security/CSP - if ( div.attachEvent ) { - for ( i in { - submit: 1, - change: 1, - focusin: 1 - }) { - eventName = "on" + i; - isSupported = ( eventName in div ); - if ( !isSupported ) { - div.setAttribute( eventName, "return;" ); - isSupported = ( typeof div[ eventName ] === "function" ); - } - support[ i + "Bubbles" ] = isSupported; - } +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var doc = node ? node.ownerDocument || node : preferredDoc, + parent = doc.defaultView; + + // If no document and documentElement is available, return + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; } - fragment.removeChild( div ); + // Set our document + document = doc; + docElem = doc.documentElement; - // Null elements to avoid leaks in IE - fragment = select = opt = div = input = null; + // Support tests + documentIsHTML = !isXML( doc ); - // Run tests that need a body at doc ready - jQuery(function() { - var container, outer, inner, table, td, offsetSupport, - marginDiv, conMarginTop, style, html, positionTopLeftWidthHeight, - paddingMarginBorderVisibility, paddingMarginBorder, - body = document.getElementsByTagName("body")[0]; + // Support: IE>8 + // If iframe document is assigned to "document" variable and if iframe has been reloaded, + // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 + // IE6-8 do not support the defaultView property so parent will be undefined + if ( parent && parent.attachEvent && parent !== parent.top ) { + parent.attachEvent( "onbeforeunload", function() { + setDocument(); + }); + } - if ( !body ) { - // Return for frameset docs that don't have a body - return; - } + /* Attributes + ---------------------------------------------------------------------- */ - conMarginTop = 1; - paddingMarginBorder = "padding:0;margin:0;border:"; - positionTopLeftWidthHeight = "position:absolute;top:0;left:0;width:1px;height:1px;"; - paddingMarginBorderVisibility = paddingMarginBorder + "0;visibility:hidden;"; - style = "style='" + positionTopLeftWidthHeight + paddingMarginBorder + "5px solid #000;"; - html = "
              " + - "" + - "
              "; + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans) + support.attributes = assert(function( div ) { + div.className = "i"; + return !div.getAttribute("className"); + }); - container = document.createElement("div"); - container.style.cssText = paddingMarginBorderVisibility + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px"; - body.insertBefore( container, body.firstChild ); + /* getElement(s)By* + ---------------------------------------------------------------------- */ - // Construct the test element - div = document.createElement("div"); - container.appendChild( div ); + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( div ) { + div.appendChild( doc.createComment("") ); + return !div.getElementsByTagName("*").length; + }); - // Check if table cells still have offsetWidth/Height when they are set - // to display:none and there are still other visible table cells in a - // table row; if so, offsetWidth/Height are not reliable for use when - // determining if an element has been hidden directly using - // display:none (it is still safe to use offsets if a parent element is - // hidden; don safety goggles and see bug #4512 for more information). - // (only IE 8 fails this test) - div.innerHTML = "
              t
              "; - tds = div.getElementsByTagName( "td" ); - isSupported = ( tds[ 0 ].offsetHeight === 0 ); + // Check if getElementsByClassName can be trusted + support.getElementsByClassName = assert(function( div ) { + div.innerHTML = "
              "; - tds[ 0 ].style.display = ""; - tds[ 1 ].style.display = "none"; + // Support: Safari<4 + // Catch class over-caching + div.firstChild.className = "i"; + // Support: Opera<10 + // Catch gEBCN failure to find non-leading classes + return div.getElementsByClassName("i").length === 2; + }); - // Check if empty table cells still have offsetWidth/Height - // (IE <= 8 fail this test) - support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( div ) { + docElem.appendChild( div ).id = expando; + return !doc.getElementsByName || !doc.getElementsByName( expando ).length; + }); - // Check if div with explicit width and no margin-right incorrectly - // gets computed margin-right based on width of container. For more - // info see bug #3333 - // Fails in WebKit before Feb 2011 nightlies - // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right - if ( window.getComputedStyle ) { - div.innerHTML = ""; - marginDiv = document.createElement( "div" ); - marginDiv.style.width = "0"; - marginDiv.style.marginRight = "0"; - div.style.width = "2px"; - div.appendChild( marginDiv ); - support.reliableMarginRight = - ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; - } + // ID find and filter + if ( support.getById ) { + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== strundefined && documentIsHTML ) { + var m = context.getElementById( id ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [m] : []; + } + }; + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + } else { + // Support: IE6/7 + // getElementById is not reliable as a find shortcut + delete Expr.find["ID"]; + + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + } - if ( typeof div.style.zoom !== "undefined" ) { - // Check if natively block-level elements act like inline-block - // elements when setting their display to 'inline' and giving - // them layout - // (IE < 8 does this) - div.innerHTML = ""; - div.style.width = div.style.padding = "1px"; - div.style.border = 0; - div.style.overflow = "hidden"; - div.style.display = "inline"; - div.style.zoom = 1; - support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 ); + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== strundefined ) { + return context.getElementsByTagName( tag ); + } + } : + function( tag, context ) { + var elem, + tmp = [], + i = 0, + results = context.getElementsByTagName( tag ); - // Check if elements with layout shrink-wrap their children - // (IE 6 does this) - div.style.display = "block"; - div.style.overflow = "visible"; - div.innerHTML = "
              "; - support.shrinkWrapBlocks = ( div.offsetWidth !== 3 ); + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) { + return context.getElementsByClassName( className ); } + }; - div.style.cssText = positionTopLeftWidthHeight + paddingMarginBorderVisibility; - div.innerHTML = html; + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ - outer = div.firstChild; - inner = outer.firstChild; - td = outer.nextSibling.firstChild.firstChild; + // QSA and matchesSelector support - offsetSupport = { - doesNotAddBorder: ( inner.offsetTop !== 5 ), - doesAddBorderForTableAndCells: ( td.offsetTop === 5 ) - }; + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; - inner.style.position = "fixed"; - inner.style.top = "20px"; + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See http://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; - // safari subtracts parent border width here which is 5px - offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 ); - inner.style.position = inner.style.top = ""; + if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( div ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // http://bugs.jquery.com/ticket/12359 + div.innerHTML = ""; - outer.style.overflow = "hidden"; - outer.style.position = "relative"; + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !div.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } - offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 ); - offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop ); + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + }); - if ( window.getComputedStyle ) { - div.style.marginTop = "1%"; - support.pixelMargin = ( window.getComputedStyle( div, null ) || { marginTop: 0 } ).marginTop !== "1%"; - } + assert(function( div ) { - if ( typeof container.style.zoom !== "undefined" ) { - container.style.zoom = 1; - } + // Support: Opera 10-12/IE8 + // ^= $= *= and empty values + // Should not select anything + // Support: Windows 8 Native Apps + // The type attribute is restricted during .innerHTML assignment + var input = doc.createElement("input"); + input.setAttribute( "type", "hidden" ); + div.appendChild( input ).setAttribute( "t", "" ); - body.removeChild( container ); - marginDiv = div = container = null; + if ( div.querySelectorAll("[t^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } - jQuery.extend( support, offsetSupport ); - }); + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":enabled").length ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } - return support; -})(); + // Opera 10-11 does not throw on post-comma invalid pseudos + div.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + assert(function( div ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( div, "div" ); + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( div, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } -var rbrace = /^(?:\{.*\}|\[.*\])$/, - rmultiDash = /([A-Z])/g; + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + + // Element contains another + // Purposefully does not implement inclusive descendent + // As in, an element does not contain itself + contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; -jQuery.extend({ - cache: {}, + /* Sorting + ---------------------------------------------------------------------- */ - // Please use with caution - uuid: 0, + // Document order sorting + sortOrder = docElem.compareDocumentPosition ? + function( a, b ) { - // Unique for each copy of jQuery on the page - // Non-digits removed to match rinlinejQuery - expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } - // The following elements throw uncatchable exceptions if you - // attempt to add expando properties to them. - noData: { - "embed": true, - // Ban all objects except for Flash (which handle expandos) - "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", - "applet": true - }, + var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b ); - hasData: function( elem ) { - elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; - return !!elem && !isEmptyDataObject( elem ); - }, + if ( compare ) { + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { - data: function( elem, name, data, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; + // Choose the first element that is related to our preferred document + if ( a === doc || contains(preferredDoc, a) ) { + return -1; + } + if ( b === doc || contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; } - var privateCache, thisCache, ret, - internalKey = jQuery.expando, - getByName = typeof name === "string", + // Not directly comparable, sort on existence of method + return a.compareDocumentPosition ? -1 : 1; + } : + function( a, b ) { + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; - // We have to handle DOM nodes and JS objects differently because IE6-7 - // can't GC object references properly across the DOM-JS boundary - isNode = elem.nodeType, + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; - // Only DOM nodes need the global jQuery cache; JS object data is - // attached directly to the object so GC can occur automatically - cache = isNode ? jQuery.cache : elem, + // Parentless nodes are either documents or disconnected + } else if ( !aup || !bup ) { + return a === doc ? -1 : + b === doc ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + 0; - // Only defining an ID for JS objects if its cache already exists allows - // the code to shortcut on the same path as a DOM node with no cache - id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey, - isEvents = name === "events"; + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } - // Avoid doing any more work than we need to when trying to get data on an - // object that has no data at all - if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) { - return; + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); } - if ( !id ) { - // Only DOM nodes need a new unique ID for each element since their data - // ends up in the global cache - if ( isNode ) { - elem[ internalKey ] = id = ++jQuery.uuid; - } else { - id = internalKey; - } + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; } - if ( !cache[ id ] ) { - cache[ id ] = {}; + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : - // Avoids exposing jQuery metadata on plain JS objects when the object - // is serialized using JSON.stringify - if ( !isNode ) { - cache[ id ].toJSON = jQuery.noop; - } - } + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; - // An object can be passed to jQuery.data instead of a key/value pair; this gets - // shallow copied over onto the existing cache - if ( typeof name === "object" || typeof name === "function" ) { - if ( pvt ) { - cache[ id ] = jQuery.extend( cache[ id ], name ); - } else { - cache[ id ].data = jQuery.extend( cache[ id ].data, name ); - } - } + return doc; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); - privateCache = thisCache = cache[ id ]; + if ( support.matchesSelector && documentIsHTML && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); - // jQuery data() is stored in a separate object inside the object's internal data - // cache in order to avoid key collisions between internal data and user-defined - // data. - if ( !pvt ) { - if ( !thisCache.data ) { - thisCache.data = {}; + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; } + } catch(e) {} + } - thisCache = thisCache.data; - } + return Sizzle( expr, document, null, [elem] ).length > 0; +}; - if ( data !== undefined ) { - thisCache[ jQuery.camelCase( name ) ] = data; - } +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; - // Users should not attempt to inspect the internal events object using jQuery.data, - // it is undocumented and subject to change. But does anyone listen? No. - if ( isEvents && !thisCache[ name ] ) { - return privateCache.events; - } +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; - // Check for both converted-to-camel and non-converted data property names - // If a data property was specified - if ( getByName ) { + return val === undefined ? + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null : + val; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; - // First Try to find as-is property data - ret = thisCache[ name ]; +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; - // Test for null|undefined property data - if ( ret == null ) { + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); - // Try to find the camelCased property - ret = thisCache[ jQuery.camelCase( name ) ]; + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); } - } else { - ret = thisCache; } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } - return ret; - }, + return results; +}; - removeData: function( elem, name, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + for ( ; (node = elem[i]); i++ ) { + // Do not traverse comment nodes + ret += getText( node ); } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (see #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes - var thisCache, i, l, + return ret; +}; - // Reference to internal data cache key - internalKey = jQuery.expando, +Expr = Sizzle.selectors = { - isNode = elem.nodeType, + // Can be adjusted by the user + cacheLength: 50, - // See jQuery.data for more information - cache = isNode ? jQuery.cache : elem, + createPseudo: markFunction, - // See jQuery.data for more information - id = isNode ? elem[ internalKey ] : internalKey; + match: matchExpr, - // If there is already no cache entry for this object, there is no - // purpose in continuing - if ( !cache[ id ] ) { - return; - } + attrHandle: {}, - if ( name ) { + find: {}, - thisCache = pvt ? cache[ id ] : cache[ id ].data; + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, - if ( thisCache ) { + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); - // Support array or space separated string names for data keys - if ( !jQuery.isArray( name ) ) { + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape ); - // try the string as a key before any manipulation - if ( name in thisCache ) { - name = [ name ]; - } else { + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } - // split the camel cased version by spaces unless a key with the spaces exists - name = jQuery.camelCase( name ); - if ( name in thisCache ) { - name = [ name ]; - } else { - name = name.split( " " ); - } - } - } + return match.slice( 0, 4 ); + }, - for ( i = 0, l = name.length; i < l; i++ ) { - delete thisCache[ name[i] ]; + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); } - // If there is no data left in the cache, we want to continue - // and let the cache object itself get destroyed - if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) { - return; - } + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); } - } - // See jQuery.data for more information - if ( !pvt ) { - delete cache[ id ].data; + return match; + }, - // Don't destroy the parent cache unless the internal data object - // had been the only thing left in it - if ( !isEmptyDataObject(cache[ id ]) ) { - return; + "PSEUDO": function( match ) { + var excess, + unquoted = !match[5] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; } - } - // Browsers that fail expando deletion also refuse to delete expandos on - // the window, but it will allow it on all other JS objects; other browsers - // don't care - // Ensure that `cache` is not a window object #10080 - if ( jQuery.support.deleteExpando || !cache.setInterval ) { - delete cache[ id ]; - } else { - cache[ id ] = null; - } + // Accept quoted arguments as-is + if ( match[3] && match[4] !== undefined ) { + match[2] = match[4]; - // We destroyed the cache and need to eliminate the expando on the node to avoid - // false lookups in the cache for entries that no longer exist - if ( isNode ) { - // IE does not allow us to delete expando properties from nodes, - // nor does it have a removeAttribute function on Document nodes; - // we must handle all of these cases - if ( jQuery.support.deleteExpando ) { - delete elem[ internalKey ]; - } else if ( elem.removeAttribute ) { - elem.removeAttribute( internalKey ); - } else { - elem[ internalKey ] = null; + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); } }, - // For internal use only. - _data: function( elem, name, data ) { - return jQuery.data( elem, name, data, true ); - }, + filter: { - // A method for determining if a DOM node can handle the data expando - acceptData: function( elem ) { - if ( elem.nodeName ) { - var match = jQuery.noData[ elem.nodeName.toLowerCase() ]; + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, - if ( match ) { - return !(match === true || elem.getAttribute("classid") !== match); - } - } + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; - return true; - } -}); + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" ); + }); + }, -jQuery.fn.extend({ - data: function( key, value ) { - var parts, part, attr, name, l, - elem = this[0], - i = 0, - data = null; + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = jQuery.data( elem ); + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } - if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { - attr = elem.attributes; - for ( l = attr.length; i < l; i++ ) { - name = attr[i].name; + result += ""; - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.substring(5) ); + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, - dataAttr( elem, name, data[ name ] ); + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, outerCache, node, diff, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + // Seek `elem` from a previously-cached index + outerCache = parent[ expando ] || (parent[ expando ] = {}); + cache = outerCache[ type ] || []; + nodeIndex = cache[0] === dirruns && cache[1]; + diff = cache[0] === dirruns && cache[2]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + outerCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + // Use previously-cached element index if available + } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { + diff = cache[1]; + + // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) + } else { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { + // Cache the index of each encountered element + if ( useCache ) { + (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); } - jQuery._data( elem, "parsedAttrs", true ); - } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf.call( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; } - return data; + return fn; } + }, - // Sets multiple values - if ( typeof key === "object" ) { - return this.each(function() { - jQuery.data( this, key ); - }); - } + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); - parts = key.split( ".", 2 ); - parts[1] = parts[1] ? "." + parts[1] : ""; - part = parts[1] + "!"; + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; - return jQuery.access( this, function( value ) { + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + return !results.pop(); + }; + }), - if ( value === undefined ) { - data = this.triggerHandler( "getData" + part, [ parts[0] ] ); + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), - // Try to fetch any internally stored data first - if ( data === undefined && elem ) { - data = jQuery.data( elem, key ); - data = dataAttr( elem, key, data ); - } + "contains": markFunction(function( text ) { + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": function( elem ) { + return elem.disabled === false; + }, + + "disabled": function( elem ) { + return elem.disabled === true; + }, + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, - return data === undefined && parts[1] ? - this.data( parts[0] ) : - data; + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; } - parts[1] = value; - this.each(function() { - var self = jQuery( this ); + return elem.selected === true; + }, - self.triggerHandler( "setData" + part, parts ); - jQuery.data( this, key, value ); - self.triggerHandler( "changeData" + part, parts ); - }); - }, null, value, arguments.length > 1, null, false ); - }, + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is only affected by element nodes and content nodes(including text(3), cdata(4)), + // not comment, processing instructions, or others + // Thanks to Diego Perini for the nodeName shortcut + // Greater than "@" means alpha characters (specifically not starting with "#" or "?") + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) { + return false; + } + } + return true; + }, - removeData: function( key ) { - return this.each(function() { - jQuery.removeData( this, key ); - }); - } -}); + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, -function dataAttr( elem, key, data ) { - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, - var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, - data = elem.getAttribute( name ); + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - jQuery.isNumeric( data ) ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch( e ) {} + "text": function( elem ) { + var attr; + // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) + // use getAttribute instead to test this case + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type ); + }, - // Make sure we set the data so it isn't changed later - jQuery.data( elem, key, data ); + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), - } else { - data = undefined; - } + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) } +}; - return data; +Expr.pseudos["nth"] = Expr.pseudos["eq"]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); } -// checks a cache object for emptiness -function isEmptyDataObject( obj ) { - for ( var name in obj ) { +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); - // if the public data object is empty, the private is still empty - if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { - continue; - } - if ( name !== "toJSON" ) { - return false; - } +function tokenize( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); } - return true; -} + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( tokens = [] ); + } + matched = false; + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } -function handleQueueMarkDefer( elem, type, src ) { - var deferDataKey = type + "defer", - queueDataKey = type + "queue", - markDataKey = type + "mark", - defer = jQuery._data( elem, deferDataKey ); - if ( defer && - ( src === "queue" || !jQuery._data(elem, queueDataKey) ) && - ( src === "mark" || !jQuery._data(elem, markDataKey) ) ) { - // Give room for hard-coded callbacks to fire first - // and eventually mark/queue something else on the element - setTimeout( function() { - if ( !jQuery._data( elem, queueDataKey ) && - !jQuery._data( elem, markDataKey ) ) { - jQuery.removeData( elem, deferDataKey, true ); - defer.fire(); + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); } - }, 0 ); + } + + if ( !matched ) { + break; + } } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); } -jQuery.extend({ +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} - _mark: function( elem, type ) { - if ( elem ) { - type = ( type || "fx" ) + "mark"; - jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 ); - } - }, +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + checkNonElements = base && dir === "parentNode", + doneName = done++; - _unmark: function( force, elem, type ) { - if ( force !== true ) { - type = elem; - elem = force; - force = false; - } - if ( elem ) { - type = type || "fx"; - var key = type + "mark", - count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 ); - if ( count ) { - jQuery._data( elem, key, count ); + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var data, cache, outerCache, + dirkey = dirruns + " " + doneName; + + // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } } else { - jQuery.removeData( elem, key, true ); - handleQueueMarkDefer( elem, type, "mark" ); + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) { + if ( (data = cache[1]) === true || data === cachedruns ) { + return data === true; + } + } else { + cache = outerCache[ dir ] = [ dirkey ]; + cache[1] = matcher( elem, context, xml ) || cachedruns; + if ( cache[1] === true ) { + return true; + } + } + } + } } - } - }, + }; +} - queue: function( elem, type, data ) { - var q; - if ( elem ) { - type = ( type || "fx" ) + "queue"; - q = jQuery._data( elem, type ); +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !q || jQuery.isArray(data) ) { - q = jQuery._data( elem, type, jQuery.makeArray(data) ); - } else { - q.push( data ); +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); } } - return q || []; } - }, + } - dequeue: function( elem, type ) { - type = type || "fx"; + return newUnmatched; +} - var queue = jQuery.queue( elem, type ), - fn = queue.shift(), - hooks = {}; +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - } + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), - if ( fn ) { - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, - jQuery._data( elem, type + ".run", hooks ); - fn.call( elem, function() { - jQuery.dequeue( elem, type ); - }, hooks ); - } + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - if ( !queue.length ) { - jQuery.removeData( elem, type + "queue " + type + ".run", true ); - handleQueueMarkDefer( elem, type, "queue" ); - } - } -}); + // ...intermediate processing is necessary + [] : -jQuery.fn.extend({ - queue: function( type, data ) { - var setter = 2; + // ...otherwise use results directly + results : + matcherIn; - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); } - if ( arguments.length < setter ) { - return jQuery.queue( this[0], type ); + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } } - return data === undefined ? - this : - this.each(function() { - var queue = jQuery.queue( this, type, data ); + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ - delay: function( time, type ) { - time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; - type = type || "fx"; + } - return this.queue( type, function( next, hooks ) { - var timeout = setTimeout( next, time ); - hooks.stop = function() { - clearTimeout( timeout ); - }; - }); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, object ) { - if ( typeof type !== "string" ) { - object = type; - type = undefined; - } - type = type || "fx"; - var defer = jQuery.Deferred(), - elements = this, - i = elements.length, - count = 1, - deferDataKey = type + "defer", - queueDataKey = type + "queue", - markDataKey = type + "mark", - tmp; - function resolve() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); } } - while( i-- ) { - if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) || - ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) || - jQuery.data( elements[ i ], markDataKey, undefined, true ) ) && - jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) { - count++; - tmp.add( resolve ); + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf.call( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + return ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); } + matchers.push( matcher ); } - resolve(); - return defer.promise( object ); } -}); - - - - -var rclass = /[\n\t\r]/g, - rspace = /\s+/, - rreturn = /\r/g, - rtype = /^(?:button|input)$/i, - rfocusable = /^(?:button|input|object|select|textarea)$/i, - rclickable = /^a(?:rea)?$/i, - rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - getSetAttribute = jQuery.support.getSetAttribute, - nodeHook, boolHook, fixSpecified; - -jQuery.fn.extend({ - attr: function( name, value ) { - return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 ); - }, - - removeAttr: function( name ) { - return this.each(function() { - jQuery.removeAttr( this, name ); - }); - }, - - prop: function( name, value ) { - return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 ); - }, - - removeProp: function( name ) { - name = jQuery.propFix[ name ] || name; - return this.each(function() { - // try/catch handles cases where IE balks (such as removing a property on window) - try { - this[ name ] = undefined; - delete this[ name ]; - } catch( e ) {} - }); - }, - - addClass: function( value ) { - var classNames, i, l, elem, - setClass, c, cl; - if ( jQuery.isFunction( value ) ) { - return this.each(function( j ) { - jQuery( this ).addClass( value.call(this, j, this.className) ); - }); - } + return elementMatcher( matchers ); +} - if ( value && typeof value === "string" ) { - classNames = value.split( rspace ); +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + // A counter to specify which element is currently being matched + var matcherCachedRuns = 0, + bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, expandContext ) { + var elem, j, matcher, + setMatched = [], + matchedCount = 0, + i = "0", + unmatched = seed && [], + outermost = expandContext != null, + contextBackup = outermostContext, + // We must always have either seed elements or context + elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1); + + if ( outermost ) { + outermostContext = context !== document && context; + cachedruns = matcherCachedRuns; + } + + // Add elements passing elementMatchers directly to results + // Keep `i` a string if there are no elements so `matchedCount` will be "00" below + for ( ; (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context, xml ) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + cachedruns = ++matcherCachedRuns; + } + } - for ( i = 0, l = this.length; i < l; i++ ) { - elem = this[ i ]; + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } - if ( elem.nodeType === 1 ) { - if ( !elem.className && classNames.length === 1 ) { - elem.className = value; + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } - } else { - setClass = " " + elem.className + " "; + // Apply set filters to unmatched elements + matchedCount += i; + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } - for ( c = 0, cl = classNames.length; c < cl; c++ ) { - if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) { - setClass += classNames[ c ] + " "; + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); } } - elem.className = jQuery.trim( setClass ); } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); } - } - } - return this; - }, + // Add matches to results + push.apply( results, setMatched ); - removeClass: function( value ) { - var classNames, i, l, elem, className, c, cl; + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { - if ( jQuery.isFunction( value ) ) { - return this.each(function( j ) { - jQuery( this ).removeClass( value.call(this, j, this.className) ); - }); - } + Sizzle.uniqueSort( results ); + } + } - if ( (value && typeof value === "string") || value === undefined ) { - classNames = ( value || "" ).split( rspace ); + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } - for ( i = 0, l = this.length; i < l; i++ ) { - elem = this[ i ]; + return unmatched; + }; - if ( elem.nodeType === 1 && elem.className ) { - if ( value ) { - className = (" " + elem.className + " ").replace( rclass, " " ); - for ( c = 0, cl = classNames.length; c < cl; c++ ) { - className = className.replace(" " + classNames[ c ] + " ", " "); - } - elem.className = jQuery.trim( className ); + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} - } else { - elem.className = ""; - } - } +compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !group ) { + group = tokenize( selector ); + } + i = group.length; + while ( i-- ) { + cached = matcherFromTokens( group[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); } } - return this; - }, + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + } + return cached; +}; - toggleClass: function( value, stateVal ) { - var type = typeof value, - isBool = typeof stateVal === "boolean"; +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} - if ( jQuery.isFunction( value ) ) { - return this.each(function( i ) { - jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); - }); - } +function select( selector, context, results, seed ) { + var i, tokens, token, type, find, + match = tokenize( selector ); - return this.each(function() { - if ( type === "string" ) { - // toggle individual class names - var className, - i = 0, - self = jQuery( this ), - state = stateVal, - classNames = value.split( rspace ); + if ( !seed ) { + // Try to minimize operations if there is only one group + if ( match.length === 1 ) { - while ( (className = classNames[ i++ ]) ) { - // check each className given, space seperated list - state = isBool ? state : !self.hasClass( className ); - self[ state ? "addClass" : "removeClass" ]( className ); - } + // Take a shortcut and set the context if the root selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + support.getById && context.nodeType === 9 && documentIsHTML && + Expr.relative[ tokens[1].type ] ) { - } else if ( type === "undefined" || type === "boolean" ) { - if ( this.className ) { - // store className if set - jQuery._data( this, "__className__", this.className ); + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; } - - // toggle whole className - this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; - } - }); - }, - - hasClass: function( selector ) { - var className = " " + selector + " ", - i = 0, - l = this.length; - for ( ; i < l; i++ ) { - if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { - return true; + selector = selector.slice( tokens.shift().value.length ); } - } - - return false; - }, - - val: function( value ) { - var hooks, ret, isFunction, - elem = this[0]; - if ( !arguments.length ) { - if ( elem ) { - hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ]; + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; - if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { - return ret; + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && context.parentNode || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } - ret = elem.value; - - return typeof ret === "string" ? - // handle most common string cases - ret.replace(rreturn, "") : - // handle cases where value is null/undef or number - ret == null ? "" : ret; + break; + } + } } - - return; } + } - isFunction = jQuery.isFunction( value ); - - return this.each(function( i ) { - var self = jQuery(this), val; + // Compile and execute a filtering function + // Provide `match` to avoid retokenization if we modified the selector above + compile( selector, match )( + seed, + context, + !documentIsHTML, + results, + rsibling.test( selector ) + ); + return results; +} - if ( this.nodeType !== 1 ) { - return; - } +// One-time assignments - if ( isFunction ) { - val = value.call( this, i, self.val() ); - } else { - val = value; - } +// Sort stability +support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; - // Treat null/undefined as ""; convert numbers to string - if ( val == null ) { - val = ""; - } else if ( typeof val === "number" ) { - val += ""; - } else if ( jQuery.isArray( val ) ) { - val = jQuery.map(val, function ( value ) { - return value == null ? "" : value + ""; - }); - } +// Support: Chrome<14 +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = hasDuplicate; - hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; +// Initialize against the default document +setDocument(); - // If set returns undefined, fall back to normal setting - if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { - this.value = val; - } - }); - } +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( div1 ) { + // Should return 1, but returns 4 (following) + return div1.compareDocumentPosition( document.createElement("div") ) & 1; }); -jQuery.extend({ - valHooks: { - option: { - get: function( elem ) { - // attributes.value is undefined in Blackberry 4.7 but - // uses .value. See #6932 - var val = elem.attributes.value; - return !val || val.specified ? elem.value : elem.text; - } - }, - select: { - get: function( elem ) { - var value, i, max, option, - index = elem.selectedIndex, - values = [], - options = elem.options, - one = elem.type === "select-one"; +// Support: IE<8 +// Prevent attribute/property "interpolation" +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( div ) { + div.innerHTML = ""; + return div.firstChild.getAttribute("href") === "#" ; +}) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + }); +} - // Nothing was selected - if ( index < 0 ) { - return null; - } +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert(function( div ) { + div.innerHTML = ""; + div.firstChild.setAttribute( "value", "" ); + return div.firstChild.getAttribute( "value" ) === ""; +}) ) { + addHandle( "value", function( elem, name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + }); +} - // Loop through all the selected options - i = one ? index : 0; - max = one ? index + 1 : options.length; - for ( ; i < max; i++ ) { - option = options[ i ]; +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert(function( div ) { + return div.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + elem[ name ] === true ? name.toLowerCase() : null; + } + }); +} - // Don't return options that are disabled or in a disabled optgroup - if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && - (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.pseudos; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; - // Get the specific value for the option - value = jQuery( option ).val(); - // We don't need an array for one selects - if ( one ) { - return value; - } +})( window ); +// String to Object options format cache +var optionsCache = {}; - // Multi-Selects return an array - values.push( value ); +// Convert String-formatted options into Object-formatted ones and store in cache +function createOptions( options ) { + var object = optionsCache[ options ] = {}; + jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) { + object[ flag ] = true; + }); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + ( optionsCache[ options ] || createOptions( options ) ) : + jQuery.extend( {}, options ); + + var // Flag to know if list is currently firing + firing, + // Last fire value (for non-forgettable lists) + memory, + // Flag to know if list was already fired + fired, + // End of the loop when firing + firingLength, + // Index of currently firing callback (modified by remove if needed) + firingIndex, + // First callback to fire (used internally by add and fireWith) + firingStart, + // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = !options.once && [], + // Fire callbacks + fire = function( data ) { + memory = options.memory && data; + fired = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + firing = true; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { + memory = false; // To prevent further calls using add + break; + } + } + firing = false; + if ( list ) { + if ( stack ) { + if ( stack.length ) { + fire( stack.shift() ); } + } else if ( memory ) { + list = []; + } else { + self.disable(); } - - // Fixes Bug #2551 -- select.val() broken in IE after form.reset() - if ( one && !values.length && options.length ) { - return jQuery( options[ index ] ).val(); + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + // First, we save the current length + var start = list.length; + (function add( args ) { + jQuery.each( args, function( _, arg ) { + var type = jQuery.type( arg ); + if ( type === "function" ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && type !== "string" ) { + // Inspect recursively + add( arg ); + } + }); + })( arguments ); + // Do we need to add the callbacks to the + // current firing batch? + if ( firing ) { + firingLength = list.length; + // With memory, if we're not firing then + // we should call right away + } else if ( memory ) { + firingStart = start; + fire( memory ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + jQuery.each( arguments, function( _, arg ) { + var index; + while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + // Handle firing indexes + if ( firing ) { + if ( index <= firingLength ) { + firingLength--; + } + if ( index <= firingIndex ) { + firingIndex--; + } + } + } + }); + } + return this; + }, + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); + }, + // Remove all callbacks from the list + empty: function() { + list = []; + firingLength = 0; + return this; + }, + // Have the list do nothing anymore + disable: function() { + list = stack = memory = undefined; + return this; + }, + // Is it disabled? + disabled: function() { + return !list; + }, + // Lock the list in its current state + lock: function() { + stack = undefined; + if ( !memory ) { + self.disable(); + } + return this; + }, + // Is it locked? + locked: function() { + return !stack; + }, + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( list && ( !fired || stack ) ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + if ( firing ) { + stack.push( args ); + } else { + fire( args ); + } } + return this; + }, + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; - return values; + return self; +}; +jQuery.extend({ + + Deferred: function( func ) { + var tuples = [ + // action, add listener, listener list, final state + [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], + [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], + [ "notify", "progress", jQuery.Callbacks("memory") ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + then: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + return jQuery.Deferred(function( newDefer ) { + jQuery.each( tuples, function( i, tuple ) { + var action = tuple[ 0 ], + fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; + // deferred[ done | fail | progress ] for forwarding actions to newDefer + deferred[ tuple[1] ](function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise() + .done( newDefer.resolve ) + .fail( newDefer.reject ) + .progress( newDefer.notify ); + } else { + newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + } + }); + }); + fns = null; + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } }, + deferred = {}; - set: function( elem, value ) { - var values = jQuery.makeArray( value ); + // Keep pipe for back-compat + promise.pipe = promise.then; - jQuery(elem).find("option").each(function() { - this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; - }); + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 3 ]; - if ( !values.length ) { - elem.selectedIndex = -1; - } - return values; + // promise[ done | fail | progress ] = list.add + promise[ tuple[1] ] = list.add; + + // Handle state + if ( stateString ) { + list.add(function() { + // state = [ resolved | rejected ] + state = stateString; + + // [ reject_list | resolve_list ].disable; progress_list.lock + }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); } + + // deferred[ resolve | reject | notify ] + deferred[ tuple[0] ] = function() { + deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); + return this; + }; + deferred[ tuple[0] + "With" ] = list.fireWith; + }); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); } - }, - attrFn: { - val: true, - css: true, - html: true, - text: true, - data: true, - width: true, - height: true, - offset: true + // All done! + return deferred; }, - attr: function( elem, name, value, pass ) { - var ret, hooks, notxml, - nType = elem.nodeType; + // Deferred helper + when: function( subordinate /* , ..., subordinateN */ ) { + var i = 0, + resolveValues = core_slice.call( arguments ), + length = resolveValues.length, + + // the count of uncompleted subordinates + remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + + // the master Deferred. If resolveValues consist of only a single Deferred, just use that. + deferred = remaining === 1 ? subordinate : jQuery.Deferred(), + + // Update function for both resolve and progress values + updateFunc = function( i, contexts, values ) { + return function( value ) { + contexts[ i ] = this; + values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value; + if( values === progressValues ) { + deferred.notifyWith( contexts, values ); + } else if ( !( --remaining ) ) { + deferred.resolveWith( contexts, values ); + } + }; + }, - // don't get/set attributes on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return; - } + progressValues, progressContexts, resolveContexts; - if ( pass && name in jQuery.attrFn ) { - return jQuery( elem )[ name ]( value ); + // add listeners to Deferred subordinates; treat others as resolved + if ( length > 1 ) { + progressValues = new Array( length ); + progressContexts = new Array( length ); + resolveContexts = new Array( length ); + for ( ; i < length; i++ ) { + if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { + resolveValues[ i ].promise() + .done( updateFunc( i, resolveContexts, resolveValues ) ) + .fail( deferred.reject ) + .progress( updateFunc( i, progressContexts, progressValues ) ); + } else { + --remaining; + } + } } - // Fallback to prop when attributes are not supported - if ( typeof elem.getAttribute === "undefined" ) { - return jQuery.prop( elem, name, value ); + // if we're not waiting on anything, resolve the master + if ( !remaining ) { + deferred.resolveWith( resolveContexts, resolveValues ); } - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + return deferred.promise(); + } +}); +jQuery.support = (function( support ) { - // All attributes are lowercase - // Grab necessary hook if one is defined - if ( notxml ) { - name = name.toLowerCase(); - hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook ); - } + var all, a, input, select, fragment, opt, eventName, isSupported, i, + div = document.createElement("div"); - if ( value !== undefined ) { + // Setup + div.setAttribute( "className", "t" ); + div.innerHTML = "
              a"; - if ( value === null ) { - jQuery.removeAttr( elem, name ); - return; + // Finish early in limited (non-browser) environments + all = div.getElementsByTagName("*") || []; + a = div.getElementsByTagName("a")[ 0 ]; + if ( !a || !a.style || !all.length ) { + return support; + } - } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; + // First batch of tests + select = document.createElement("select"); + opt = select.appendChild( document.createElement("option") ); + input = div.getElementsByTagName("input")[ 0 ]; - } else { - elem.setAttribute( name, "" + value ); - return value; - } + a.style.cssText = "top:1px;float:left;opacity:.5"; - } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) { - return ret; + // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) + support.getSetAttribute = div.className !== "t"; - } else { + // IE strips leading whitespace when .innerHTML is used + support.leadingWhitespace = div.firstChild.nodeType === 3; - ret = elem.getAttribute( name ); + // Make sure that tbody elements aren't automatically inserted + // IE will insert them into empty tables + support.tbody = !div.getElementsByTagName("tbody").length; - // Non-existent attributes return null, we normalize to undefined - return ret === null ? - undefined : - ret; - } - }, + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + support.htmlSerialize = !!div.getElementsByTagName("link").length; - removeAttr: function( elem, value ) { - var propName, attrNames, name, l, isBool, - i = 0; + // Get the style information from getAttribute + // (IE uses .cssText instead) + support.style = /top/.test( a.getAttribute("style") ); - if ( value && elem.nodeType === 1 ) { - attrNames = value.toLowerCase().split( rspace ); - l = attrNames.length; + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + support.hrefNormalized = a.getAttribute("href") === "/a"; - for ( ; i < l; i++ ) { - name = attrNames[ i ]; + // Make sure that element opacity exists + // (IE uses filter instead) + // Use a regex to work around a WebKit issue. See #5145 + support.opacity = /^0.5/.test( a.style.opacity ); - if ( name ) { - propName = jQuery.propFix[ name ] || name; - isBool = rboolean.test( name ); + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + support.cssFloat = !!a.style.cssFloat; - // See #9699 for explanation of this approach (setting first, then removal) - // Do not do this for boolean attributes (see #10870) - if ( !isBool ) { - jQuery.attr( elem, name, "" ); - } - elem.removeAttribute( getSetAttribute ? name : propName ); + // Check the default checkbox/radio value ("" on WebKit; "on" elsewhere) + support.checkOn = !!input.value; - // Set corresponding property to false for boolean attributes - if ( isBool && propName in elem ) { - elem[ propName ] = false; - } - } - } - } - }, + // Make sure that a selected-by-default option has a working selected property. + // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) + support.optSelected = opt.selected; - attrHooks: { - type: { - set: function( elem, value ) { - // We can't allow the type property to be changed (since it causes problems in IE) - if ( rtype.test( elem.nodeName ) && elem.parentNode ) { - jQuery.error( "type property can't be changed" ); - } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { - // Setting the type on a radio button after the value resets the value in IE6-9 - // Reset value to it's default in case type is set after value - // This is for element creation - var val = elem.value; - elem.setAttribute( "type", value ); - if ( val ) { - elem.value = val; - } - return value; - } - } - }, - // Use the value property for back compat - // Use the nodeHook for button elements in IE6/7 (#1954) - value: { - get: function( elem, name ) { - if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { - return nodeHook.get( elem, name ); - } - return name in elem ? - elem.value : - null; - }, - set: function( elem, value, name ) { - if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { - return nodeHook.set( elem, value, name ); - } - // Does not return so that setAttribute is also used - elem.value = value; - } - } - }, + // Tests for enctype support on a form (#6743) + support.enctype = !!document.createElement("form").enctype; - propFix: { - tabindex: "tabIndex", - readonly: "readOnly", - "for": "htmlFor", - "class": "className", - maxlength: "maxLength", - cellspacing: "cellSpacing", - cellpadding: "cellPadding", - rowspan: "rowSpan", - colspan: "colSpan", - usemap: "useMap", - frameborder: "frameBorder", - contenteditable: "contentEditable" - }, + // Makes sure cloning an html5 element does not cause problems + // Where outerHTML is undefined, this still works + support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>"; - prop: function( elem, name, value ) { - var ret, hooks, notxml, - nType = elem.nodeType; + // Will be defined later + support.inlineBlockNeedsLayout = false; + support.shrinkWrapBlocks = false; + support.pixelPosition = false; + support.deleteExpando = true; + support.noCloneEvent = true; + support.reliableMarginRight = true; + support.boxSizingReliable = true; - // don't get/set properties on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return; - } + // Make sure checked status is properly cloned + input.checked = true; + support.noCloneChecked = input.cloneNode( true ).checked; - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + // Make sure that the options inside disabled selects aren't marked as disabled + // (WebKit marks them as disabled) + select.disabled = true; + support.optDisabled = !opt.disabled; - if ( notxml ) { - // Fix name and attach hooks - name = jQuery.propFix[ name ] || name; - hooks = jQuery.propHooks[ name ]; - } + // Support: IE<9 + try { + delete div.test; + } catch( e ) { + support.deleteExpando = false; + } - if ( value !== undefined ) { - if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; + // Check if we can trust getAttribute("value") + input = document.createElement("input"); + input.setAttribute( "value", "" ); + support.input = input.getAttribute( "value" ) === ""; - } else { - return ( elem[ name ] = value ); - } + // Check if an input maintains its value after becoming a radio + input.value = "t"; + input.setAttribute( "type", "radio" ); + support.radioValue = input.value === "t"; - } else { - if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { - return ret; + // #11217 - WebKit loses check when the name is after the checked attribute + input.setAttribute( "checked", "t" ); + input.setAttribute( "name", "t" ); - } else { - return elem[ name ]; - } - } - }, + fragment = document.createDocumentFragment(); + fragment.appendChild( input ); - propHooks: { - tabIndex: { - get: function( elem ) { - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - var attributeNode = elem.getAttributeNode("tabindex"); + // Check if a disconnected checkbox will retain its checked + // value of true after appended to the DOM (IE6/7) + support.appendChecked = input.checked; - return attributeNode && attributeNode.specified ? - parseInt( attributeNode.value, 10 ) : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - undefined; - } - } - } -}); + // WebKit doesn't clone checked state correctly in fragments + support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; -// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional) -jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex; + // Support: IE<9 + // Opera does not clone events (and typeof div.attachEvent === undefined). + // IE9-10 clones events bound via attachEvent, but they don't trigger with .click() + if ( div.attachEvent ) { + div.attachEvent( "onclick", function() { + support.noCloneEvent = false; + }); -// Hook for boolean attributes -boolHook = { - get: function( elem, name ) { - // Align boolean attributes with corresponding properties - // Fall back to attribute presence where some booleans are not supported - var attrNode, - property = jQuery.prop( elem, name ); - return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ? - name.toLowerCase() : - undefined; - }, - set: function( elem, value, name ) { - var propName; - if ( value === false ) { - // Remove boolean attributes when set to false - jQuery.removeAttr( elem, name ); - } else { - // value is true since we know at this point it's type boolean and not false - // Set boolean attributes to the same name and set the DOM property - propName = jQuery.propFix[ name ] || name; - if ( propName in elem ) { - // Only set the IDL specifically if it already exists on the element - elem[ propName ] = true; - } + div.cloneNode( true ).click(); + } - elem.setAttribute( name, name.toLowerCase() ); - } - return name; + // Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event) + // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP) + for ( i in { submit: true, change: true, focusin: true }) { + div.setAttribute( eventName = "on" + i, "t" ); + + support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false; } -}; -// IE6/7 do not support getting/setting some attributes with get/setAttribute -if ( !getSetAttribute ) { + div.style.backgroundClip = "content-box"; + div.cloneNode( true ).style.backgroundClip = ""; + support.clearCloneStyle = div.style.backgroundClip === "content-box"; - fixSpecified = { - name: true, - id: true, - coords: true - }; + // Support: IE<9 + // Iteration over object's inherited properties before its own. + for ( i in jQuery( support ) ) { + break; + } + support.ownLast = i !== "0"; - // Use this for any attribute in IE6/7 - // This fixes almost every IE6/7 issue - nodeHook = jQuery.valHooks.button = { - get: function( elem, name ) { - var ret; - ret = elem.getAttributeNode( name ); - return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ? - ret.nodeValue : - undefined; - }, - set: function( elem, value, name ) { - // Set the existing or create a new attribute node - var ret = elem.getAttributeNode( name ); - if ( !ret ) { - ret = document.createAttribute( name ); - elem.setAttributeNode( ret ); - } - return ( ret.nodeValue = value + "" ); + // Run tests that need a body at doc ready + jQuery(function() { + var container, marginDiv, tds, + divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;", + body = document.getElementsByTagName("body")[0]; + + if ( !body ) { + // Return for frameset docs that don't have a body + return; } - }; - // Apply the nodeHook to tabindex - jQuery.attrHooks.tabindex.set = nodeHook.set; + container = document.createElement("div"); + container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px"; - // Set width and height to auto instead of 0 on empty string( Bug #8150 ) - // This is for removals - jQuery.each([ "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { - set: function( elem, value ) { - if ( value === "" ) { - elem.setAttribute( name, "auto" ); - return value; - } - } - }); - }); + body.appendChild( container ).appendChild( div ); - // Set contenteditable to false on removals(#10429) - // Setting to empty string throws an error as an invalid value - jQuery.attrHooks.contenteditable = { - get: nodeHook.get, - set: function( elem, value, name ) { - if ( value === "" ) { - value = "false"; - } - nodeHook.set( elem, value, name ); - } - }; -} + // Support: IE8 + // Check if table cells still have offsetWidth/Height when they are set + // to display:none and there are still other visible table cells in a + // table row; if so, offsetWidth/Height are not reliable for use when + // determining if an element has been hidden directly using + // display:none (it is still safe to use offsets if a parent element is + // hidden; don safety goggles and see bug #4512 for more information). + div.innerHTML = "
              t
              "; + tds = div.getElementsByTagName("td"); + tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none"; + isSupported = ( tds[ 0 ].offsetHeight === 0 ); + + tds[ 0 ].style.display = ""; + tds[ 1 ].style.display = "none"; + // Support: IE8 + // Check if empty table cells still have offsetWidth/Height + support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); -// Some attributes require a special call on IE -if ( !jQuery.support.hrefNormalized ) { - jQuery.each([ "href", "src", "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { - get: function( elem ) { - var ret = elem.getAttribute( name, 2 ); - return ret === null ? undefined : ret; - } + // Check box-sizing and margin behavior. + div.innerHTML = ""; + div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;"; + + // Workaround failing boxSizing test due to offsetWidth returning wrong value + // with some non-1 values of body zoom, ticket #13543 + jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() { + support.boxSizing = div.offsetWidth === 4; }); - }); -} -if ( !jQuery.support.style ) { - jQuery.attrHooks.style = { - get: function( elem ) { - // Return undefined in the case of empty string - // Normalize to lowercase since IE uppercases css property names - return elem.style.cssText.toLowerCase() || undefined; - }, - set: function( elem, value ) { - return ( elem.style.cssText = "" + value ); + // Use window.getComputedStyle because jsdom on node.js will break without it. + if ( window.getComputedStyle ) { + support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%"; + support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px"; + + // Check if div with explicit width and no margin-right incorrectly + // gets computed margin-right based on width of container. (#3333) + // Fails in WebKit before Feb 2011 nightlies + // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right + marginDiv = div.appendChild( document.createElement("div") ); + marginDiv.style.cssText = div.style.cssText = divReset; + marginDiv.style.marginRight = marginDiv.style.width = "0"; + div.style.width = "1px"; + + support.reliableMarginRight = + !parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight ); } - }; -} -// Safari mis-reports the default selected property of an option -// Accessing the parent's selectedIndex property fixes it -if ( !jQuery.support.optSelected ) { - jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, { - get: function( elem ) { - var parent = elem.parentNode; + if ( typeof div.style.zoom !== core_strundefined ) { + // Support: IE<8 + // Check if natively block-level elements act like inline-block + // elements when setting their display to 'inline' and giving + // them layout + div.innerHTML = ""; + div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1"; + support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 ); - if ( parent ) { - parent.selectedIndex; + // Support: IE6 + // Check if elements with layout shrink-wrap their children + div.style.display = "block"; + div.innerHTML = "
              "; + div.firstChild.style.width = "5px"; + support.shrinkWrapBlocks = ( div.offsetWidth !== 3 ); - // Make sure that it also works with optgroups, see #5701 - if ( parent.parentNode ) { - parent.parentNode.selectedIndex; - } + if ( support.inlineBlockNeedsLayout ) { + // Prevent IE 6 from affecting layout for positioned elements #11048 + // Prevent IE from shrinking the body in IE 7 mode #12869 + // Support: IE<8 + body.style.zoom = 1; } - return null; } - }); -} -// IE6/7 call enctype encoding -if ( !jQuery.support.enctype ) { - jQuery.propFix.enctype = "encoding"; -} + body.removeChild( container ); -// Radios and checkboxes getter/setter -if ( !jQuery.support.checkOn ) { - jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = { - get: function( elem ) { - // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified - return elem.getAttribute("value") === null ? "on" : elem.value; - } - }; - }); -} -jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], { - set: function( elem, value ) { - if ( jQuery.isArray( value ) ) { - return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); - } - } + // Null elements to avoid leaks in IE + container = div = tds = marginDiv = null; }); -}); + // Null elements to avoid leaks in IE + all = select = fragment = opt = a = input = null; + return support; +})({}); +var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, + rmultiDash = /([A-Z])/g; -var rformElems = /^(?:textarea|input|select)$/i, - rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/, - rhoverHack = /(?:^|\s)hover(\.\S+)?\b/, - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|contextmenu)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/, - quickParse = function( selector ) { - var quick = rquickIs.exec( selector ); - if ( quick ) { - // 0 1 2 3 - // [ _, tag, id, class ] - quick[1] = ( quick[1] || "" ).toLowerCase(); - quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" ); - } - return quick; - }, - quickIs = function( elem, m ) { - var attrs = elem.attributes || {}; - return ( - (!m[1] || elem.nodeName.toLowerCase() === m[1]) && - (!m[2] || (attrs.id || {}).value === m[2]) && - (!m[3] || m[3].test( (attrs[ "class" ] || {}).value )) - ); - }, - hoverHack = function( events ) { - return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" ); - }; +function internalData( elem, name, data, pvt /* Internal Use Only */ ){ + if ( !jQuery.acceptData( elem ) ) { + return; + } -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { + var ret, thisCache, + internalKey = jQuery.expando, - add: function( elem, types, handler, data, selector ) { + // We have to handle DOM nodes and JS objects differently because IE6-7 + // can't GC object references properly across the DOM-JS boundary + isNode = elem.nodeType, - var elemData, eventHandle, events, - t, tns, type, namespaces, handleObj, - handleObjIn, quick, handlers, special; + // Only DOM nodes need the global jQuery cache; JS object data is + // attached directly to the object so GC can occur automatically + cache = isNode ? jQuery.cache : elem, - // Don't attach events to noData or text/comment nodes (allow plain objects tho) - if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) { - return; - } + // Only defining an ID for JS objects if its cache already exists allows + // the code to shortcut on the same path as a DOM node with no cache + id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey; - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } + // Avoid doing any more work than we need to when trying to get data on an + // object that has no data at all + if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) { + return; + } - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; + if ( !id ) { + // Only DOM nodes need a new unique ID for each element since their data + // ends up in the global cache + if ( isNode ) { + id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++; + } else { + id = internalKey; } + } - // Init the element's event structure and main handler, if this is the first - events = elemData.events; - if ( !events ) { - elemData.events = events = {}; + if ( !cache[ id ] ) { + // Avoid exposing jQuery metadata on plain JS objects when the object + // is serialized using JSON.stringify + cache[ id ] = isNode ? {} : { toJSON: jQuery.noop }; + } + + // An object can be passed to jQuery.data instead of a key/value pair; this gets + // shallow copied over onto the existing cache + if ( typeof name === "object" || typeof name === "function" ) { + if ( pvt ) { + cache[ id ] = jQuery.extend( cache[ id ], name ); + } else { + cache[ id ].data = jQuery.extend( cache[ id ].data, name ); } - eventHandle = elemData.handle; - if ( !eventHandle ) { - elemData.handle = eventHandle = function( e ) { - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? - jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : - undefined; - }; - // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events - eventHandle.elem = elem; + } + + thisCache = cache[ id ]; + + // jQuery data() is stored in a separate object inside the object's internal data + // cache in order to avoid key collisions between internal data and user-defined + // data. + if ( !pvt ) { + if ( !thisCache.data ) { + thisCache.data = {}; } - // Handle multiple events separated by a space - // jQuery(...).bind("mouseover mouseout", fn); - types = jQuery.trim( hoverHack(types) ).split( " " ); - for ( t = 0; t < types.length; t++ ) { + thisCache = thisCache.data; + } - tns = rtypenamespace.exec( types[t] ) || []; - type = tns[1]; - namespaces = ( tns[2] || "" ).split( "." ).sort(); + if ( data !== undefined ) { + thisCache[ jQuery.camelCase( name ) ] = data; + } - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; + // Check for both converted-to-camel and non-converted data property names + // If a data property was specified + if ( typeof name === "string" ) { - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; + // First Try to find as-is property data + ret = thisCache[ name ]; - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; + // Test for null|undefined property data + if ( ret == null ) { - // handleObj is passed to all event handlers - handleObj = jQuery.extend({ - type: type, - origType: tns[1], - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - quick: selector && quickParse( selector ), - namespace: namespaces.join(".") - }, handleObjIn ); + // Try to find the camelCased property + ret = thisCache[ jQuery.camelCase( name ) ]; + } + } else { + ret = thisCache; + } - // Init the event handler queue if we're the first - handlers = events[ type ]; - if ( !handlers ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; + return ret; +} - // Only use addEventListener/attachEvent if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); +function internalRemoveData( elem, name, pvt ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); - } - } - } + var thisCache, i, + isNode = elem.nodeType, - if ( special.add ) { - special.add.call( elem, handleObj ); + // See jQuery.data for more information + cache = isNode ? jQuery.cache : elem, + id = isNode ? elem[ jQuery.expando ] : jQuery.expando; - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; + // If there is already no cache entry for this object, there is no + // purpose in continuing + if ( !cache[ id ] ) { + return; + } + + if ( name ) { + + thisCache = pvt ? cache[ id ] : cache[ id ].data; + + if ( thisCache ) { + + // Support array or space separated string names for data keys + if ( !jQuery.isArray( name ) ) { + + // try the string as a key before any manipulation + if ( name in thisCache ) { + name = [ name ]; + } else { + + // split the camel cased version by spaces unless a key with the spaces exists + name = jQuery.camelCase( name ); + if ( name in thisCache ) { + name = [ name ]; + } else { + name = name.split(" "); + } } + } else { + // If "name" is an array of keys... + // When data is initially created, via ("key", "val") signature, + // keys will be converted to camelCase. + // Since there is no way to tell _how_ a key was added, remove + // both plain key and camelCase key. #12786 + // This will only penalize the array argument path. + name = name.concat( jQuery.map( name, jQuery.camelCase ) ); } - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); + i = name.length; + while ( i-- ) { + delete thisCache[ name[i] ]; } - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; + // If there is no data left in the cache, we want to continue + // and let the cache object itself get destroyed + if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) { + return; + } } + } - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - global: {}, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - - var elemData = jQuery.hasData( elem ) && jQuery._data( elem ), - t, tns, type, origType, namespaces, origCount, - j, events, special, handle, eventType, handleObj; + // See jQuery.data for more information + if ( !pvt ) { + delete cache[ id ].data; - if ( !elemData || !(events = elemData.events) ) { + // Don't destroy the parent cache unless the internal data object + // had been the only thing left in it + if ( !isEmptyDataObject( cache[ id ] ) ) { return; } + } - // Once for each type.namespace in types; type may be omitted - types = jQuery.trim( hoverHack( types || "" ) ).split(" "); - for ( t = 0; t < types.length; t++ ) { - tns = rtypenamespace.exec( types[t] ) || []; - type = origType = tns[1]; - namespaces = tns[2]; - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } + // Destroy the cache + if ( isNode ) { + jQuery.cleanData( [ elem ], true ); - special = jQuery.event.special[ type ] || {}; - type = ( selector? special.delegateType : special.bindType ) || type; - eventType = events[ type ] || []; - origCount = eventType.length; - namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null; + // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080) + /* jshint eqeqeq: false */ + } else if ( jQuery.support.deleteExpando || cache != cache.window ) { + /* jshint eqeqeq: true */ + delete cache[ id ]; - // Remove matching events - for ( j = 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; + // When all else fails, null + } else { + cache[ id ] = null; + } +} - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !namespaces || namespaces.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { - eventType.splice( j--, 1 ); +jQuery.extend({ + cache: {}, - if ( handleObj.selector ) { - eventType.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } + // The following elements throw uncatchable exceptions if you + // attempt to add expando properties to them. + noData: { + "applet": true, + "embed": true, + // Ban all objects except for Flash (which handle expandos) + "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" + }, - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( eventType.length === 0 && origCount !== eventType.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { - jQuery.removeEvent( elem, type, elemData.handle ); - } + hasData: function( elem ) { + elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; + return !!elem && !isEmptyDataObject( elem ); + }, - delete events[ type ]; - } - } + data: function( elem, name, data ) { + return internalData( elem, name, data ); + }, - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - handle = elemData.handle; - if ( handle ) { - handle.elem = null; - } + removeData: function( elem, name ) { + return internalRemoveData( elem, name ); + }, - // removeData also checks for emptiness and clears the expando if empty - // so use it instead of delete - jQuery.removeData( elem, [ "events", "handle" ], true ); - } + // For internal use only. + _data: function( elem, name, data ) { + return internalData( elem, name, data, true ); }, - // Events that are safe to short-circuit if no handlers are attached. - // Native DOM events should not be added, they may have inline handlers. - customEvent: { - "getData": true, - "setData": true, - "changeData": true + _removeData: function( elem, name ) { + return internalRemoveData( elem, name, true ); }, - trigger: function( event, data, elem, onlyHandlers ) { - // Don't do events on text and comment nodes - if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) { - return; + // A method for determining if a DOM node can handle the data expando + acceptData: function( elem ) { + // Do not set data on non-element because it will not be cleared (#8335). + if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) { + return false; } - // Event object or event type - var type = event.type || event, - namespaces = [], - cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType; - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } + var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ]; - if ( type.indexOf( "!" ) >= 0 ) { - // Exclusive events trigger only for the exact event (no namespaces) - type = type.slice(0, -1); - exclusive = true; - } + // nodes accept data unless otherwise specified; rejection can be conditional + return !noData || noData !== true && elem.getAttribute("classid") === noData; + } +}); - if ( type.indexOf( "." ) >= 0 ) { - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split("."); - type = namespaces.shift(); - namespaces.sort(); - } +jQuery.fn.extend({ + data: function( key, value ) { + var attrs, name, + data = null, + i = 0, + elem = this[0]; - if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) { - // No jQuery handlers for this event type, and it can't have inline handlers - return; - } + // Special expections of .data basically thwart jQuery.access, + // so implement the relevant behavior ourselves - // Caller can pass in an Event, Object, or just an event type string - event = typeof event === "object" ? - // jQuery.Event object - event[ jQuery.expando ] ? event : - // Object literal - new jQuery.Event( type, event ) : - // Just the event type (string) - new jQuery.Event( type ); + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = jQuery.data( elem ); - event.type = type; - event.isTrigger = true; - event.exclusive = exclusive; - event.namespace = namespaces.join( "." ); - event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null; - ontype = type.indexOf( ":" ) < 0 ? "on" + type : ""; + if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { + attrs = elem.attributes; + for ( ; i < attrs.length; i++ ) { + name = attrs[i].name; - // Handle a global trigger - if ( !elem ) { + if ( name.indexOf("data-") === 0 ) { + name = jQuery.camelCase( name.slice(5) ); - // TODO: Stop taunting the data cache; remove global events and always attach to document - cache = jQuery.cache; - for ( i in cache ) { - if ( cache[ i ].events && cache[ i ].events[ type ] ) { - jQuery.event.trigger( event, data, cache[ i ].handle.elem, true ); + dataAttr( elem, name, data[ name ] ); + } + } + jQuery._data( elem, "parsedAttrs", true ); } } - return; + + return data; } - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; + // Sets multiple values + if ( typeof key === "object" ) { + return this.each(function() { + jQuery.data( this, key ); + }); } - // Clone any incoming data and prepend the event, creating the handler arg list - data = data != null ? jQuery.makeArray( data ) : []; - data.unshift( event ); + return arguments.length > 1 ? - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } + // Sets one value + this.each(function() { + jQuery.data( this, key, value ); + }) : - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - eventPath = [[ elem, special.bindType || type ]]; - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + // Gets one value + // Try to fetch any internally stored data first + elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null; + }, - bubbleType = special.delegateType || type; - cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode; - old = null; - for ( ; cur; cur = cur.parentNode ) { - eventPath.push([ cur, bubbleType ]); - old = cur; - } + removeData: function( key ) { + return this.each(function() { + jQuery.removeData( this, key ); + }); + } +}); - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( old && old === elem.ownerDocument ) { - eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]); - } - } +function dataAttr( elem, key, data ) { + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { - // Fire handlers on the event path - for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) { + var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); - cur = eventPath[i][0]; - event.type = eventPath[i][1]; + data = elem.getAttribute( name ); - handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - // Note that this is a bare JS function and not a jQuery handler - handle = ontype && cur[ ontype ]; - if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) { - event.preventDefault(); - } - } - event.type = type; + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + // Only convert to a number if it doesn't change the string + +data + "" === data ? +data : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { + // Make sure we set the data so it isn't changed later + jQuery.data( elem, key, data ); - if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) && - !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { + } else { + data = undefined; + } + } - // Call a native DOM method on the target with the same name name as the event. - // Can't use an .isFunction() check here because IE6/7 fails that test. - // Don't do default actions on window, that's where global variables be (#6170) - // IE<9 dies on focus/blur to hidden element (#1486) - if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) { + return data; +} - // Don't re-trigger an onFOO event when we call its FOO() method - old = elem[ ontype ]; +// checks a cache object for emptiness +function isEmptyDataObject( obj ) { + var name; + for ( name in obj ) { - if ( old ) { - elem[ ontype ] = null; - } + // if the public data object is empty, the private is still empty + if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { + continue; + } + if ( name !== "toJSON" ) { + return false; + } + } - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - elem[ type ](); - jQuery.event.triggered = undefined; + return true; +} +jQuery.extend({ + queue: function( elem, type, data ) { + var queue; - if ( old ) { - elem[ ontype ] = old; - } + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = jQuery._data( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || jQuery.isArray(data) ) { + queue = jQuery._data( elem, type, jQuery.makeArray(data) ); + } else { + queue.push( data ); } } + return queue || []; } - - return event.result; }, - dispatch: function( event ) { + dequeue: function( elem, type ) { + type = type || "fx"; - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event || window.event ); + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; - var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []), - delegateCount = handlers.delegateCount, - args = [].slice.call( arguments, 0 ), - run_all = !event.exclusive && !event.namespace, - special = jQuery.event.special[ event.type ] || {}, - handlerQueue = [], - i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related; + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; - event.delegateTarget = this; + if ( fn ) { - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers that should run if there are delegated events - // Avoid non-left-click bubbling in Firefox (#3861) - if ( delegateCount && !(event.button && event.type === "click") ) { - - // Pregenerate a single jQuery object for reuse with .is() - jqcur = jQuery(this); - jqcur.context = this.ownerDocument || this; - - for ( cur = event.target; cur != this; cur = cur.parentNode || this ) { - - // Don't process events on disabled elements (#6911, #8165) - if ( cur.disabled !== true ) { - selMatch = {}; - matches = []; - jqcur[0] = cur; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - sel = handleObj.selector; - - if ( selMatch[ sel ] === undefined ) { - selMatch[ sel ] = ( - handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel ) - ); - } - if ( selMatch[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push({ elem: cur, matches: matches }); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( handlers.length > delegateCount ) { - handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) }); - } - - // Run delegates first; they may want to stop propagation beneath us - for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) { - matched = handlerQueue[ i ]; - event.currentTarget = matched.elem; - - for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) { - handleObj = matched.matches[ j ]; - - // Triggered event must either 1) be non-exclusive and have no namespace, or - // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). - if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) { - - event.data = handleObj.data; - event.handleObj = handleObj; - - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); - - if ( ret !== undefined ) { - event.result = ret; - if ( ret === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 *** - props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split(" "), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), - filter: function( event, original ) { - var eventDoc, doc, body, - button = original.button, - fromElement = original.fromElement; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && fromElement ) { - event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); } - return event; - } - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; + // clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); } - // Create a writable copy of the event object and normalize some properties - var i, prop, - originalEvent = event, - fixHook = jQuery.event.fixHooks[ event.type ] || {}, - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = jQuery.Event( originalEvent ); - - for ( i = copy.length; i; ) { - prop = copy[ --i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2) - if ( !event.target ) { - event.target = originalEvent.srcElement || document; - } - - // Target should not be a text node (#504, Safari) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8) - if ( event.metaKey === undefined ) { - event.metaKey = event.ctrlKey; - } - - return fixHook.filter? fixHook.filter( event, originalEvent ) : event; - }, - - special: { - ready: { - // Make sure the ready event is setup - setup: jQuery.bindReady - }, - - load: { - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - - focus: { - delegateType: "focusin" - }, - blur: { - delegateType: "focusout" - }, - - beforeunload: { - setup: function( data, namespaces, eventHandle ) { - // We only want to do this special case on windows - if ( jQuery.isWindow( this ) ) { - this.onbeforeunload = eventHandle; - } - }, - - teardown: function( namespaces, eventHandle ) { - if ( this.onbeforeunload === eventHandle ) { - this.onbeforeunload = null; - } - } + if ( !startLength && hooks ) { + hooks.empty.fire(); } }, - simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - var e = jQuery.extend( - new jQuery.Event(), - event, - { type: type, - isSimulated: true, - originalEvent: {} - } - ); - if ( bubble ) { - jQuery.event.trigger( e, null, elem ); - } else { - jQuery.event.dispatch.call( elem, e ); - } - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } - } -}; - -// Some plugins are using, but it's undocumented/deprecated and will be removed. -// The 1.7 special event interface should provide all the hooks needed now. -jQuery.event.handle = jQuery.event.dispatch; - -jQuery.removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); - } - } : - function( elem, type, handle ) { - if ( elem.detachEvent ) { - elem.detachEvent( "on" + type, handle ); - } - }; - -jQuery.Event = function( src, props ) { - // Allow instantiation without the 'new' keyword - if ( !(this instanceof jQuery.Event) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || - src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); + // not intended for public consumption - generates a queueHooks object, or returns the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return jQuery._data( elem, key ) || jQuery._data( elem, key, { + empty: jQuery.Callbacks("once memory").add(function() { + jQuery._removeData( elem, type + "queue" ); + jQuery._removeData( elem, key ); + }) + }); } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -function returnFalse() { - return false; -} -function returnTrue() { - return true; -} - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - preventDefault: function() { - this.isDefaultPrevented = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - - // if preventDefault exists run it on the original event - if ( e.preventDefault ) { - e.preventDefault(); - - // otherwise set the returnValue property of the original event to false (IE) - } else { - e.returnValue = false; - } - }, - stopPropagation: function() { - this.isPropagationStopped = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - // if stopPropagation exists run it on the original event - if ( e.stopPropagation ) { - e.stopPropagation(); - } - // otherwise set the cancelBubble property of the original event to true (IE) - e.cancelBubble = true; - }, - stopImmediatePropagation: function() { - this.isImmediatePropagationStopped = returnTrue; - this.stopPropagation(); - }, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var target = this, - related = event.relatedTarget, - handleObj = event.handleObj, - selector = handleObj.selector, - ret; - - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || (related !== target && !jQuery.contains( target, related )) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; }); -// IE submit delegation -if ( !jQuery.support.submitBubbles ) { - - jQuery.event.special.submit = { - setup: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Lazy-add a submit handler when a descendant form may potentially be submitted - jQuery.event.add( this, "click._submit keypress._submit", function( e ) { - // Node name check avoids a VML-related crash in IE (#9807) - var elem = e.target, - form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; - if ( form && !form._submit_attached ) { - jQuery.event.add( form, "submit._submit", function( event ) { - event._submit_bubble = true; - }); - form._submit_attached = true; - } - }); - // return undefined since we don't need an event listener - }, - - postDispatch: function( event ) { - // If form was submitted by the user, bubble the event up the tree - if ( event._submit_bubble ) { - delete event._submit_bubble; - if ( this.parentNode && !event.isTrigger ) { - jQuery.event.simulate( "submit", this.parentNode, event, true ); - } - } - }, - - teardown: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } +jQuery.fn.extend({ + queue: function( type, data ) { + var setter = 2; - // Remove delegated handlers; cleanData eventually reaps submit handlers attached above - jQuery.event.remove( this, "._submit" ); + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; } - }; -} - -// IE change delegation and checkbox/radio fix -if ( !jQuery.support.changeBubbles ) { - - jQuery.event.special.change = { - setup: function() { - - if ( rformElems.test( this.nodeName ) ) { - // IE doesn't fire change on a check/radio until blur; trigger it on click - // after a propertychange. Eat the blur-change in special.change.handle. - // This still fires onchange a second time for check/radio after blur. - if ( this.type === "checkbox" || this.type === "radio" ) { - jQuery.event.add( this, "propertychange._change", function( event ) { - if ( event.originalEvent.propertyName === "checked" ) { - this._just_changed = true; - } - }); - jQuery.event.add( this, "click._change", function( event ) { - if ( this._just_changed && !event.isTrigger ) { - this._just_changed = false; - jQuery.event.simulate( "change", this, event, true ); - } - }); - } - return false; - } - // Delegated event; lazy-add a change handler on descendant inputs - jQuery.event.add( this, "beforeactivate._change", function( e ) { - var elem = e.target; - - if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) { - jQuery.event.add( elem, "change._change", function( event ) { - if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { - jQuery.event.simulate( "change", this.parentNode, event, true ); - } - }); - elem._change_attached = true; - } - }); - }, - - handle: function( event ) { - var elem = event.target; - - // Swallow native change events from checkbox/radio, we already triggered them above - if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { - return event.handleObj.handler.apply( this, arguments ); - } - }, - - teardown: function() { - jQuery.event.remove( this, "._change" ); - - return rformElems.test( this.nodeName ); + if ( arguments.length < setter ) { + return jQuery.queue( this[0], type ); } - }; -} -// Create "bubbling" focus and blur events -if ( !jQuery.support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + return data === undefined ? + this : + this.each(function() { + var queue = jQuery.queue( this, type, data ); - // Attach a single capturing handler while someone wants focusin/focusout - var attaches = 0, - handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); - }; + // ensure a hooks for this queue + jQuery._queueHooks( this, type ); - jQuery.event.special[ fix ] = { - setup: function() { - if ( attaches++ === 0 ) { - document.addEventListener( orig, handler, true ); - } - }, - teardown: function() { - if ( --attaches === 0 ) { - document.removeEventListener( orig, handler, true ); + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); } - } - }; - }); -} - -jQuery.fn.extend({ - - on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { // && selector != null - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - this.on( type, selector, data, types[ type ], one ); - } - return this; - } - - if ( data == null && fn == null ) { - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return this; - } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + // Based off of the plugin by Clint Helfers, with permission. + // http://blindsignals.com/index.php/2009/07/jquery-delay/ + delay: function( time, type ) { + time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; + type = type || "fx"; - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); + return this.queue( type, function( next, hooks ) { + var timeout = setTimeout( next, time ); + hooks.stop = function() { + clearTimeout( timeout ); }; - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return this.each( function() { - jQuery.event.add( this, types, fn, data, selector ); }); }, - one: function( types, selector, data, fn ) { - return this.on( types, selector, data, fn, 1 ); + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); }, - off: function( types, selector, fn ) { - if ( types && types.preventDefault && types.handleObj ) { - // ( event ) dispatched jQuery.Event - var handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - // ( types-object [, selector] ) - for ( var type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - // ( types [, fn] ) - fn = selector; - selector = undefined; + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; } - if ( fn === false ) { - fn = returnFalse; + type = type || "fx"; + + while( i-- ) { + tmp = jQuery._data( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } } - return this.each(function() { - jQuery.event.remove( this, types, fn, selector ); - }); - }, + resolve(); + return defer.promise( obj ); + } +}); +var nodeHook, boolHook, + rclass = /[\t\r\n\f]/g, + rreturn = /\r/g, + rfocusable = /^(?:input|select|textarea|button|object)$/i, + rclickable = /^(?:a|area)$/i, + ruseDefault = /^(?:checked|selected)$/i, + getSetAttribute = jQuery.support.getSetAttribute, + getSetInput = jQuery.support.input; - bind: function( types, data, fn ) { - return this.on( types, null, data, fn ); - }, - unbind: function( types, fn ) { - return this.off( types, null, fn ); +jQuery.fn.extend({ + attr: function( name, value ) { + return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 ); }, - live: function( types, data, fn ) { - jQuery( this.context ).on( types, this.selector, data, fn ); - return this; - }, - die: function( types, fn ) { - jQuery( this.context ).off( types, this.selector || "**", fn ); - return this; + removeAttr: function( name ) { + return this.each(function() { + jQuery.removeAttr( this, name ); + }); }, - delegate: function( selector, types, data, fn ) { - return this.on( types, selector, data, fn ); - }, - undelegate: function( selector, types, fn ) { - // ( namespace ) or ( selector, types [, fn] ) - return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn ); + prop: function( name, value ) { + return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 ); }, - trigger: function( type, data ) { + removeProp: function( name ) { + name = jQuery.propFix[ name ] || name; return this.each(function() { - jQuery.event.trigger( type, data, this ); + // try/catch handles cases where IE balks (such as removing a property on window) + try { + this[ name ] = undefined; + delete this[ name ]; + } catch( e ) {} }); }, - triggerHandler: function( type, data ) { - if ( this[0] ) { - return jQuery.event.trigger( type, data, this[0], true ); - } - }, - toggle: function( fn ) { - // Save reference to arguments for access in closure - var args = arguments, - guid = fn.guid || jQuery.guid++, + addClass: function( value ) { + var classes, elem, cur, clazz, j, i = 0, - toggler = function( event ) { - // Figure out which function to execute - var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; - jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); - - // Make sure that clicks stop - event.preventDefault(); - - // and execute the function - return args[ lastToggle ].apply( this, arguments ) || false; - }; + len = this.length, + proceed = typeof value === "string" && value; - // link all the functions, so any of them can unbind this click handler - toggler.guid = guid; - while ( i < args.length ) { - args[ i++ ].guid = guid; + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).addClass( value.call( this, j, this.className ) ); + }); } - return this.click( toggler ); - }, + if ( proceed ) { + // The disjunction here is for better compressibility (see removeClass) + classes = ( value || "" ).match( core_rnotwhite ) || []; - hover: function( fnOver, fnOut ) { - return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); - } -}); + for ( ; i < len; i++ ) { + elem = this[ i ]; + cur = elem.nodeType === 1 && ( elem.className ? + ( " " + elem.className + " " ).replace( rclass, " " ) : + " " + ); -jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + - "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) { + if ( cur ) { + j = 0; + while ( (clazz = classes[j++]) ) { + if ( cur.indexOf( " " + clazz + " " ) < 0 ) { + cur += clazz + " "; + } + } + elem.className = jQuery.trim( cur ); - // Handle event binding - jQuery.fn[ name ] = function( data, fn ) { - if ( fn == null ) { - fn = data; - data = null; + } + } } - return arguments.length > 0 ? - this.on( name, null, data, fn ) : - this.trigger( name ); - }; - - if ( jQuery.attrFn ) { - jQuery.attrFn[ name ] = true; - } - - if ( rkeyEvent.test( name ) ) { - jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks; - } - - if ( rmouseEvent.test( name ) ) { - jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks; - } -}); + return this; + }, + removeClass: function( value ) { + var classes, elem, cur, clazz, j, + i = 0, + len = this.length, + proceed = arguments.length === 0 || typeof value === "string" && value; + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).removeClass( value.call( this, j, this.className ) ); + }); + } + if ( proceed ) { + classes = ( value || "" ).match( core_rnotwhite ) || []; -/*! - * Sizzle CSS Selector Engine - * Copyright 2011, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){ + for ( ; i < len; i++ ) { + elem = this[ i ]; + // This expression is here for better compressibility (see addClass) + cur = elem.nodeType === 1 && ( elem.className ? + ( " " + elem.className + " " ).replace( rclass, " " ) : + "" + ); -var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, - expando = "sizcache" + (Math.random() + '').replace('.', ''), - done = 0, - toString = Object.prototype.toString, - hasDuplicate = false, - baseHasDuplicate = true, - rBackslash = /\\/g, - rReturn = /\r\n/g, - rNonWord = /\W/; - -// Here we check if the JavaScript engine is using some sort of -// optimization where it does not always call our comparision -// function. If that is the case, discard the hasDuplicate value. -// Thus far that includes Google Chrome. -[0, 0].sort(function() { - baseHasDuplicate = false; - return 0; -}); + if ( cur ) { + j = 0; + while ( (clazz = classes[j++]) ) { + // Remove *all* instances + while ( cur.indexOf( " " + clazz + " " ) >= 0 ) { + cur = cur.replace( " " + clazz + " ", " " ); + } + } + elem.className = value ? jQuery.trim( cur ) : ""; + } + } + } -var Sizzle = function( selector, context, results, seed ) { - results = results || []; - context = context || document; + return this; + }, - var origContext = context; + toggleClass: function( value, stateVal ) { + var type = typeof value; - if ( context.nodeType !== 1 && context.nodeType !== 9 ) { - return []; - } + if ( typeof stateVal === "boolean" && type === "string" ) { + return stateVal ? this.addClass( value ) : this.removeClass( value ); + } - if ( !selector || typeof selector !== "string" ) { - return results; - } + if ( jQuery.isFunction( value ) ) { + return this.each(function( i ) { + jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); + }); + } - var m, set, checkSet, extra, ret, cur, pop, i, - prune = true, - contextXML = Sizzle.isXML( context ), - parts = [], - soFar = selector; + return this.each(function() { + if ( type === "string" ) { + // toggle individual class names + var className, + i = 0, + self = jQuery( this ), + classNames = value.match( core_rnotwhite ) || []; - // Reset the position of the chunker regexp (start from head) - do { - chunker.exec( "" ); - m = chunker.exec( soFar ); + while ( (className = classNames[ i++ ]) ) { + // check each className given, space separated list + if ( self.hasClass( className ) ) { + self.removeClass( className ); + } else { + self.addClass( className ); + } + } - if ( m ) { - soFar = m[3]; + // Toggle whole class name + } else if ( type === core_strundefined || type === "boolean" ) { + if ( this.className ) { + // store className if set + jQuery._data( this, "__className__", this.className ); + } - parts.push( m[1] ); + // If the element has a class name or if we're passed "false", + // then remove the whole classname (if there was one, the above saved it). + // Otherwise bring back whatever was previously saved (if anything), + // falling back to the empty string if nothing was stored. + this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; + } + }); + }, - if ( m[2] ) { - extra = m[3]; - break; + hasClass: function( selector ) { + var className = " " + selector + " ", + i = 0, + l = this.length; + for ( ; i < l; i++ ) { + if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) { + return true; } } - } while ( m ); - - if ( parts.length > 1 && origPOS.exec( selector ) ) { - if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { - set = posProcess( parts[0] + parts[1], context, seed ); + return false; + }, - } else { - set = Expr.relative[ parts[0] ] ? - [ context ] : - Sizzle( parts.shift(), context ); + val: function( value ) { + var ret, hooks, isFunction, + elem = this[0]; - while ( parts.length ) { - selector = parts.shift(); + if ( !arguments.length ) { + if ( elem ) { + hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ]; - if ( Expr.relative[ selector ] ) { - selector += parts.shift(); + if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { + return ret; } - set = posProcess( selector, set, seed ); - } - } + ret = elem.value; - } else { - // Take a shortcut and set the context if the root selector is an ID - // (but not if it'll be faster if the inner selector is an ID) - if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && - Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { + return typeof ret === "string" ? + // handle most common string cases + ret.replace(rreturn, "") : + // handle cases where value is null/undef or number + ret == null ? "" : ret; + } - ret = Sizzle.find( parts.shift(), context, contextXML ); - context = ret.expr ? - Sizzle.filter( ret.expr, ret.set )[0] : - ret.set[0]; + return; } - if ( context ) { - ret = seed ? - { expr: parts.pop(), set: makeArray(seed) } : - Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); + isFunction = jQuery.isFunction( value ); - set = ret.expr ? - Sizzle.filter( ret.expr, ret.set ) : - ret.set; + return this.each(function( i ) { + var val; - if ( parts.length > 0 ) { - checkSet = makeArray( set ); + if ( this.nodeType !== 1 ) { + return; + } + if ( isFunction ) { + val = value.call( this, i, jQuery( this ).val() ); } else { - prune = false; + val = value; } - while ( parts.length ) { - cur = parts.pop(); - pop = cur; - - if ( !Expr.relative[ cur ] ) { - cur = ""; - } else { - pop = parts.pop(); - } + // Treat null/undefined as ""; convert numbers to string + if ( val == null ) { + val = ""; + } else if ( typeof val === "number" ) { + val += ""; + } else if ( jQuery.isArray( val ) ) { + val = jQuery.map(val, function ( value ) { + return value == null ? "" : value + ""; + }); + } - if ( pop == null ) { - pop = context; - } + hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; - Expr.relative[ cur ]( checkSet, pop, contextXML ); + // If set returns undefined, fall back to normal setting + if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { + this.value = val; } - - } else { - checkSet = parts = []; - } + }); } +}); - if ( !checkSet ) { - checkSet = set; - } +jQuery.extend({ + valHooks: { + option: { + get: function( elem ) { + // Use proper attribute retrieval(#6932, #12072) + var val = jQuery.find.attr( elem, "value" ); + return val != null ? + val : + elem.text; + } + }, + select: { + get: function( elem ) { + var value, option, + options = elem.options, + index = elem.selectedIndex, + one = elem.type === "select-one" || index < 0, + values = one ? null : [], + max = one ? index + 1 : options.length, + i = index < 0 ? + max : + one ? index : 0; - if ( !checkSet ) { - Sizzle.error( cur || selector ); - } + // Loop through all the selected options + for ( ; i < max; i++ ) { + option = options[ i ]; - if ( toString.call(checkSet) === "[object Array]" ) { - if ( !prune ) { - results.push.apply( results, checkSet ); + // oldIE doesn't update selected after form reset (#2551) + if ( ( option.selected || i === index ) && + // Don't return options that are disabled or in a disabled optgroup + ( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) && + ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) { - } else if ( context && context.nodeType === 1 ) { - for ( i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) { - results.push( set[i] ); - } - } + // Get the specific value for the option + value = jQuery( option ).val(); - } else { - for ( i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && checkSet[i].nodeType === 1 ) { - results.push( set[i] ); - } - } - } + // We don't need an array for one selects + if ( one ) { + return value; + } - } else { - makeArray( checkSet, results ); - } + // Multi-Selects return an array + values.push( value ); + } + } - if ( extra ) { - Sizzle( extra, origContext, results, seed ); - Sizzle.uniqueSort( results ); - } + return values; + }, - return results; -}; + set: function( elem, value ) { + var optionSet, option, + options = elem.options, + values = jQuery.makeArray( value ), + i = options.length; -Sizzle.uniqueSort = function( results ) { - if ( sortOrder ) { - hasDuplicate = baseHasDuplicate; - results.sort( sortOrder ); + while ( i-- ) { + option = options[ i ]; + if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) { + optionSet = true; + } + } - if ( hasDuplicate ) { - for ( var i = 1; i < results.length; i++ ) { - if ( results[i] === results[ i - 1 ] ) { - results.splice( i--, 1 ); + // force browsers to behave consistently when non-matching value is set + if ( !optionSet ) { + elem.selectedIndex = -1; } + return values; } } - } - - return results; -}; + }, -Sizzle.matches = function( expr, set ) { - return Sizzle( expr, null, null, set ); -}; + attr: function( elem, name, value ) { + var hooks, ret, + nType = elem.nodeType; -Sizzle.matchesSelector = function( node, expr ) { - return Sizzle( expr, null, null, [node] ).length > 0; -}; + // don't get/set attributes on text, comment and attribute nodes + if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + return; + } -Sizzle.find = function( expr, context, isXML ) { - var set, i, len, match, type, left; + // Fallback to prop when attributes are not supported + if ( typeof elem.getAttribute === core_strundefined ) { + return jQuery.prop( elem, name, value ); + } - if ( !expr ) { - return []; - } + // All attributes are lowercase + // Grab necessary hook if one is defined + if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { + name = name.toLowerCase(); + hooks = jQuery.attrHooks[ name ] || + ( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook ); + } - for ( i = 0, len = Expr.order.length; i < len; i++ ) { - type = Expr.order[i]; + if ( value !== undefined ) { - if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { - left = match[1]; - match.splice( 1, 1 ); + if ( value === null ) { + jQuery.removeAttr( elem, name ); - if ( left.substr( left.length - 1 ) !== "\\" ) { - match[1] = (match[1] || "").replace( rBackslash, "" ); - set = Expr.find[ type ]( match, context, isXML ); + } else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { + return ret; - if ( set != null ) { - expr = expr.replace( Expr.match[ type ], "" ); - break; - } + } else { + elem.setAttribute( name, value + "" ); + return value; } - } - } - - if ( !set ) { - set = typeof context.getElementsByTagName !== "undefined" ? - context.getElementsByTagName( "*" ) : - []; - } - return { set: set, expr: expr }; -}; + } else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { + return ret; -Sizzle.filter = function( expr, set, inplace, not ) { - var match, anyFound, - type, found, item, filter, left, - i, pass, - old = expr, - result = [], - curLoop = set, - isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); + } else { + ret = jQuery.find.attr( elem, name ); - while ( expr && set.length ) { - for ( type in Expr.filter ) { - if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { - filter = Expr.filter[ type ]; - left = match[1]; + // Non-existent attributes return null, we normalize to undefined + return ret == null ? + undefined : + ret; + } + }, - anyFound = false; + removeAttr: function( elem, value ) { + var name, propName, + i = 0, + attrNames = value && value.match( core_rnotwhite ); - match.splice(1,1); + if ( attrNames && elem.nodeType === 1 ) { + while ( (name = attrNames[i++]) ) { + propName = jQuery.propFix[ name ] || name; - if ( left.substr( left.length - 1 ) === "\\" ) { - continue; - } + // Boolean attributes get special treatment (#10870) + if ( jQuery.expr.match.bool.test( name ) ) { + // Set corresponding property to false + if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { + elem[ propName ] = false; + // Support: IE<9 + // Also clear defaultChecked/defaultSelected (if appropriate) + } else { + elem[ jQuery.camelCase( "default-" + name ) ] = + elem[ propName ] = false; + } - if ( curLoop === result ) { - result = []; + // See #9699 for explanation of this approach (setting first, then removal) + } else { + jQuery.attr( elem, name, "" ); } - if ( Expr.preFilter[ type ] ) { - match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); - - if ( !match ) { - anyFound = found = true; + elem.removeAttribute( getSetAttribute ? name : propName ); + } + } + }, - } else if ( match === true ) { - continue; + attrHooks: { + type: { + set: function( elem, value ) { + if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { + // Setting the type on a radio button after the value resets the value in IE6-9 + // Reset value to default in case type is set after value during creation + var val = elem.value; + elem.setAttribute( "type", value ); + if ( val ) { + elem.value = val; } + return value; } + } + } + }, - if ( match ) { - for ( i = 0; (item = curLoop[i]) != null; i++ ) { - if ( item ) { - found = filter( item, match, i, curLoop ); - pass = not ^ found; - - if ( inplace && found != null ) { - if ( pass ) { - anyFound = true; + propFix: { + "for": "htmlFor", + "class": "className" + }, - } else { - curLoop[i] = false; - } + prop: function( elem, name, value ) { + var ret, hooks, notxml, + nType = elem.nodeType; - } else if ( pass ) { - result.push( item ); - anyFound = true; - } - } - } - } + // don't get/set properties on text, comment and attribute nodes + if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + return; + } - if ( found !== undefined ) { - if ( !inplace ) { - curLoop = result; - } + notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - expr = expr.replace( Expr.match[ type ], "" ); + if ( notxml ) { + // Fix name and attach hooks + name = jQuery.propFix[ name ] || name; + hooks = jQuery.propHooks[ name ]; + } - if ( !anyFound ) { - return []; - } + if ( value !== undefined ) { + return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ? + ret : + ( elem[ name ] = value ); - break; - } - } + } else { + return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ? + ret : + elem[ name ]; } + }, - // Improper expression - if ( expr === old ) { - if ( anyFound == null ) { - Sizzle.error( expr ); + propHooks: { + tabIndex: { + get: function( elem ) { + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + // Use proper attribute retrieval(#12072) + var tabindex = jQuery.find.attr( elem, "tabindex" ); - } else { - break; + return tabindex ? + parseInt( tabindex, 10 ) : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + -1; } } - - old = expr; } +}); - return curLoop; -}; +// Hooks for boolean attributes +boolHook = { + set: function( elem, value, name ) { + if ( value === false ) { + // Remove boolean attributes when set to false + jQuery.removeAttr( elem, name ); + } else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { + // IE<8 needs the *property* name + elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name ); -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); + // Use defaultChecked and defaultSelected for oldIE + } else { + elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true; + } + + return name; + } }; +jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) { + var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr; + + jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ? + function( elem, name, isXML ) { + var fn = jQuery.expr.attrHandle[ name ], + ret = isXML ? + undefined : + /* jshint eqeqeq: false */ + (jQuery.expr.attrHandle[ name ] = undefined) != + getter( elem, name, isXML ) ? + + name.toLowerCase() : + null; + jQuery.expr.attrHandle[ name ] = fn; + return ret; + } : + function( elem, name, isXML ) { + return isXML ? + undefined : + elem[ jQuery.camelCase( "default-" + name ) ] ? + name.toLowerCase() : + null; + }; +}); -/** - * Utility function for retreiving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -var getText = Sizzle.getText = function( elem ) { - var i, node, - nodeType = elem.nodeType, - ret = ""; - - if ( nodeType ) { - if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent || innerText for elements - if ( typeof elem.textContent === 'string' ) { - return elem.textContent; - } else if ( typeof elem.innerText === 'string' ) { - // Replace IE's carriage returns - return elem.innerText.replace( rReturn, '' ); +// fix oldIE attroperties +if ( !getSetInput || !getSetAttribute ) { + jQuery.attrHooks.value = { + set: function( elem, value, name ) { + if ( jQuery.nodeName( elem, "input" ) ) { + // Does not return so that setAttribute is also used + elem.defaultValue = value; } else { - // Traverse it's children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling) { - ret += getText( elem ); - } + // Use nodeHook if defined (#1954); otherwise setAttribute is fine + return nodeHook && nodeHook.set( elem, value, name ); } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; } - } else { + }; +} - // If no nodeType, this is expected to be an array - for ( i = 0; (node = elem[i]); i++ ) { - // Do not traverse comment nodes - if ( node.nodeType !== 8 ) { - ret += getText( node ); +// IE6/7 do not support getting/setting some attributes with get/setAttribute +if ( !getSetAttribute ) { + + // Use this for any attribute in IE6/7 + // This fixes almost every IE6/7 issue + nodeHook = { + set: function( elem, value, name ) { + // Set the existing or create a new attribute node + var ret = elem.getAttributeNode( name ); + if ( !ret ) { + elem.setAttributeNode( + (ret = elem.ownerDocument.createAttribute( name )) + ); } + + ret.value = value += ""; + + // Break association with cloned elements by also using setAttribute (#9646) + return name === "value" || value === elem.getAttribute( name ) ? + value : + undefined; } - } - return ret; -}; + }; + jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords = + // Some attributes are constructed with empty-string values when not defined + function( elem, name, isXML ) { + var ret; + return isXML ? + undefined : + (ret = elem.getAttributeNode( name )) && ret.value !== "" ? + ret.value : + null; + }; + jQuery.valHooks.button = { + get: function( elem, name ) { + var ret = elem.getAttributeNode( name ); + return ret && ret.specified ? + ret.value : + undefined; + }, + set: nodeHook.set + }; -var Expr = Sizzle.selectors = { - order: [ "ID", "NAME", "TAG" ], + // Set contenteditable to false on removals(#10429) + // Setting to empty string throws an error as an invalid value + jQuery.attrHooks.contenteditable = { + set: function( elem, value, name ) { + nodeHook.set( elem, value === "" ? false : value, name ); + } + }; - match: { - ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, - CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, - NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/, - ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/, - TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/, - CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/, - POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/, - PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/ - }, + // Set width and height to auto instead of 0 on empty string( Bug #8150 ) + // This is for removals + jQuery.each([ "width", "height" ], function( i, name ) { + jQuery.attrHooks[ name ] = { + set: function( elem, value ) { + if ( value === "" ) { + elem.setAttribute( name, "auto" ); + return value; + } + } + }; + }); +} - leftMatch: {}, - attrMap: { - "class": "className", - "for": "htmlFor" - }, +// Some attributes require a special call on IE +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !jQuery.support.hrefNormalized ) { + // href/src property should get the full normalized URL (#10299/#12915) + jQuery.each([ "href", "src" ], function( i, name ) { + jQuery.propHooks[ name ] = { + get: function( elem ) { + return elem.getAttribute( name, 4 ); + } + }; + }); +} - attrHandle: { - href: function( elem ) { - return elem.getAttribute( "href" ); +if ( !jQuery.support.style ) { + jQuery.attrHooks.style = { + get: function( elem ) { + // Return undefined in the case of empty string + // Note: IE uppercases css property names, but if we were to .toLowerCase() + // .cssText, that would destroy case senstitivity in URL's, like in "background" + return elem.style.cssText || undefined; }, - type: function( elem ) { - return elem.getAttribute( "type" ); + set: function( elem, value ) { + return ( elem.style.cssText = value + "" ); } - }, - - relative: { - "+": function(checkSet, part){ - var isPartStr = typeof part === "string", - isTag = isPartStr && !rNonWord.test( part ), - isPartStrNotTag = isPartStr && !isTag; + }; +} - if ( isTag ) { - part = part.toLowerCase(); - } +// Safari mis-reports the default selected property of an option +// Accessing the parent's selectedIndex property fixes it +if ( !jQuery.support.optSelected ) { + jQuery.propHooks.selected = { + get: function( elem ) { + var parent = elem.parentNode; - for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { - if ( (elem = checkSet[i]) ) { - while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} + if ( parent ) { + parent.selectedIndex; - checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? - elem || false : - elem === part; + // Make sure that it also works with optgroups, see #5701 + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; } } + return null; + } + }; +} - if ( isPartStrNotTag ) { - Sizzle.filter( part, checkSet, true ); - } - }, - - ">": function( checkSet, part ) { - var elem, - isPartStr = typeof part === "string", - i = 0, - l = checkSet.length; +jQuery.each([ + "tabIndex", + "readOnly", + "maxLength", + "cellSpacing", + "cellPadding", + "rowSpan", + "colSpan", + "useMap", + "frameBorder", + "contentEditable" +], function() { + jQuery.propFix[ this.toLowerCase() ] = this; +}); - if ( isPartStr && !rNonWord.test( part ) ) { - part = part.toLowerCase(); +// IE6/7 call enctype encoding +if ( !jQuery.support.enctype ) { + jQuery.propFix.enctype = "encoding"; +} - for ( ; i < l; i++ ) { - elem = checkSet[i]; +// Radios and checkboxes getter/setter +jQuery.each([ "radio", "checkbox" ], function() { + jQuery.valHooks[ this ] = { + set: function( elem, value ) { + if ( jQuery.isArray( value ) ) { + return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); + } + } + }; + if ( !jQuery.support.checkOn ) { + jQuery.valHooks[ this ].get = function( elem ) { + // Support: Webkit + // "" is returned instead of "on" if a value isn't specified + return elem.getAttribute("value") === null ? "on" : elem.value; + }; + } +}); +var rformElems = /^(?:input|select|textarea)$/i, + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; - if ( elem ) { - var parent = elem.parentNode; - checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; - } - } +function returnTrue() { + return true; +} - } else { - for ( ; i < l; i++ ) { - elem = checkSet[i]; +function returnFalse() { + return false; +} - if ( elem ) { - checkSet[i] = isPartStr ? - elem.parentNode : - elem.parentNode === part; - } - } +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} - if ( isPartStr ) { - Sizzle.filter( part, checkSet, true ); - } - } - }, +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { - "": function(checkSet, part, isXML){ - var nodeCheck, - doneName = done++, - checkFn = dirCheck; + global: {}, - if ( typeof part === "string" && !rNonWord.test( part ) ) { - part = part.toLowerCase(); - nodeCheck = part; - checkFn = dirNodeCheck; - } + add: function( elem, types, handler, data, selector ) { + var tmp, events, t, handleObjIn, + special, eventHandle, handleObj, + handlers, type, namespaces, origType, + elemData = jQuery._data( elem ); - checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML ); - }, + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } - "~": function( checkSet, part, isXML ) { - var nodeCheck, - doneName = done++, - checkFn = dirCheck; + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } - if ( typeof part === "string" && !rNonWord.test( part ) ) { - part = part.toLowerCase(); - nodeCheck = part; - checkFn = dirNodeCheck; - } + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } - checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML ); + // Init the element's event structure and main handler, if this is the first + if ( !(events = elemData.events) ) { + events = elemData.events = {}; + } + if ( !(eventHandle = elemData.handle) ) { + eventHandle = elemData.handle = function( e ) { + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ? + jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : + undefined; + }; + // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events + eventHandle.elem = elem; } - }, - find: { - ID: function( match, context, isXML ) { - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - return m && m.parentNode ? [m] : []; + // Handle multiple events separated by a space + types = ( types || "" ).match( core_rnotwhite ) || [""]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; } - }, - NAME: function( match, context ) { - if ( typeof context.getElementsByName !== "undefined" ) { - var ret = [], - results = context.getElementsByName( match[1] ); + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; - for ( var i = 0, l = results.length; i < l; i++ ) { - if ( results[i].getAttribute("name") === match[1] ) { - ret.push( results[i] ); - } - } + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; - return ret.length === 0 ? null : ret; - } - }, + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; - TAG: function( match, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( match[1] ); - } - } - }, - preFilter: { - CLASS: function( match, curLoop, inplace, result, not, isXML ) { - match = " " + match[1].replace( rBackslash, "" ) + " "; + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); - if ( isXML ) { - return match; - } + // Init the event handler queue if we're the first + if ( !(handlers = events[ type ]) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; - for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { - if ( elem ) { - if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) { - if ( !inplace ) { - result.push( elem ); - } + // Only use addEventListener/attachEvent if the special events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + // Bind the global event handler to the element + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); - } else if ( inplace ) { - curLoop[i] = false; + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, eventHandle ); } } } - return false; - }, - - ID: function( match ) { - return match[1].replace( rBackslash, "" ); - }, - - TAG: function( match, curLoop ) { - return match[1].replace( rBackslash, "" ).toLowerCase(); - }, + if ( special.add ) { + special.add.call( elem, handleObj ); - CHILD: function( match ) { - if ( match[1] === "nth" ) { - if ( !match[2] ) { - Sizzle.error( match[0] ); + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; } - - match[2] = match[2].replace(/^\+|\s*/g, ''); - - // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' - var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec( - match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || - !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); - - // calculate the numbers (first)n+(last) including if they are negative - match[2] = (test[1] + (test[2] || 1)) - 0; - match[3] = test[3] - 0; } - else if ( match[2] ) { - Sizzle.error( match[0] ); + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); } - // TODO: Move to normal caching system - match[0] = done++; + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } - return match; - }, + // Nullify elem to prevent memory leaks in IE + elem = null; + }, - ATTR: function( match, curLoop, inplace, result, not, isXML ) { - var name = match[1] = match[1].replace( rBackslash, "" ); + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + var j, handleObj, tmp, + origCount, t, events, + special, handlers, type, + namespaces, origType, + elemData = jQuery.hasData( elem ) && jQuery._data( elem ); - if ( !isXML && Expr.attrMap[name] ) { - match[1] = Expr.attrMap[name]; - } + if ( !elemData || !(events = elemData.events) ) { + return; + } - // Handle if an un-quoted value was used - match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" ); + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( core_rnotwhite ) || [""]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); - if ( match[2] === "~=" ) { - match[4] = " " + match[4] + " "; + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; } - return match; - }, + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); - PSEUDO: function( match, curLoop, inplace, result, not ) { - if ( match[1] === "not" ) { - // If we're dealing with a complex expression, or a simple one - if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { - match[3] = Sizzle(match[3], null, null, curLoop); + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; - } else { - var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); - if ( !inplace ) { - result.push.apply( result, ret ); + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); } + } + } - return false; + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); } - } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { - return true; + delete events[ type ]; } + } - return match; - }, - - POS: function( match ) { - match.unshift( true ); + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + delete elemData.handle; - return match; + // removeData also checks for emptiness and clears the expando if empty + // so use it instead of delete + jQuery._removeData( elem, "events" ); } }, - filters: { - enabled: function( elem ) { - return elem.disabled === false && elem.type !== "hidden"; - }, - - disabled: function( elem ) { - return elem.disabled === true; - }, - - checked: function( elem ) { - return elem.checked === true; - }, - - selected: function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - parent: function( elem ) { - return !!elem.firstChild; - }, - - empty: function( elem ) { - return !elem.firstChild; - }, - - has: function( elem, i, match ) { - return !!Sizzle( match[3], elem ).length; - }, - - header: function( elem ) { - return (/h\d/i).test( elem.nodeName ); - }, - - text: function( elem ) { - var attr = elem.getAttribute( "type" ), type = elem.type; - // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) - // use getAttribute instead to test this case - return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null ); - }, - - radio: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type; - }, - - checkbox: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type; - }, - - file: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "file" === elem.type; - }, + trigger: function( event, data, elem, onlyHandlers ) { + var handle, ontype, cur, + bubbleType, special, tmp, i, + eventPath = [ elem || document ], + type = core_hasOwn.call( event, "type" ) ? event.type : event, + namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; - password: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "password" === elem.type; - }, + cur = tmp = elem = elem || document; - submit: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && "submit" === elem.type; - }, + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } - image: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "image" === elem.type; - }, + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } - reset: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && "reset" === elem.type; - }, + if ( type.indexOf(".") >= 0 ) { + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split("."); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf(":") < 0 && "on" + type; - button: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && "button" === elem.type || name === "button"; - }, + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); - input: function( elem ) { - return (/input|select|textarea|button/i).test( elem.nodeName ); - }, + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join("."); + event.namespace_re = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : + null; - focus: function( elem ) { - return elem === elem.ownerDocument.activeElement; + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; } - }, - setFilters: { - first: function( elem, i ) { - return i === 0; - }, - - last: function( elem, i, match, array ) { - return i === array.length - 1; - }, - - even: function( elem, i ) { - return i % 2 === 0; - }, - odd: function( elem, i ) { - return i % 2 === 1; - }, + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); - lt: function( elem, i, match ) { - return i < match[3] - 0; - }, + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } - gt: function( elem, i, match ) { - return i > match[3] - 0; - }, + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - nth: function( elem, i, match ) { - return match[3] - 0 === i; - }, + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } - eq: function( elem, i, match ) { - return match[3] - 0 === i; + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === (elem.ownerDocument || document) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } } - }, - filter: { - PSEUDO: function( elem, match, i, array ) { - var name = match[1], - filter = Expr.filters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; - - } else if ( name === "not" ) { - var not = match[3]; + // Fire handlers on the event path + i = 0; + while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { - for ( var j = 0, l = not.length; j < l; j++ ) { - if ( not[j] === elem ) { - return false; - } - } + event.type = i > 1 ? + bubbleType : + special.bindType || type; - return true; + // jQuery handler + handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } - } else { - Sizzle.error( name ); + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) { + event.preventDefault(); } - }, + } + event.type = type; - CHILD: function( elem, match ) { - var first, last, - doneName, parent, cache, - count, diff, - type = match[1], - node = elem; - - switch ( type ) { - case "only": - case "first": - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { - if ( type === "first" ) { - return true; - } + if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && + jQuery.acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name name as the event. + // Can't use an .isFunction() check here because IE6/7 fails that test. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) { - node = elem; + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; - /* falls through */ - case "last": - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } + if ( tmp ) { + elem[ ontype ] = null; } - return true; - - case "nth": - first = match[2]; - last = match[3]; + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + try { + elem[ type ](); + } catch ( e ) { + // IE<9 dies on focus/blur to hidden element (#1486,#12518) + // only reproducible on winXP IE8 native, not IE9 in IE8 mode + } + jQuery.event.triggered = undefined; - if ( first === 1 && last === 0 ) { - return true; + if ( tmp ) { + elem[ ontype ] = tmp; } + } + } + } - doneName = match[0]; - parent = elem.parentNode; + return event.result; + }, - if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) { - count = 0; + dispatch: function( event ) { - for ( node = parent.firstChild; node; node = node.nextSibling ) { - if ( node.nodeType === 1 ) { - node.nodeIndex = ++count; - } - } + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event ); - parent[ expando ] = doneName; - } + var i, ret, handleObj, matched, j, + handlerQueue = [], + args = core_slice.call( arguments ), + handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; - diff = elem.nodeIndex - last; + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[0] = event; + event.delegateTarget = this; - if ( first === 0 ) { - return diff === 0; + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } - } else { - return ( diff % first === 0 && diff / first >= 0 ); - } - } - }, + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); - ID: function( elem, match ) { - return elem.nodeType === 1 && elem.getAttribute("id") === match; - }, + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; - TAG: function( elem, match ) { - return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match; - }, + j = 0; + while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { - CLASS: function( elem, match ) { - return (" " + (elem.className || elem.getAttribute("class")) + " ") - .indexOf( match ) > -1; - }, + // Triggered event must either 1) have no namespace, or + // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). + if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { - ATTR: function( elem, match ) { - var name = match[1], - result = Sizzle.attr ? - Sizzle.attr( elem, name ) : - Expr.attrHandle[ name ] ? - Expr.attrHandle[ name ]( elem ) : - elem[ name ] != null ? - elem[ name ] : - elem.getAttribute( name ), - value = result + "", - type = match[2], - check = match[4]; - - return result == null ? - type === "!=" : - !type && Sizzle.attr ? - result != null : - type === "=" ? - value === check : - type === "*=" ? - value.indexOf(check) >= 0 : - type === "~=" ? - (" " + value + " ").indexOf(check) >= 0 : - !check ? - value && result !== false : - type === "!=" ? - value !== check : - type === "^=" ? - value.indexOf(check) === 0 : - type === "$=" ? - value.substr(value.length - check.length) === check : - type === "|=" ? - value === check || value.substr(0, check.length + 1) === check + "-" : - false; - }, + event.handleObj = handleObj; + event.data = handleObj.data; - POS: function( elem, match, i, array ) { - var name = match[2], - filter = Expr.setFilters[ name ]; + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); - if ( filter ) { - return filter( elem, i, match, array ); + if ( ret !== undefined ) { + if ( (event.result = ret) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } } } - } -}; - -var origPOS = Expr.match.POS, - fescape = function(all, num){ - return "\\" + (num - 0 + 1); - }; - -for ( var type in Expr.match ) { - Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) ); - Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) ); -} -// Expose origPOS -// "global" as in regardless of relation to brackets/parens -Expr.match.globalPOS = origPOS; -var makeArray = function( array, results ) { - array = Array.prototype.slice.call( array, 0 ); + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } - if ( results ) { - results.push.apply( results, array ); - return results; - } + return event.result; + }, - return array; -}; + handlers: function( event, handlers ) { + var sel, handleObj, matches, i, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; -// Perform a simple check to determine if the browser is capable of -// converting a NodeList to an array using builtin methods. -// Also verifies that the returned array holds DOM nodes -// (which is not the case in the Blackberry browser) -try { - Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // Avoid non-left-click bubbling in Firefox (#3861) + if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { -// Provide a fallback method if it does not work -} catch( e ) { - makeArray = function( array, results ) { - var i = 0, - ret = results || []; + /* jshint eqeqeq: false */ + for ( ; cur != this; cur = cur.parentNode || this ) { + /* jshint eqeqeq: true */ - if ( toString.call(array) === "[object Array]" ) { - Array.prototype.push.apply( ret, array ); + // Don't check non-elements (#13208) + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; - } else { - if ( typeof array.length === "number" ) { - for ( var l = array.length; i < l; i++ ) { - ret.push( array[i] ); - } + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; - } else { - for ( ; array[i]; i++ ) { - ret.push( array[i] ); + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) >= 0 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, handlers: matches }); + } } } } - return ret; - }; -} + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); + } -var sortOrder, siblingCheck; + return handlerQueue; + }, -if ( document.documentElement.compareDocumentPosition ) { - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - return 0; + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; } - if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { - return a.compareDocumentPosition ? -1 : 1; + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - return a.compareDocumentPosition(b) & 4 ? -1 : 1; - }; + event = new jQuery.Event( originalEvent ); -} else { - sortOrder = function( a, b ) { - // The nodes are identical, we can exit early - if ( a === b ) { - hasDuplicate = true; - return 0; + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } - // Fallback to using sourceIndex (in IE) if it's available on both nodes - } else if ( a.sourceIndex && b.sourceIndex ) { - return a.sourceIndex - b.sourceIndex; + // Support: IE<9 + // Fix target property (#1925) + if ( !event.target ) { + event.target = originalEvent.srcElement || document; } - var al, bl, - ap = [], - bp = [], - aup = a.parentNode, - bup = b.parentNode, - cur = aup; + // Support: Chrome 23+, Safari? + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } - // If the nodes are siblings (or identical) we can do a quick check - if ( aup === bup ) { - return siblingCheck( a, b ); + // Support: IE<9 + // For mouse/key events, metaKey==false if it's undefined (#3368, #11328) + event.metaKey = !!event.metaKey; - // If no parents were found then the nodes are disconnected - } else if ( !aup ) { - return -1; + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, - } else if ( !bup ) { - return 1; - } + // Includes some event props shared by KeyEvent and MouseEvent + props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), - // Otherwise they're somewhere else in the tree so we need - // to build up a full list of the parentNodes for comparison - while ( cur ) { - ap.unshift( cur ); - cur = cur.parentNode; - } + fixHooks: {}, - cur = bup; + keyHooks: { + props: "char charCode key keyCode".split(" "), + filter: function( event, original ) { - while ( cur ) { - bp.unshift( cur ); - cur = cur.parentNode; + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; } + }, + + mouseHooks: { + props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var body, eventDoc, doc, + button = original.button, + fromElement = original.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; - al = ap.length; - bl = bp.length; + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } - // Start walking down the tree looking for a discrepancy - for ( var i = 0; i < al && i < bl; i++ ) { - if ( ap[i] !== bp[i] ) { - return siblingCheck( ap[i], bp[i] ); + // Add relatedTarget, if necessary + if ( !event.relatedTarget && fromElement ) { + event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; } - } - // We ended someplace up the tree so do a sibling check - return i === al ? - siblingCheck( a, bp[i], -1 ) : - siblingCheck( ap[i], b, 1 ); - }; + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } - siblingCheck = function( a, b, ret ) { - if ( a === b ) { - return ret; + return event; } + }, - var cur = a.nextSibling; + special: { + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + try { + this.focus(); + return false; + } catch ( e ) { + // Support: IE<9 + // If we error on focus to hidden element (#1486, #12518), + // let .trigger() run the handlers + } + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) { + this.click(); + return false; + } + }, - while ( cur ) { - if ( cur === b ) { - return -1; + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); } + }, - cur = cur.nextSibling; - } - - return 1; - }; -} + beforeunload: { + postDispatch: function( event ) { -// Check to see if the browser returns elements by name when -// querying by getElementById (and provide a workaround) -(function(){ - // We're going to inject a fake input element with a specified name - var form = document.createElement("div"), - id = "script" + (new Date()).getTime(), - root = document.documentElement; + // Even when returnValue equals to undefined Firefox will still show alert + if ( event.result !== undefined ) { + event.originalEvent.returnValue = event.result; + } + } + } + }, - form.innerHTML = ""; + simulate: function( type, elem, event, bubble ) { + // Piggyback on a donor event to simulate a different one. + // Fake originalEvent to avoid donor's stopPropagation, but if the + // simulated event prevents default then we do the same on the donor. + var e = jQuery.extend( + new jQuery.Event(), + event, + { + type: type, + isSimulated: true, + originalEvent: {} + } + ); + if ( bubble ) { + jQuery.event.trigger( e, null, elem ); + } else { + jQuery.event.dispatch.call( elem, e ); + } + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } + } +}; - // Inject it into the root element, check its status, and remove it quickly - root.insertBefore( form, root.firstChild ); +jQuery.removeEvent = document.removeEventListener ? + function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } + } : + function( elem, type, handle ) { + var name = "on" + type; - // The workaround has to do additional checks after a getElementById - // Which slows things down for other browsers (hence the branching) - if ( document.getElementById( id ) ) { - Expr.find.ID = function( match, context, isXML ) { - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); + if ( elem.detachEvent ) { - return m ? - m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? - [m] : - undefined : - []; + // #8545, #7054, preventing memory leaks for custom events in IE6-8 + // detachEvent needed property on element, by name of that event, to properly expose it to GC + if ( typeof elem[ name ] === core_strundefined ) { + elem[ name ] = null; } - }; - Expr.filter.ID = function( elem, match ) { - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + elem.detachEvent( name, handle ); + } + }; - return elem.nodeType === 1 && node && node.nodeValue === match; - }; +jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword + if ( !(this instanceof jQuery.Event) ) { + return new jQuery.Event( src, props ); } - root.removeChild( form ); + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || + src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; - // release memory in IE - root = form = null; -})(); + // Event type + } else { + this.type = src; + } -(function(){ - // Check to see if the browser returns only elements - // when doing getElementsByTagName("*") + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } - // Create a fake element - var div = document.createElement("div"); - div.appendChild( document.createComment("") ); + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); - // Make sure no comments are found - if ( div.getElementsByTagName("*").length > 0 ) { - Expr.find.TAG = function( match, context ) { - var results = context.getElementsByTagName( match[1] ); + // Mark it as fixed + this[ jQuery.expando ] = true; +}; - // Filter out possible comments - if ( match[1] === "*" ) { - var tmp = []; +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, - for ( var i = 0; results[i]; i++ ) { - if ( results[i].nodeType === 1 ) { - tmp.push( results[i] ); - } - } + preventDefault: function() { + var e = this.originalEvent; - results = tmp; - } + this.isDefaultPrevented = returnTrue; + if ( !e ) { + return; + } - return results; - }; - } + // If preventDefault exists, run it on the original event + if ( e.preventDefault ) { + e.preventDefault(); - // Check to see if an attribute returns normalized href attributes - div.innerHTML = ""; + // Support: IE + // Otherwise set the returnValue property of the original event to false + } else { + e.returnValue = false; + } + }, + stopPropagation: function() { + var e = this.originalEvent; - if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && - div.firstChild.getAttribute("href") !== "#" ) { + this.isPropagationStopped = returnTrue; + if ( !e ) { + return; + } + // If stopPropagation exists, run it on the original event + if ( e.stopPropagation ) { + e.stopPropagation(); + } - Expr.attrHandle.href = function( elem ) { - return elem.getAttribute( "href", 2 ); - }; + // Support: IE + // Set the cancelBubble property of the original event to true + e.cancelBubble = true; + }, + stopImmediatePropagation: function() { + this.isImmediatePropagationStopped = returnTrue; + this.stopPropagation(); } +}; - // release memory in IE - div = null; -})(); - -if ( document.querySelectorAll ) { - (function(){ - var oldSizzle = Sizzle, - div = document.createElement("div"), - id = "__sizzle__"; +// Create mouseenter/leave events using mouseover/out and event-time checks +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, - div.innerHTML = "

              "; + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; - // Safari can't handle uppercase or unicode characters when - // in quirks mode. - if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { - return; + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; } + }; +}); - Sizzle = function( query, context, extra, seed ) { - context = context || document; - - // Only use querySelectorAll on non-XML documents - // (ID selectors don't work in non-HTML documents) - if ( !seed && !Sizzle.isXML(context) ) { - // See if we find a selector to speed up - var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query ); +// IE submit delegation +if ( !jQuery.support.submitBubbles ) { - if ( match && (context.nodeType === 1 || context.nodeType === 9) ) { - // Speed-up: Sizzle("TAG") - if ( match[1] ) { - return makeArray( context.getElementsByTagName( query ), extra ); + jQuery.event.special.submit = { + setup: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } - // Speed-up: Sizzle(".CLASS") - } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) { - return makeArray( context.getElementsByClassName( match[2] ), extra ); - } + // Lazy-add a submit handler when a descendant form may potentially be submitted + jQuery.event.add( this, "click._submit keypress._submit", function( e ) { + // Node name check avoids a VML-related crash in IE (#9807) + var elem = e.target, + form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; + if ( form && !jQuery._data( form, "submitBubbles" ) ) { + jQuery.event.add( form, "submit._submit", function( event ) { + event._submit_bubble = true; + }); + jQuery._data( form, "submitBubbles", true ); } + }); + // return undefined since we don't need an event listener + }, - if ( context.nodeType === 9 ) { - // Speed-up: Sizzle("body") - // The body element only exists once, optimize finding it - if ( query === "body" && context.body ) { - return makeArray( [ context.body ], extra ); + postDispatch: function( event ) { + // If form was submitted by the user, bubble the event up the tree + if ( event._submit_bubble ) { + delete event._submit_bubble; + if ( this.parentNode && !event.isTrigger ) { + jQuery.event.simulate( "submit", this.parentNode, event, true ); + } + } + }, - // Speed-up: Sizzle("#ID") - } else if ( match && match[3] ) { - var elem = context.getElementById( match[3] ); + teardown: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id === match[3] ) { - return makeArray( [ elem ], extra ); - } + // Remove delegated handlers; cleanData eventually reaps submit handlers attached above + jQuery.event.remove( this, "._submit" ); + } + }; +} - } else { - return makeArray( [], extra ); - } - } +// IE change delegation and checkbox/radio fix +if ( !jQuery.support.changeBubbles ) { - try { - return makeArray( context.querySelectorAll(query), extra ); - } catch(qsaError) {} - - // qSA works strangely on Element-rooted queries - // We can work around this by specifying an extra ID on the root - // and working up from there (Thanks to Andrew Dupont for the technique) - // IE 8 doesn't work on object elements - } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { - var oldContext = context, - old = context.getAttribute( "id" ), - nid = old || id, - hasParent = context.parentNode, - relativeHierarchySelector = /^\s*[+~]/.test( query ); + jQuery.event.special.change = { - if ( !old ) { - context.setAttribute( "id", nid ); - } else { - nid = nid.replace( /'/g, "\\$&" ); - } - if ( relativeHierarchySelector && hasParent ) { - context = context.parentNode; - } + setup: function() { - try { - if ( !relativeHierarchySelector || hasParent ) { - return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra ); + if ( rformElems.test( this.nodeName ) ) { + // IE doesn't fire change on a check/radio until blur; trigger it on click + // after a propertychange. Eat the blur-change in special.change.handle. + // This still fires onchange a second time for check/radio after blur. + if ( this.type === "checkbox" || this.type === "radio" ) { + jQuery.event.add( this, "propertychange._change", function( event ) { + if ( event.originalEvent.propertyName === "checked" ) { + this._just_changed = true; } - - } catch(pseudoError) { - } finally { - if ( !old ) { - oldContext.removeAttribute( "id" ); + }); + jQuery.event.add( this, "click._change", function( event ) { + if ( this._just_changed && !event.isTrigger ) { + this._just_changed = false; } - } + // Allow triggered, simulated change events (#11500) + jQuery.event.simulate( "change", this, event, true ); + }); } + return false; } + // Delegated event; lazy-add a change handler on descendant inputs + jQuery.event.add( this, "beforeactivate._change", function( e ) { + var elem = e.target; - return oldSizzle(query, context, extra, seed); - }; - - for ( var prop in oldSizzle ) { - Sizzle[ prop ] = oldSizzle[ prop ]; - } - - // release memory in IE - div = null; - })(); -} + if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) { + jQuery.event.add( elem, "change._change", function( event ) { + if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { + jQuery.event.simulate( "change", this.parentNode, event, true ); + } + }); + jQuery._data( elem, "changeBubbles", true ); + } + }); + }, -(function(){ - var html = document.documentElement, - matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector; + handle: function( event ) { + var elem = event.target; - if ( matches ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9 fails this) - var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ), - pseudoWorks = false; + // Swallow native change events from checkbox/radio, we already triggered them above + if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { + return event.handleObj.handler.apply( this, arguments ); + } + }, - try { - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( document.documentElement, "[test!='']:sizzle" ); + teardown: function() { + jQuery.event.remove( this, "._change" ); - } catch( pseudoError ) { - pseudoWorks = true; + return !rformElems.test( this.nodeName ); } + }; +} - Sizzle.matchesSelector = function( node, expr ) { - // Make sure that attribute selectors are quoted - expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); +// Create "bubbling" focus and blur events +if ( !jQuery.support.focusinBubbles ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - if ( !Sizzle.isXML( node ) ) { - try { - if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { - var ret = matches.call( node, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || !disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9, so check for that - node.document && node.document.nodeType !== 11 ) { - return ret; - } - } - } catch(e) {} - } + // Attach a single capturing handler while someone wants focusin/focusout + var attaches = 0, + handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; - return Sizzle(expr, null, null, [node]).length > 0; + jQuery.event.special[ fix ] = { + setup: function() { + if ( attaches++ === 0 ) { + document.addEventListener( orig, handler, true ); + } + }, + teardown: function() { + if ( --attaches === 0 ) { + document.removeEventListener( orig, handler, true ); + } + } }; - } -})(); - -(function(){ - var div = document.createElement("div"); + }); +} - div.innerHTML = "
              "; +jQuery.fn.extend({ - // Opera can't find a second classname (in 9.6) - // Also, make sure that getElementsByClassName actually exists - if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { - return; - } + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var type, origFn; - // Safari caches class attributes, doesn't catch changes (in 3.2) - div.lastChild.className = "e"; + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); + } + return this; + } - if ( div.getElementsByClassName("e").length === 1 ) { - return; - } + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } - Expr.order.splice(1, 0, "CLASS"); - Expr.find.CLASS = function( match, context, isXML ) { - if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { - return context.getElementsByClassName(match[1]); + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on( types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; } - }; - - // release memory in IE - div = null; -})(); - -function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - - if ( elem ) { - var match = false; - - elem = elem[dir]; - - while ( elem ) { - if ( elem[ expando ] === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 && !isXML ){ - elem[ expando ] = doneName; - elem.sizset = i; - } - - if ( elem.nodeName.toLowerCase() === cur ) { - match = elem; - break; - } - - elem = elem[dir]; + if ( typeof types === "object" ) { + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); } - - checkSet[i] = match; + return this; } - } -} - -function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; + if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each(function() { + jQuery.event.remove( this, types, fn, selector ); + }); + }, + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + triggerHandler: function( type, data ) { + var elem = this[0]; if ( elem ) { - var match = false; - - elem = elem[dir]; - - while ( elem ) { - if ( elem[ expando ] === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 ) { - if ( !isXML ) { - elem[ expando ] = doneName; - elem.sizset = i; - } - - if ( typeof cur !== "string" ) { - if ( elem === cur ) { - match = true; - break; - } - - } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { - match = elem; - break; - } - } - - elem = elem[dir]; - } - - checkSet[i] = match; + return jQuery.event.trigger( type, data, elem, true ); } } -} - -if ( document.documentElement.contains ) { - Sizzle.contains = function( a, b ) { - return a !== b && (a.contains ? a.contains(b) : true); - }; - -} else if ( document.documentElement.compareDocumentPosition ) { - Sizzle.contains = function( a, b ) { - return !!(a.compareDocumentPosition(b) & 16); - }; - -} else { - Sizzle.contains = function() { - return false; - }; -} - -Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; - - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -var posProcess = function( selector, context, seed ) { - var match, - tmpSet = [], - later = "", - root = context.nodeType ? [context] : context; - - // Position selectors must be done after the filter - // And so must :not(positional) so we move all PSEUDOs to the end - while ( (match = Expr.match.PSEUDO.exec( selector )) ) { - later += match[0]; - selector = selector.replace( Expr.match.PSEUDO, "" ); - } - - selector = Expr.relative[selector] ? selector + "*" : selector; - - for ( var i = 0, l = root.length; i < l; i++ ) { - Sizzle( selector, root[i], tmpSet, seed ); - } - - return Sizzle.filter( later, tmpSet ); -}; - -// EXPOSE -// Override sizzle attribute retrieval -Sizzle.attr = jQuery.attr; -Sizzle.selectors.attrMap = {}; -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.filters; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - -})(); - - -var runtil = /Until$/, - rparentsprev = /^(?:parents|prevUntil|prevAll)/, - // Note: This RegExp should be improved, or likely pulled from Sizzle - rmultiselector = /,/, - isSimple = /^.[^:#\[\.,]*$/, - slice = Array.prototype.slice, - POS = jQuery.expr.match.globalPOS, +}); +var isSimple = /^.[^:#\[\.,]*$/, + rparentsprev = /^(?:parents|prev(?:Until|All))/, + rneedsContext = jQuery.expr.match.needsContext, // methods guaranteed to produce a unique set when starting from a unique set guaranteedUnique = { children: true, @@ -5410,46 +5711,38 @@ var runtil = /Until$/, jQuery.fn.extend({ find: function( selector ) { - var self = this, - i, l; + var i, + ret = [], + self = this, + len = self.length; if ( typeof selector !== "string" ) { - return jQuery( selector ).filter(function() { - for ( i = 0, l = self.length; i < l; i++ ) { + return this.pushStack( jQuery( selector ).filter(function() { + for ( i = 0; i < len; i++ ) { if ( jQuery.contains( self[ i ], this ) ) { return true; } } - }); + }) ); } - var ret = this.pushStack( "", "find", selector ), - length, n, r; - - for ( i = 0, l = this.length; i < l; i++ ) { - length = ret.length; - jQuery.find( selector, this[i], ret ); - - if ( i > 0 ) { - // Make sure that the results are unique - for ( n = length; n < ret.length; n++ ) { - for ( r = 0; r < length; r++ ) { - if ( ret[r] === ret[n] ) { - ret.splice(n--, 1); - break; - } - } - } - } + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); } + // Needed because $( selector, context ) becomes $( context ).find( selector ) + ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); + ret.selector = this.selector ? this.selector + " " + selector : selector; return ret; }, has: function( target ) { - var targets = jQuery( target ); + var i, + targets = jQuery( target, this ), + len = targets.length; + return this.filter(function() { - for ( var i = 0, l = targets.length; i < l; i++ ) { + for ( i = 0; i < len; i++ ) { if ( jQuery.contains( this, targets[i] ) ) { return true; } @@ -5458,71 +5751,52 @@ jQuery.fn.extend({ }, not: function( selector ) { - return this.pushStack( winnow(this, selector, false), "not", selector); + return this.pushStack( winnow(this, selector || [], true) ); }, filter: function( selector ) { - return this.pushStack( winnow(this, selector, true), "filter", selector ); + return this.pushStack( winnow(this, selector || [], false) ); }, is: function( selector ) { - return !!selector && ( - typeof selector === "string" ? - // If this is a positional selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - POS.test( selector ) ? - jQuery( selector, this.context ).index( this[0] ) >= 0 : - jQuery.filter( selector, this ).length > 0 : - this.filter( selector ).length > 0 ); + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; }, closest: function( selectors, context ) { - var ret = [], i, l, cur = this[0]; - - // Array (deprecated as of jQuery 1.7) - if ( jQuery.isArray( selectors ) ) { - var level = 1; - - while ( cur && cur.ownerDocument && cur !== context ) { - for ( i = 0; i < selectors.length; i++ ) { - - if ( jQuery( cur ).is( selectors[ i ] ) ) { - ret.push({ selector: selectors[ i ], elem: cur, level: level }); - } - } - - cur = cur.parentNode; - level++; - } - - return ret; - } - - // String - var pos = POS.test( selectors ) || typeof selectors !== "string" ? + var cur, + i = 0, + l = this.length, + ret = [], + pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? jQuery( selectors, context || this.context ) : 0; - for ( i = 0, l = this.length; i < l; i++ ) { - cur = this[i]; + for ( ; i < l; i++ ) { + for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { + // Always skip document fragments + if ( cur.nodeType < 11 && (pos ? + pos.index(cur) > -1 : - while ( cur ) { - if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { - ret.push( cur ); - break; + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector(cur, selectors)) ) { - } else { - cur = cur.parentNode; - if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) { - break; - } + cur = ret.push( cur ); + break; } } } - ret = ret.length > 1 ? jQuery.unique( ret ) : ret; - - return this.pushStack( ret, "closest", selectors ); + return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret ); }, // Determine the position of an element within @@ -5531,7 +5805,7 @@ jQuery.fn.extend({ // No argument, return index in parent if ( !elem ) { - return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1; + return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1; } // index in selector @@ -5551,20 +5825,22 @@ jQuery.fn.extend({ jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), all = jQuery.merge( this.get(), set ); - return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? - all : - jQuery.unique( all ) ); + return this.pushStack( jQuery.unique(all) ); }, - andSelf: function() { - return this.add( this.prevObject ); + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter(selector) + ); } }); -// A painfully simple check to see if an element is disconnected -// from a document (should be improved, where feasible). -function isDisconnected( node ) { - return !node || !node.parentNode || node.parentNode.nodeType === 11; +function sibling( cur, dir ) { + do { + cur = cur[ dir ]; + } while ( cur && cur.nodeType !== 1 ); + + return cur; } jQuery.each({ @@ -5579,10 +5855,10 @@ jQuery.each({ return jQuery.dir( elem, "parentNode", until ); }, next: function( elem ) { - return jQuery.nth( elem, 2, "nextSibling" ); + return sibling( elem, "nextSibling" ); }, prev: function( elem ) { - return jQuery.nth( elem, 2, "previousSibling" ); + return sibling( elem, "previousSibling" ); }, nextAll: function( elem ) { return jQuery.dir( elem, "nextSibling" ); @@ -5605,13 +5881,13 @@ jQuery.each({ contents: function( elem ) { return jQuery.nodeName( elem, "iframe" ) ? elem.contentDocument || elem.contentWindow.document : - jQuery.makeArray( elem.childNodes ); + jQuery.merge( [], elem.childNodes ); } }, function( name, fn ) { jQuery.fn[ name ] = function( until, selector ) { var ret = jQuery.map( this, fn, until ); - if ( !runtil.test( name ) ) { + if ( name.slice( -5 ) !== "Until" ) { selector = until; } @@ -5619,25 +5895,35 @@ jQuery.each({ ret = jQuery.filter( selector, ret ); } - ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret; + if ( this.length > 1 ) { + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + ret = jQuery.unique( ret ); + } - if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { - ret = ret.reverse(); + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + ret = ret.reverse(); + } } - return this.pushStack( ret, name, slice.call( arguments ).join(",") ); + return this.pushStack( ret ); }; }); jQuery.extend({ filter: function( expr, elems, not ) { + var elem = elems[ 0 ]; + if ( not ) { expr = ":not(" + expr + ")"; } - return elems.length === 1 ? - jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : - jQuery.find.matches(expr, elems); + return elems.length === 1 && elem.nodeType === 1 ? + jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : + jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + })); }, dir: function( elem, dir, until ) { @@ -5653,19 +5939,6 @@ jQuery.extend({ return matched; }, - nth: function( cur, result, dir, elem ) { - result = result || 1; - var num = 0; - - for ( ; cur; cur = cur[dir] ) { - if ( cur.nodeType === 1 && ++num === result ) { - break; - } - } - - return cur; - }, - sibling: function( n, elem ) { var r = []; @@ -5680,46 +5953,37 @@ jQuery.extend({ }); // Implement the identical functionality for filter and not -function winnow( elements, qualifier, keep ) { - - // Can't pass null or undefined to indexOf in Firefox 4 - // Set to 0 to skip string check - qualifier = qualifier || 0; - +function winnow( elements, qualifier, not ) { if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep(elements, function( elem, i ) { - var retVal = !!qualifier.call( elem, i, elem ); - return retVal === keep; + return jQuery.grep( elements, function( elem, i ) { + /* jshint -W018 */ + return !!qualifier.call( elem, i, elem ) !== not; }); - } else if ( qualifier.nodeType ) { - return jQuery.grep(elements, function( elem, i ) { - return ( elem === qualifier ) === keep; - }); + } - } else if ( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function( elem ) { - return elem.nodeType === 1; + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; }); + } + + if ( typeof qualifier === "string" ) { if ( isSimple.test( qualifier ) ) { - return jQuery.filter(qualifier, filtered, !keep); - } else { - qualifier = jQuery.filter( qualifier, filtered ); + return jQuery.filter( qualifier, elements, not ); } + + qualifier = jQuery.filter( qualifier, elements ); } - return jQuery.grep(elements, function( elem, i ) { - return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep; + return jQuery.grep( elements, function( elem ) { + return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not; }); } - - - - function createSafeFragment( document ) { var list = nodeNames.split( "|" ), - safeFrag = document.createDocumentFragment(); + safeFrag = document.createDocumentFragment(); if ( safeFrag.createElement ) { while ( list.length ) { @@ -5733,40 +5997,43 @@ function createSafeFragment( document ) { var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" + "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", - rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, + rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g, + rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"), rleadingWhitespace = /^\s+/, - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, rtagName = /<([\w:]+)/, rtbody = /]", "i"), + rnoInnerhtml = /<(?:script|style|link)/i, + manipulation_rcheckableType = /^(?:checkbox|radio)$/i, // checked="checked" or checked rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, - rscriptType = /\/(java|ecma)script/i, - rcleanScript = /^\s*\s*$/g, + + // We have to close these tags to support XHTML (#13200) wrapMap = { option: [ 1, "" ], legend: [ 1, "
              ", "
              " ], + area: [ 1, "", "" ], + param: [ 1, "", "" ], thead: [ 1, "", "
              " ], tr: [ 2, "", "
              " ], - td: [ 3, "", "
              " ], col: [ 2, "", "
              " ], - area: [ 1, "", "" ], - _default: [ 0, "", "" ] + td: [ 3, "", "
              " ], + + // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags, + // unless wrapped in a div with non-breaking characters in front of it. + _default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
              ", "
              " ] }, - safeFragment = createSafeFragment( document ); + safeFragment = createSafeFragment( document ), + fragmentDiv = safeFragment.appendChild( document.createElement("div") ); wrapMap.optgroup = wrapMap.option; wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; wrapMap.th = wrapMap.td; -// IE can't serialize and