diff --git a/ckan/authz.py b/ckan/authz.py index d77f91b887d..5fa6ad915ed 100644 --- a/ckan/authz.py +++ b/ckan/authz.py @@ -1,7 +1,6 @@ # encoding: utf-8 import sys -import re from logging import getLogger from ckan.common import config @@ -89,7 +88,7 @@ def _build(self): self._functions.update(fetched_auth_functions) _AuthFunctions = AuthFunctions() -#remove the class +# remove the class del AuthFunctions @@ -111,7 +110,8 @@ def is_sysadmin(username): def _get_user(username): - ''' Try to get the user from c, if possible, and fallback to using the DB ''' + '''Try to get the user from c, if possible, and fallback to using the DB + ''' if not username: return None # See if we can get the user without touching the DB @@ -148,11 +148,22 @@ def is_authorized(action, context, data_dict=None): if context.get('ignore_auth'): return {'success': True} + read_only = asbool(config.get('ckan.read_only', 'false')) + auth_function = _AuthFunctions.get(action) if auth_function: username = context.get('user') - user = _get_user(username) + if read_only: + # If the auth function has not been wrapped with a auth_read_safe + # decorator, we should deny it if read-only mode is on. + if not getattr(auth_function, 'auth_read_safe', False): + return { + 'success': False, + 'msg': 'Read-only mode is enabled.' + } + + user = _get_user(username) if user: # deleted users are always unauthorized if user.is_deleted(): @@ -169,10 +180,12 @@ def is_authorized(action, context, data_dict=None): # access straight away if not getattr(auth_function, 'auth_allow_anonymous_access', False) \ and not context.get('auth_user_obj'): - return {'success': False, - 'msg': '{0} requires an authenticated user' - .format(auth_function) - } + return { + 'success': False, + 'msg': '{0} requires an authenticated user'.format( + auth_function + ) + } return auth_function(context, data_dict) else: @@ -182,7 +195,13 @@ def is_authorized(action, context, data_dict=None): # these are the permissions that roles have ROLE_PERMISSIONS = OrderedDict([ ('admin', ['admin']), - ('editor', ['read', 'delete_dataset', 'create_dataset', 'update_dataset', 'manage_group']), + ('editor', [ + 'read', + 'delete_dataset', + 'create_dataset', + 'update_dataset', + 'manage_group' + ]), ('member', ['read', 'manage_group']), ]) @@ -253,7 +272,8 @@ def has_user_permission_for_group_or_org(group_id, user_name, permission): return True # Handle when permissions cascade. Check the user's roles on groups higher # in the group hierarchy for permission. - for capacity in check_config_permission('roles_that_cascade_to_sub_groups'): + for capacity in check_config_permission( + 'roles_that_cascade_to_sub_groups'): parent_groups = group.get_parent_group_hierarchy(type=group.type) group_ids = [group_.id for group_ in parent_groups] if _has_user_permission_for_groups(user_id, permission, group_ids, @@ -335,7 +355,7 @@ def has_user_permission_for_some_org(user_name, permission): # see if any of the groups are orgs q = model.Session.query(model.Group) \ - .filter(model.Group.is_organization == True) \ + .filter(model.Group.is_organization.is_(True)) \ .filter(model.Group.state == 'active') \ .filter(model.Group.id.in_(group_ids)) @@ -417,6 +437,7 @@ def auth_is_registered_user(): ''' return auth_is_loggedin_user() + def auth_is_loggedin_user(): ''' Do we have a logged in user ''' try: @@ -425,6 +446,7 @@ def auth_is_loggedin_user(): context_user = None return bool(context_user) + def auth_is_anon_user(context): ''' Is this an anonymous user? eg Not logged in if a web request and not user defined in context diff --git a/ckan/config/environment.py b/ckan/config/environment.py index 14486378322..07a0870c0c4 100644 --- a/ckan/config/environment.py +++ b/ckan/config/environment.py @@ -2,11 +2,16 @@ '''CKAN environment configuration''' import os +import tempfile +import atexit +import shutil +from functools import partial import logging import warnings from urlparse import urlparse import pytz +import jinja2 import sqlalchemy from pylons import config as pylons_config import formencode @@ -230,17 +235,32 @@ def update_config(): logging.getLogger("MARKDOWN").setLevel(logging.getLogger().level) # Create Jinja2 environment + cache_dir = config.get('jinja2_cache_dir', None) + if not cache_dir: + cache_dir = tempfile.mkdtemp() + config['jinja2_cache_dir'] = cache_dir + atexit.register(partial(shutil.rmtree, cache_dir)) + elif not os.path.exists(cache_dir): + os.makedirs(cache_dir) env = jinja_extensions.Environment( loader=jinja_extensions.CkanFileSystemLoader(template_paths), autoescape=True, - extensions=['jinja2.ext.do', 'jinja2.ext.with_', - jinja_extensions.SnippetExtension, - jinja_extensions.CkanExtend, - jinja_extensions.CkanInternationalizationExtension, - jinja_extensions.LinkForExtension, - jinja_extensions.ResourceExtension, - jinja_extensions.UrlForStaticExtension, - jinja_extensions.UrlForExtension] + auto_reload=False, + extensions=[ + 'jinja2.ext.do', + 'jinja2.ext.with_', + 'jinja2.ext.InternationalizationExtension', + jinja_extensions.SnippetExtension, + jinja_extensions.CkanExtend, + jinja_extensions.LinkForExtension, + jinja_extensions.ResourceExtension, + jinja_extensions.UrlForStaticExtension, + jinja_extensions.UrlForExtension + ], + # The pre-2.8 default was only 50, the post-2.8 default is 400. + cache_size=400, + + bytecode_cache=jinja2.FileSystemBytecodeCache(cache_dir) ) env.install_gettext_callables(_, ungettext, newstyle=True) # custom filters diff --git a/ckan/config/routing.py b/ckan/config/routing.py index 03aa50f625b..b8e28f62b42 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -240,16 +240,16 @@ def make_map(): 'api_data', ]))) m.connect('dataset_edit', '/dataset/edit/{id}', action='edit', - ckan_icon='edit') + ckan_icon='pencil-square-o') m.connect('dataset_followers', '/dataset/followers/{id}', - action='followers', ckan_icon='group') + action='followers', ckan_icon='users') m.connect('dataset_activity', '/dataset/activity/{id}', - action='activity', ckan_icon='time') + action='activity', ckan_icon='clock-o') m.connect('/dataset/activity/{id}/{offset}', action='activity') m.connect('dataset_groups', '/dataset/groups/{id}', - action='groups', ckan_icon='group') + action='groups', ckan_icon='users') m.connect('dataset_resources', '/dataset/resources/{id}', - action='resources', ckan_icon='reorder') + action='resources', ckan_icon='bars') m.connect('dataset_read', '/dataset/{id}', action='read', ckan_icon='sitemap') m.connect('/dataset/{id}/resource/{resource_id}', @@ -257,7 +257,7 @@ def make_map(): m.connect('/dataset/{id}/resource_delete/{resource_id}', action='resource_delete') m.connect('resource_edit', '/dataset/{id}/resource_edit/{resource_id}', - action='resource_edit', ckan_icon='edit') + action='resource_edit', ckan_icon='pencil-square-o') m.connect('/dataset/{id}/resource/{resource_id}/download', action='resource_download') m.connect('/dataset/{id}/resource/{resource_id}/download/{filename}', @@ -270,12 +270,12 @@ def make_map(): m.connect('/dataset/{id}/resource/{resource_id}/preview', action='resource_datapreview') m.connect('views', '/dataset/{id}/resource/{resource_id}/views', - action='resource_views', ckan_icon='reorder') + action='resource_views', ckan_icon='bars') m.connect('new_view', '/dataset/{id}/resource/{resource_id}/new_view', - action='edit_view', ckan_icon='edit') + action='edit_view', ckan_icon='pencil-square-o') m.connect('edit_view', '/dataset/{id}/resource/{resource_id}/edit_view/{view_id}', - action='edit_view', ckan_icon='edit') + action='edit_view', ckan_icon='pencil-square-o') m.connect('resource_view', '/dataset/{id}/resource/{resource_id}/view/{view_id}', action='resource_view') @@ -307,13 +307,13 @@ def make_map(): 'activity', ]))) m.connect('group_about', '/group/about/{id}', action='about', - ckan_icon='info-sign'), + ckan_icon='info-circle'), m.connect('group_edit', '/group/edit/{id}', action='edit', - ckan_icon='edit') + ckan_icon='pencil-square-o') m.connect('group_members', '/group/members/{id}', action='members', - ckan_icon='group'), + ckan_icon='users'), m.connect('group_activity', '/group/activity/{id}/{offset}', - action='activity', ckan_icon='time'), + action='activity', ckan_icon='clock-o'), m.connect('group_read', '/group/{id}', action='read', ckan_icon='sitemap') @@ -331,16 +331,16 @@ def make_map(): 'history' ]))) m.connect('organization_activity', '/organization/activity/{id}/{offset}', - action='activity', ckan_icon='time') + action='activity', ckan_icon='clock-o') m.connect('organization_read', '/organization/{id}', action='read') m.connect('organization_about', '/organization/about/{id}', - action='about', ckan_icon='info-sign') + action='about', ckan_icon='info-circle') m.connect('organization_read', '/organization/{id}', action='read', ckan_icon='sitemap') m.connect('organization_edit', '/organization/edit/{id}', - action='edit', ckan_icon='edit') + action='edit', ckan_icon='pencil-square-o') m.connect('organization_members', '/organization/members/{id}', - action='members', ckan_icon='group') + action='members', ckan_icon='users') m.connect('organization_bulk_process', '/organization/bulk_process/{id}', action='bulk_process', ckan_icon='sitemap') @@ -364,20 +364,20 @@ def make_map(): m.connect('user_generate_apikey', '/user/generate_key/{id}', action='generate_apikey') m.connect('/user/activity/{id}/{offset}', action='activity') m.connect('user_activity_stream', '/user/activity/{id}', - action='activity', ckan_icon='time') + action='activity', ckan_icon='clock-o') 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') + action='dashboard_groups', ckan_icon='users') m.connect('user_dashboard_organizations', '/dashboard/organizations', - action='dashboard_organizations', ckan_icon='building') + action='dashboard_organizations', ckan_icon='building-o') 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:.*}', - action='followers', ckan_icon='group') + action='followers', ckan_icon='users') m.connect('user_edit', '/user/edit/{id:.*}', action='edit', ckan_icon='cog') m.connect('user_delete', '/user/delete/{id}', action='delete') @@ -395,13 +395,6 @@ def make_map(): ckan_icon='sitemap') m.connect('user_index', '/user', action='index') - with SubMapper(map, controller='revision') as m: - m.connect('/revision', action='index') - m.connect('/revision/edit/{id}', action='edit') - m.connect('/revision/diff/{id}', action='diff') - m.connect('/revision/list', action='list') - m.connect('/revision/{id}', action='read') - # feeds with SubMapper(map, controller='feed') as m: m.connect('/feeds/group/{id}.atom', action='group') @@ -411,11 +404,11 @@ def make_map(): m.connect('/feeds/custom.atom', action='custom') map.connect('ckanadmin_index', '/ckan-admin', controller='admin', - action='index', ckan_icon='legal') + action='index', ckan_icon='gavel') map.connect('ckanadmin_config', '/ckan-admin/config', controller='admin', - action='config', ckan_icon='check') + action='config', ckan_icon='check-square-o') map.connect('ckanadmin_trash', '/ckan-admin/trash', controller='admin', - action='trash', ckan_icon='trash') + action='trash', ckan_icon='trash-o') map.connect('ckanadmin', '/ckan-admin/{action}', controller='admin') with SubMapper(map, controller='ckan.controllers.storage:StorageController') as m: diff --git a/ckan/config/solr/schema.xml b/ckan/config/solr/schema.xml index e8893f70ff9..409b6fa957f 100644 --- a/ckan/config/solr/schema.xml +++ b/ckan/config/solr/schema.xml @@ -118,6 +118,10 @@ schema. In this case the version should be set to the next CKAN version number. + + + + diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py index b0949e3bbeb..580e7a0d190 100644 --- a/ckan/controllers/group.py +++ b/ckan/controllers/group.py @@ -295,20 +295,45 @@ def pager_url(q=None, page=None): try: c.fields = [] - c.fields_grouped = {} search_extras = {} - for (param, value) in request.params.items(): - if not param in ['q', 'page', 'sort'] \ - and len(value) and not param.startswith('_'): - if not param.startswith('ext_'): - c.fields.append((param, value)) - q += ' %s: "%s"' % (param, value) - if param not in c.fields_grouped: - c.fields_grouped[param] = [value] - else: - c.fields_grouped[param].append(value) + c.fields_grouped = {} + fq_list = [] + query_params = request.params.mixed() + for (param, value) in query_params.iteritems(): + if param in ('q', 'page', 'sort') or not value: + continue + elif param.startswith('_'): + continue + elif param.startswith('ext_'): + search_extras[param] = value + else: + if isinstance(value, (list, tuple)): + c.fields.extend((param, v) for v in value) + # We're filtering on a list of items, each of which + # should be escaped and OR'd instead of Solr's default + # AND. + filter_value = u'({0})'.format( + u' OR '.join(u'"{0}"'.format( + v + ) for v in value) + ) else: - search_extras[param] = value + c.fields.append((param, value)) + # We're just filtering on a single item, which might be + # a range. We assume it's a range if it starts with a + # [, otherwise we escape it and treat it as a literal. + filter_value = ( + value if value.startswith(u'[') + else u'"{0}"'.format(value) + ) + + # Tag each value with a domain so we can act on it later. + fq_list.append(u'{{!tag={p}}}{p}:{v}'.format( + p=param, + v=filter_value + )) + + c.fields_grouped.setdefault(param, []).append(value) include_private = False user_member_of_orgs = [org['id'] for org @@ -342,9 +367,15 @@ def pager_url(q=None, page=None): data_dict = { 'q': q, - 'fq': '', + 'fq': fq, 'include_private': include_private, - 'facet.field': facets.keys(), + 'fq_list': fq_list, + 'facet.field': [ + # When faceting, exclude the facet group from the facet + # counts. This lets us always get a count back, rather than + # an intersection (which would always be 0) + '{{!ex={k}}}{k}'.format(k=k) for k in facets.iterkeys() + ], 'rows': limit, 'sort': sort_by, 'start': (page - 1) * limit, @@ -856,18 +887,23 @@ def activity(self, id, offset=0): except (NotFound, NotAuthorized): abort(404, _('Group not found')) - try: - # Add the group's activity stream (already rendered to HTML) to the - # template context for the group/read.html - # template to retrieve later. - c.group_activity_stream = self._action('group_activity_list_html')( - context, {'id': c.group_dict['id'], 'offset': offset}) - - except ValidationError as error: - base.abort(400) - - return render(self._activity_template(group_type), - extra_vars={'group_type': group_type}) + activity_action = 'group_activity_list' + if 'organization' in self.group_types: + activity_action = 'organization_activity_list' + + return render( + self._activity_template(group_type), + extra_vars={ + 'group_type': group_type, + 'activity_stream': get_action(activity_action)( + context, + { + 'id': c.group_dict['id'], + 'offset': offset + } + ) + } + ) def follow(self, id): '''Start following this group.''' diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index ee3d5b08ae2..7f267306434 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -1,8 +1,8 @@ # encoding: utf-8 +import time import logging from urllib import urlencode -import datetime import mimetypes import cgi @@ -13,7 +13,6 @@ import ckan.logic as logic import ckan.lib.base as base import ckan.lib.maintain as maintain -import ckan.lib.i18n as i18n import ckan.lib.navl.dictization_functions as dict_fns import ckan.lib.helpers as h import ckan.model as model @@ -57,7 +56,7 @@ def url_with_params(url, params): def search_url(params, package_type=None): if not package_type or package_type == 'dataset': - url = h.url_for(controller='package', action='search') + url = h.url_for(controller=c.controller, action='search') else: url = h.url_for('{0}_search'.format(package_type)) return url_with_params(url, params) @@ -207,33 +206,68 @@ def pager_url(q=None, page=None): # a list of values eg {'tags':['tag1', 'tag2']} c.fields_grouped = {} search_extras = {} - fq = '' - for (param, value) in request.params.items(): - if param not in ['q', 'page', 'sort'] \ - and len(value) and not param.startswith('_'): - if not param.startswith('ext_'): - c.fields.append((param, value)) - fq += ' %s:"%s"' % (param, value) - if param not in c.fields_grouped: - c.fields_grouped[param] = [value] - else: - c.fields_grouped[param].append(value) + fq = [] + fq_list = [] + # FIXME: This seems moderately insane - it treats *every* argument + # to the URL as a fq filter. We should have more knowledge of what + # we expect to see passed in, no need to guess. + query_params = request.params.mixed() + for param, value in query_params.iteritems(): + if param in ('q', 'page', 'sort') or not value: + continue + elif param.startswith('_'): + continue + elif param.startswith('ext_'): + search_extras[param] = value + else: + if isinstance(value, (list, tuple)): + c.fields.extend((param, v) for v in value) + # We're filtering on a list of items, each of which + # should be escaped and OR'd instead of Solr's default + # AND. + filter_value = u'({0})'.format( + u' OR '.join(u'"{0}"'.format( + v + ) for v in value) + ) else: - search_extras[param] = value - - context = {'model': model, 'session': model.Session, - 'user': c.user, 'for_view': True, - 'auth_user_obj': c.userobj} + c.fields.append((param, value)) + # We're just filtering on a single item, which might be + # a range. We assume it's a range if it starts with a + # [, otherwise we escape it and treat it as a literal. + filter_value = ( + value if value.startswith(u'[') + else u'"{0}"'.format(value) + ) + + # Tag each value with a domain so we can act on it later. + fq_list.append(u'{{!tag={p}}}{p}:{v}'.format( + p=param, + v=filter_value + )) + + c.fields_grouped.setdefault(param, []).append(value) + + context = { + 'model': model, + 'session': model.Session, + 'user': c.user, + 'for_view': True, + 'auth_user_obj': c.userobj + } if package_type and package_type != 'dataset': # Only show datasets of this particular type - fq += ' +dataset_type:{type}'.format(type=package_type) + fq.append('+dataset_type:{type}'.format(type=package_type)) else: # Unless changed via config options, don't show non standard # dataset types on the default search page - if not asbool( - config.get('ckan.search.show_all_types', 'False')): - fq += ' +dataset_type:dataset' + show_all_types = config.get( + 'ckan.search.show_all_types', + 'False' + ) + if not asbool(show_all_types): + fq.append('+dataset_type:dataset') facets = OrderedDict() @@ -243,7 +277,7 @@ def pager_url(q=None, page=None): 'tags': _('Tags'), 'res_format': _('Formats'), 'license_id': _('Licenses'), - } + } for facet in g.facets: if facet in default_facet_titles: @@ -259,8 +293,14 @@ def pager_url(q=None, page=None): data_dict = { 'q': q, - 'fq': fq.strip(), - 'facet.field': facets.keys(), + 'fq': ' '.join(fq), + 'fq_list': fq_list, + 'facet.field': [ + # When faceting, exclude the facet group from the facet + # counts. This lets us always get a count back, rather than + # an intersection (which would always be 0) + '{{!ex={k}}}{k}'.format(k=k) for k in facets.iterkeys() + ], 'rows': limit, 'start': (page - 1) * limit, 'sort': sort_by, @@ -281,6 +321,7 @@ def pager_url(q=None, page=None): ) c.facets = query['facets'] c.search_facets = query['search_facets'] + c.facet_ranges = query['facet_ranges'] c.page.items = query['results'] except SearchQueryError, se: # User's search parameters are invalid, in such a way that is not @@ -350,31 +391,38 @@ def read(self, id): 'user': c.user, 'for_view': True, 'auth_user_obj': c.userobj} data_dict = {'id': id, 'include_tracking': True} - - # interpret @ or @ suffix - split = id.split('@') - if len(split) == 2: - data_dict['id'], revision_ref = split - if model.is_id(revision_ref): - context['revision_id'] = revision_ref - else: - try: - date = h.date_str_to_datetime(revision_ref) - context['revision_date'] = date - except TypeError, e: - abort(400, _('Invalid revision format: %r') % e.args) - except ValueError, e: - abort(400, _('Invalid revision format: %r') % e.args) - elif len(split) > 2: - abort(400, _('Invalid revision format: %r') % - 'Too many "@" symbols') + activity_id = request.params.get('activity_id') # check if package exists try: c.pkg_dict = get_action('package_show')(context, data_dict) c.pkg = context['package'] - except (NotFound, NotAuthorized): + + if activity_id: + c.pkg_dict = context['session'].query(model.Activity).get( + activity_id + ).data['package'] + # Don't crash on old activity records, which do not include + # resources or extras. + c.pkg_dict.setdefault('resources', []) + c.is_activity_archive = True + except NotFound: abort(404, _('Dataset not found')) + except NotAuthorized: + tmp_context = context.copy() + tmp_context['ignore_auth'] = True + + pkg = get_action('package_show')(tmp_context, data_dict) + if pkg['state'] == 'deleted': + # We're not authorized because this dataset has been deleted + # and we're not allowed to see deleted packages. Instead of + # 404ing as in core CKAN we display a "Dataset Deleted" page. + return render('package/deleted.html', extra_vars={ + 'created': pkg['metadata_created'], + 'modified': pkg['metadata_modified'], + 'organization': pkg.get('organization', {}).get('title'), + 'site_url': config.get('ckan.site_url') + }) # used by disqus plugin c.current_package_id = c.pkg.id @@ -395,8 +443,12 @@ def read(self, id): template = self._read_template(package_type) try: - return render(template, - extra_vars={'dataset_type': package_type}) + return render( + template, + extra_vars={ + 'dataset_type': package_type + } + ) except ckan.lib.render.TemplateNotFound: msg = _("Viewing {package_type} datasets in {format} format is " "not supported (template file {file} not found).".format( @@ -407,87 +459,7 @@ def read(self, id): assert False, "We should never get here" def history(self, id): - - if 'diff' in request.params or 'selected1' in request.params: - try: - params = {'id': request.params.getone('pkg_name'), - 'diff': request.params.getone('selected1'), - 'oldid': request.params.getone('selected2'), - } - except KeyError: - if 'pkg_name' in dict(request.params): - id = request.params.getone('pkg_name') - c.error = \ - _('Select two revisions before doing the comparison.') - else: - params['diff_entity'] = 'package' - h.redirect_to(controller='revision', action='diff', **params) - - context = {'model': model, 'session': model.Session, - 'user': c.user, 'auth_user_obj': c.userobj, - 'for_view': True} - data_dict = {'id': id} - try: - c.pkg_dict = get_action('package_show')(context, data_dict) - c.pkg_revisions = get_action('package_revision_list')(context, - data_dict) - # TODO: remove - # Still necessary for the authz check in group/layout.html - c.pkg = context['package'] - - except NotAuthorized: - abort(403, _('Unauthorized to read package %s') % '') - except NotFound: - abort(404, _('Dataset not found')) - - format = request.params.get('format', '') - if format == 'atom': - # Generate and return Atom 1.0 document. - from webhelpers.feedgenerator import Atom1Feed - feed = Atom1Feed( - title=_(u'CKAN Dataset Revision History'), - link=h.url_for(controller='revision', action='read', - id=c.pkg_dict['name']), - description=_(u'Recent changes to CKAN Dataset: ') + - (c.pkg_dict['title'] or ''), - language=unicode(i18n.get_lang()), - ) - for revision_dict in c.pkg_revisions: - revision_date = h.date_str_to_datetime( - revision_dict['timestamp']) - try: - dayHorizon = int(request.params.get('days')) - except: - dayHorizon = 30 - dayAge = (datetime.datetime.now() - revision_date).days - if dayAge >= dayHorizon: - break - if revision_dict['message']: - item_title = u'%s' % revision_dict['message'].\ - split('\n')[0] - else: - item_title = u'%s' % revision_dict['id'] - item_link = h.url_for(controller='revision', action='read', - id=revision_dict['id']) - item_description = _('Log message: ') - item_description += '%s' % (revision_dict['message'] or '') - item_author_name = revision_dict['author'] - item_pubdate = revision_date - feed.add_item( - title=item_title, - link=item_link, - description=item_description, - author_name=item_author_name, - pubdate=item_pubdate, - ) - response.headers['Content-Type'] = 'application/atom+xml' - return feed.writeString('utf-8') - - package_type = c.pkg_dict['type'] or 'dataset' - - return render( - self._history_template(c.pkg_dict.get('type', package_type)), - extra_vars={'dataset_type': package_type}) + h.redirect_to(controller='package', action='activity', id=id) def new(self, data=None, errors=None, error_summary=None): if data and 'type' in data: @@ -635,8 +607,8 @@ def new_resource(self, id, data=None, errors=None, error_summary=None): # see if we have any data that we are trying to save data_provided = False for key, value in data.iteritems(): - if ((value or isinstance(value, cgi.FieldStorage)) - and key != 'resource_type'): + if ((value or isinstance(value, cgi.FieldStorage)) and + key != 'resource_type'): data_provided = True break @@ -681,6 +653,10 @@ def new_resource(self, id, data=None, errors=None, error_summary=None): get_action('resource_update')(context, data) else: get_action('resource_create')(context, data) + if not data['resource_type']: + h.flash_success(_('A related item has been added')) + else: + h.flash_success(_('A resource has been added')) except ValidationError, e: errors = e.error_dict error_summary = e.error_summary @@ -706,6 +682,9 @@ def new_resource(self, id, data=None, errors=None, error_summary=None): # go to first stage of add dataset redirect(h.url_for(controller='package', action='read', id=id)) + elif save_action == 'go-dataset-search': + redirect(h.url_for(controller='package', + action='search')) else: # add more resources redirect(h.url_for(controller='package', @@ -1161,7 +1140,7 @@ def resource_download(self, id, resource_id, filename=None): response.headers['Content-Type'] = content_type response.status = status return app_iter - elif not 'url' in rsc: + elif 'url' not in rsc: abort(404, _('No download is available')) redirect(rsc['url']) @@ -1177,8 +1156,7 @@ def follow(self, id): h.flash_success(_("You are now following {0}").format( package_dict['title'])) except ValidationError as e: - error_message = (e.message or e.error_summary - or e.error_dict) + error_message = (e.message or e.error_summary or e.error_dict) h.flash_error(error_message) except NotAuthorized as e: h.flash_error(e.message) @@ -1196,8 +1174,7 @@ def unfollow(self, id): h.flash_success(_("You are no longer following {0}").format( package_dict['title'])) except ValidationError as e: - error_message = (e.message or e.error_summary - or e.error_dict) + error_message = (e.message or e.error_summary or e.error_dict) h.flash_error(error_message) except (NotFound, NotAuthorized) as e: error_message = e.message @@ -1283,27 +1260,47 @@ def groups(self, id): return render('package/group_list.html', {'dataset_type': dataset_type}) - def activity(self, id): + def activity(self, id, offset=None): '''Render this package's public activity stream page.''' - context = {'model': model, 'session': model.Session, - 'user': c.user, 'for_view': True, - 'auth_user_obj': c.userobj} - data_dict = {'id': id} + context = { + 'model': model, + 'session': model.Session, + 'user': c.user, + 'for_view': True, + 'auth_user_obj': c.userobj + } + try: - c.pkg_dict = get_action('package_show')(context, data_dict) - c.pkg = context['package'] - c.package_activity_stream = get_action( - 'package_activity_list_html')( - context, {'id': c.pkg_dict['id']}) + c.pkg_dict = get_action('package_show')(context, { + 'id': id + }) dataset_type = c.pkg_dict['type'] or 'dataset' except NotFound: abort(404, _('Dataset not found')) except NotAuthorized: abort(403, _('Unauthorized to read dataset %s') % id) - return render('package/activity.html', - {'dataset_type': dataset_type}) + # FIXME: Temporary patch until activity refactor. + limit = int(config.get('ckan.activity_list_limit', 31)) + + return render( + 'package/activity.html', + extra_vars={ + 'dataset_type': dataset_type, + 'activity_stream': get_action('package_activity_list')( + context, + { + 'id': id, + 'offset': offset, + 'limit': limit + } + ), + 'limit': limit, + 'ts': lambda t: int(time.mktime(t.timetuple())), + 'offset': offset + } + ) def resource_embedded_dataviewer(self, id, resource_id, width=500, height=500): @@ -1465,7 +1462,7 @@ def edit_view(self, id, resource_id, view_id=None): else: data = get_action('resource_view_create')(context, data) except ValidationError, e: - ## Could break preview if validation error + # Could break preview if validation error to_preview = False errors = e.error_dict error_summary = e.error_summary @@ -1479,14 +1476,14 @@ def edit_view(self, id, resource_id, view_id=None): action='resource_views', id=id, resource_id=resource_id)) - ## view_id exists only when updating + # view_id exists only when updating if view_id: try: old_data = get_action('resource_view_show')(context, {'id': view_id}) data = data or old_data view_type = old_data.get('view_type') - ## might as well preview when loading good existing view + # might as well preview when loading good existing view if not errors: to_preview = True except (NotFound, NotAuthorized): diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py index ebc305d19f0..1a84d7dcabf 100644 --- a/ckan/controllers/user.py +++ b/ckan/controllers/user.py @@ -1,7 +1,6 @@ # encoding: utf-8 import logging -from urllib import quote from ckan.common import config from paste.deploy.converters import asbool @@ -18,7 +17,7 @@ import ckan.lib.authenticator as authenticator import ckan.plugins as p -from ckan.common import _, c, g, request, response +from ckan.common import _, c, request, response log = logging.getLogger(__name__) @@ -37,6 +36,10 @@ unflatten = dictization_functions.unflatten +def require_sudo_mode(): + pass + + def set_repoze_user(user_id): '''Set the repoze.who cookie to match a given user_id''' if 'repoze.who.plugins' in request.environ: @@ -57,7 +60,6 @@ def __before__(self, action, **env): if c.action not in ('login', 'request_reset', 'perform_reset',): abort(403, _('Not authorized to see this page')) - ## hooks for subclasses new_user_form = 'user/new_user_form.html' edit_user_form = 'user/edit_user_form.html' @@ -88,8 +90,6 @@ def _setup_template_variables(self, context, data_dict): c.is_myself = user_dict['name'] == c.user c.about_formatted = h.render_markdown(user_dict['about']) - ## end hooks - def _get_repoze_handler(self, handler_name): '''Returns the URL that repoze.who will respond to and perform a login or logout.''' @@ -136,20 +136,13 @@ def read(self, id=None): 'include_num_followers': True} self._setup_template_variables(context, data_dict) - - # The legacy templates have the user's activity stream on the user - # profile page, new templates do not. - if asbool(config.get('ckan.legacy_templates', False)): - c.user_activity_stream = get_action('user_activity_list_html')( - context, {'id': c.user_dict['id']}) - return render('user/read.html') def me(self, locale=None): if not c.user: h.redirect_to(locale=locale, controller='user', action='login', id=None) - user_ref = c.userobj.get_reference_preferred_for_uri() + h.redirect_to(locale=locale, controller='user', action='dashboard') def register(self, data=None, errors=None, error_summary=None): @@ -240,7 +233,7 @@ def _save_new(self, context): logic.tuplize_dict(logic.parse_params(request.params)))) context['message'] = data_dict.get('log_message', '') captcha.check_recaptcha(request) - user = get_action('user_create')(context, data_dict) + get_action('user_create')(context, data_dict) except NotAuthorized: abort(403, _('Unauthorized to create user %s') % '') except NotFound, e: @@ -275,16 +268,21 @@ def _save_new(self, context): return render('user/logout_first.html') def edit(self, id=None, data=None, errors=None, error_summary=None): - context = {'save': 'save' in request.params, - 'schema': self._edit_form_to_db_schema(), - 'model': model, 'session': model.Session, - 'user': c.user, 'auth_user_obj': c.userobj - } + context = { + 'save': 'save' in request.params, + 'schema': self._edit_form_to_db_schema(), + 'model': model, + 'session': model.Session, + 'user': c.user, + 'auth_user_obj': c.userobj + } + if id is None: if c.userobj: id = c.userobj.id else: abort(400, _('No user specified')) + data_dict = {'id': id} try: @@ -292,6 +290,8 @@ def edit(self, id=None, data=None, errors=None, error_summary=None): except NotAuthorized: abort(403, _('Unauthorized to edit a user.')) + require_sudo_mode() + if (context['save']) and not data: return self._save_edit(id, context) @@ -321,7 +321,12 @@ def edit(self, id=None, data=None, errors=None, error_summary=None): (str(c.user), id)) errors = errors or {} - vars = {'data': data, 'errors': errors, 'error_summary': error_summary} + vars = { + 'data': data, + 'errors': errors, + 'error_summary': error_summary, + 'is_sysadmin': authz.is_sysadmin(c.user) + } self._setup_template_variables({'model': model, 'session': model.Session, @@ -408,7 +413,7 @@ def login(self, error=None): vars = {} return render('user/login.html', extra_vars=vars) else: - return render('user/logout_first.html') + return h.redirect_to(controller='user', action='logged_in') def logged_in(self): # redirect if needed @@ -420,7 +425,7 @@ def logged_in(self): context = None data_dict = {'id': c.user} - user_dict = get_action('user_show')(context, data_dict) + get_action('user_show')(context, data_dict) return self.me() else: @@ -469,7 +474,7 @@ def request_reset(self): data_dict = {'id': id} user_obj = None try: - user_dict = get_action('user_show')(context, data_dict) + get_action('user_show')(context, data_dict) user_obj = context['user_obj'] except NotFound: # Try searching the user @@ -484,7 +489,7 @@ def request_reset(self): # and user_list does not return them del data_dict['q'] data_dict['id'] = user_list[0]['id'] - user_dict = get_action('user_show')(context, data_dict) + get_action('user_show')(context, data_dict) user_obj = context['user_obj'] elif len(user_list) > 1: h.flash_error(_('"%s" matched several users') % (id)) @@ -531,11 +536,15 @@ def perform_reset(self, id): if request.method == 'POST': try: context['reset_password'] = True + user_state = user_dict['state'] new_password = self._get_form_password() - user_dict['password'] = new_password + username = request.params.get('name') + if (username is not None and username != ''): + user_dict['name'] = username user_dict['reset_key'] = c.reset_key user_dict['state'] = model.State.ACTIVE - user = get_action('user_update')(context, user_dict) + user_dict['password'] = new_password + get_action('user_update')(context, user_dict) mailer.create_reset_key(user_obj) h.flash_success(_("Your password has been reset.")) @@ -550,6 +559,7 @@ def perform_reset(self, id): h.flash_error(u'%r' % e.error_dict) except ValueError, ve: h.flash_error(unicode(ve)) + user_dict['state'] = user_state c.user_dict = user_dict return render('user/perform_reset.html') @@ -595,13 +605,18 @@ def activity(self, id, offset=0): self._setup_template_variables(context, data_dict) - try: - c.user_activity_stream = get_action('user_activity_list_html')( - context, {'id': c.user_dict['id'], 'offset': offset}) - except ValidationError: - base.abort(400) - - return render('user/activity_stream.html') + return render( + 'user/activity_stream.html', + extra_vars={ + 'activity_stream': get_action('user_activity_list')( + context, + { + 'id': id, + 'offset': offset + } + ) + } + ) def _get_dashboard_context(self, filter_type=None, filter_id=None, q=None): '''Return a dict needed by the dashboard view to determine context.''' @@ -668,10 +683,19 @@ def dashboard(self, id=None, offset=0): filter_id = request.params.get('name', u'') c.followee_list = get_action('followee_list')( - context, {'id': c.userobj.id, 'q': q}) + context, + { + 'id': c.userobj.id, + 'q': q + } + ) + c.dashboard_activity_stream_context = self._get_dashboard_context( - filter_type, filter_id, q) - c.dashboard_activity_stream = h.dashboard_activity_stream( + filter_type, + filter_id, + q + ) + dashboard_activity_stream = h.dashboard_activity_stream( c.userobj.id, filter_type, filter_id, offset ) @@ -679,7 +703,9 @@ def dashboard(self, id=None, offset=0): # dashboard page. get_action('dashboard_mark_activities_old')(context, {}) - return render('user/dashboard.html') + return render('user/dashboard.html', extra_vars={ + 'activity_stream': dashboard_activity_stream + }) def dashboard_datasets(self): context = {'for_view': True, 'user': c.user, @@ -715,8 +741,7 @@ def follow(self, id): h.flash_success(_("You are now following {0}").format( user_dict['display_name'])) except ValidationError as e: - error_message = (e.message or e.error_summary - or e.error_dict) + error_message = (e.message or e.error_summary or e.error_dict) h.flash_error(error_message) except NotAuthorized as e: h.flash_error(e.message) @@ -738,7 +763,6 @@ def unfollow(self, id): error_message = e.message h.flash_error(error_message) except ValidationError as e: - error_message = (e.error_summary or e.message - or e.error_dict) + error_message = (e.error_summary or e.message or e.error_dict) h.flash_error(error_message) h.redirect_to(controller='user', action='read', id=id) diff --git a/ckan/lib/activity_streams.py b/ckan/lib/activity_streams.py index e5807b2cc3e..103d016d008 100644 --- a/ckan/lib/activity_streams.py +++ b/ckan/lib/activity_streams.py @@ -165,18 +165,18 @@ def activity_stream_string_follow_group(context, activity): # A dictionary mapping activity types to the icons associated to them activity_stream_string_icons = { 'added tag': 'tag', - 'changed group': 'group', + 'changed group': 'users', 'changed package': 'sitemap', - 'changed package_extra': 'edit', + 'changed package_extra': 'pencil-square-o', 'changed resource': 'file', 'changed user': 'user', - 'deleted group': 'group', + 'deleted group': 'users', 'deleted package': 'sitemap', - 'deleted package_extra': 'edit', + 'deleted package_extra': 'pencil-square-o', 'deleted resource': 'file', - 'new group': 'group', + 'new group': 'users', 'new package': 'sitemap', - 'new package_extra': 'edit', + 'new package_extra': 'pencil-square-o', 'new resource': 'file', 'new user': 'user', 'removed tag': 'tag', diff --git a/ckan/lib/base.py b/ckan/lib/base.py index 3334a662599..dede0a2b00e 100644 --- a/ckan/lib/base.py +++ b/ckan/lib/base.py @@ -94,90 +94,15 @@ def render(template_name, extra_vars=None, cache_key=None, cache_type=None, .. todo:: Document the parameters of :py:func:`ckan.plugins.toolkit.render`. - ''' - def render_template(): - globs = extra_vars or {} - globs.update(pylons_globals()) - # Using pylons.url() directly destroys the localisation stuff so - # we remove it so any bad templates crash and burn - del globs['url'] + extras = extra_vars or {} + extras.update(pylons_globals()) - try: - template_path, template_type = render_.template_info(template_name) - except render_.TemplateNotFound: - raise - - log.debug('rendering %s [%s]' % (template_path, template_type)) - if config.get('debug'): - context_vars = globs.get('c') - if context_vars: - context_vars = dir(context_vars) - debug_info = {'template_name': template_name, - 'template_path': template_path, - 'template_type': template_type, - 'vars': globs, - 'c_vars': context_vars, - 'renderer': renderer} - if 'CKAN_DEBUG_INFO' not in request.environ: - request.environ['CKAN_DEBUG_INFO'] = [] - request.environ['CKAN_DEBUG_INFO'].append(debug_info) - - del globs['config'] - return render_jinja2(template_name, globs) - - if 'Pragma' in response.headers: - del response.headers["Pragma"] - - ## Caching Logic - allow_cache = True - # Force cache or not if explicit. - if cache_force is not None: - allow_cache = cache_force - # Do not allow caching of pages for logged in users/flash messages etc. - elif session.last_accessed: - allow_cache = False - # Tests etc. - elif 'REMOTE_USER' in request.environ: - allow_cache = False - # Don't cache if based on a non-cachable template used in this. - elif request.environ.get('__no_cache__'): - allow_cache = False - # Don't cache if we have set the __no_cache__ param in the query string. - elif request.params.get('__no_cache__'): - allow_cache = False - # Don't cache if we have extra vars containing data. - elif extra_vars: - for k, v in extra_vars.iteritems(): - allow_cache = False - break - # Record cachability for the page cache if enabled - request.environ['CKAN_PAGE_CACHABLE'] = allow_cache - - if allow_cache: - response.headers["Cache-Control"] = "public" - try: - cache_expire = int(config.get('ckan.cache_expires', 0)) - response.headers["Cache-Control"] += \ - ", max-age=%s, must-revalidate" % cache_expire - except ValueError: - pass - else: - # We do not want caching. - response.headers["Cache-Control"] = "private" - # Prevent any further rendering from being cached. - request.environ['__no_cache__'] = True - - # Render Time :) - try: - return cached_template(template_name, render_template) - except ckan.exceptions.CkanUrlException, e: - raise ckan.exceptions.CkanUrlException( - '\nAn Exception has been raised for template %s\n%s' % - (template_name, e.message)) - except render_.TemplateNotFound: - raise + del extras['url'] + del extras['config'] + + return template.render(**extras) class ValidationException(Exception): diff --git a/ckan/lib/dictization/model_dictize.py b/ckan/lib/dictization/model_dictize.py index f3914cbd3ff..f2a8628c201 100644 --- a/ckan/lib/dictization/model_dictize.py +++ b/ckan/lib/dictization/model_dictize.py @@ -558,11 +558,10 @@ def user_dictize(user, context, include_password_hash=False): result_dict['display_name'] = user.display_name result_dict['email_hash'] = user.email_hash - result_dict['number_of_edits'] = user.number_of_edits() - result_dict['number_created_packages'] = user.number_created_packages( - include_private_and_draft=context.get( - 'count_private_and_draft_datasets', False)) - + # FIXME: Extremely poorly performing queries, we've emergency hardcoded + # these to 0 as they're completely unused. + result_dict['number_of_edits'] = 0 + result_dict['number_created_packages'] = 0 requester = context.get('user') reset_key = result_dict.pop('reset_key', None) diff --git a/ckan/lib/dictization/model_save.py b/ckan/lib/dictization/model_save.py index 60476666682..2206305d6ba 100644 --- a/ckan/lib/dictization/model_save.py +++ b/ckan/lib/dictization/model_save.py @@ -98,7 +98,18 @@ def package_extras_save(extra_dicts, obj, context): session = context["session"] extras_list = obj.extras_list - old_extras = dict((extra.key, extra) for extra in extras_list) + + # XXX: clean up duplicate keys + # we've created a mess with our portal_release_date field + old_extras = {} + for extra in extras_list: + if extra.key in old_extras: + if extra.state == 'deleted': + continue + state = 'pending-deleted' if context.get('pending') else 'deleted' + extra.state = state + continue + old_extras[extra.key] = extra new_extras = {} for extra_dict in extra_dicts or []: diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index 21ce5c1c360..157bd8e800b 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -44,6 +44,7 @@ import ckan from ckan.common import _, ungettext, g, c, request, session, json +from ckan.plugins.core import plugin_loaded from markupsafe import Markup, escape log = logging.getLogger(__name__) @@ -162,6 +163,29 @@ def url(*args, **kw): return url_for(*args, **kw) +@core_helper +def get_site_protocol_and_host(): + '''Return the protocol and host of the configured `ckan.site_url`. + This is needed to generate valid, full-qualified URLs. + + If `ckan.site_url` is set like this:: + + ckan.site_url = http://example.com + + Then this function would return a tuple `('http', 'example.com')` + If the setting is missing, `(None, None)` is returned instead. + + ''' + site_url = config.get('ckan.site_url', None) + if site_url is not None: + parsed_url = urlparse.urlparse(site_url) + return ( + parsed_url.scheme.encode('utf-8'), + parsed_url.netloc.encode('utf-8') + ) + return (None, None) + + @core_helper def get_site_protocol_and_host(): '''Return the protocol and host of the configured `ckan.site_url`. @@ -368,6 +392,9 @@ def full_current_url(): for sharing etc ''' return (url_for(request.environ['CKAN_CURRENT_URL'], qualified=True)) +def current_url(): + ''' Returns current url unquoted''' + return urllib.unquote(request.environ['CKAN_CURRENT_URL']) @core_helper def current_url(): @@ -533,7 +560,7 @@ def _create_link_text(text, **kwargs): if kwargs.pop('inner_span', None): text = literal('') + text + literal('') if icon: - text = literal(' ' % icon) + text + text = literal(' ' % icon) + text return text icon = kwargs.pop('icon', None) @@ -1600,6 +1627,16 @@ def remove_url_param(key, value=None, replace=None, controller=None, return _create_url_with_params(params=params, controller=controller, action=action, extras=extras) +def canonical_search_url(): + ''' Return a url with all parameters removed except for the pagination parameter + This is useful for creating canonical urls for search pages, so that search engines do not + index many multiples of different search pages due to other search and faceting parameters + ''' + try: + page_param = [(k, v) for k, v in request.params.items() if k == 'page'] + return _search_url(page_param) + except ckan.exceptions.CkanUrlException: + return _search_url(None) @core_helper def include_resource(resource): @@ -1728,15 +1765,15 @@ def dashboard_activity_stream(user_id, filter_type=None, filter_id=None, if filter_type: action_functions = { - 'dataset': 'package_activity_list_html', - 'user': 'user_activity_list_html', - 'group': 'group_activity_list_html', - 'organization': 'organization_activity_list_html', + 'dataset': 'package_activity_list', + 'user': 'user_activity_list', + 'group': 'group_activity_list', + 'organization': 'organization_activity_list', } action_function = logic.get_action(action_functions.get(filter_type)) return action_function(context, {'id': filter_id, 'offset': offset}) else: - return logic.get_action('dashboard_activity_list_html')( + return logic.get_action('dashboard_activity_list')( context, {'offset': offset}) @@ -2299,10 +2336,10 @@ def license_options(existing_license_id=None): def get_translated(data_dict, field): language = i18n.get_lang() try: - return data_dict[field + '_translated'][language] + return data_dict[field+'_translated'][language] except KeyError: - return data_dict.get(field, '') - + val = data_dict.get(field, '') + return _(val) if val and isinstance(val, basestring) else val @core_helper def mail_to(email_address, name): @@ -2340,6 +2377,7 @@ def radio(selected, id, checked): # Useful additions from the stdlib. core_helper(urlencode) core_helper(clean_html, name='clean_html') +core_helper(plugin_loaded) def load_plugin_helpers(): diff --git a/ckan/lib/i18n.py b/ckan/lib/i18n.py index 6d89f67d6c9..ed91a37f29e 100644 --- a/ckan/lib/i18n.py +++ b/ckan/lib/i18n.py @@ -184,8 +184,8 @@ def handle_request(request, tmpl_context): ''' Set the language for the request ''' lang = request.environ.get('CKAN_LANG') or \ config.get('ckan.locale_default', 'en') - if lang != 'en': - set_lang(lang) + + set_lang(lang) for plugin in PluginImplementations(ITranslation): if lang in plugin.i18n_locales(): @@ -234,5 +234,4 @@ def set_lang(language_code): ''' Wrapper to pylons call ''' if language_code in non_translated_locals(): language_code = config.get('ckan.locale_default', 'en') - if language_code != 'en': - _set_lang(language_code) + _set_lang(language_code) diff --git a/ckan/lib/navl/validators.py b/ckan/lib/navl/validators.py index 6e508c846a8..cfcb1a2d5d2 100644 --- a/ckan/lib/navl/validators.py +++ b/ckan/lib/navl/validators.py @@ -117,3 +117,9 @@ def convert_int(value, context): except ValueError: raise Invalid(_('Please enter an integer value')) +def unicode_only(value): + '''Accept only unicode values''' + + if not isinstance(value, unicode): + raise Invalid(_('Must be a Unicode string value')) + return value diff --git a/ckan/lib/plugins.py b/ckan/lib/plugins.py index 0f0067bb901..a3b2b897241 100644 --- a/ckan/lib/plugins.py +++ b/ckan/lib/plugins.py @@ -185,16 +185,16 @@ def register_group_plugins(map): 'unfollow', 'admins', 'activity']))) map.connect('%s_edit' % group_type, '/%s/edit/{id}' % group_type, controller=group_controller, action='edit', - ckan_icon='edit') + ckan_icon='pencil-square-o') map.connect('%s_members' % group_type, '/%s/members/{id}' % group_type, controller=group_controller, action='members', - ckan_icon='group') + ckan_icon='users') map.connect('%s_activity' % group_type, '/%s/activity/{id}/{offset}' % group_type, controller=group_controller, - action='activity', ckan_icon='time'), + action='activity', ckan_icon='clock-o'), map.connect('%s_about' % group_type, '/%s/about/{id}' % group_type, controller=group_controller, action='about', ckan_icon='info-sign') diff --git a/ckan/lib/search/index.py b/ckan/lib/search/index.py index 878a5fa3a8c..cb341faf910 100644 --- a/ckan/lib/search/index.py +++ b/ckan/lib/search/index.py @@ -156,8 +156,8 @@ def index_package(self, pkg_dict, defer_commit=False): for tag in tags: if tag.get('vocabulary_id'): data = {'id': tag['vocabulary_id']} - vocab = logic.get_action('vocabulary_show')(context, data) - key = u'vocab_%s' % vocab['name'] + vocab_name = model.Vocabulary.get(tag['vocabulary_id']).name + key = u'vocab_%s' % vocab_name if key in pkg_dict: pkg_dict[key].append(tag['name']) else: diff --git a/ckan/lib/search/query.py b/ckan/lib/search/query.py index c136b294ca4..2ab2a63b9c1 100644 --- a/ckan/lib/search/query.py +++ b/ckan/lib/search/query.py @@ -20,7 +20,8 @@ VALID_SOLR_PARAMETERS = set([ 'q', 'fl', 'fq', 'rows', 'sort', 'start', 'wt', 'qf', 'bf', 'boost', 'facet', 'facet.mincount', 'facet.limit', 'facet.field', - 'extras', 'fq_list', 'tie', 'defType', 'mm' + 'extras', 'fq_list', 'tie', 'defType', 'mm', + 'facet.range.end', 'facet.range', 'facet.range.gap', 'facet.range.start' ]) # for (solr) package searches, this specifies the fields that are searched @@ -359,31 +360,39 @@ def run(self, query): 'Unknown sort order' in e.args[0]: raise SearchQueryError('Invalid "sort" parameter') raise SearchError('SOLR returned an error running query: %r Error: %r' % - (query, e)) - self.count = solr_response.hits - self.results = solr_response.docs - - - # #1683 Filter out the last row that is sometimes out of order - self.results = self.results[:rows_to_return] - - # get any extras and add to 'extras' dict - for result in self.results: - extra_keys = filter(lambda x: x.startswith('extras_'), result.keys()) - extras = {} - for extra_key in extra_keys: - value = result.pop(extra_key) - extras[extra_key[len('extras_'):]] = value - if extra_keys: - result['extras'] = extras - - # if just fetching the id or name, return a list instead of a dict - if query.get('fl') in ['id', 'name']: - self.results = [r.get(query.get('fl')) for r in self.results] - - # get facets and convert facets list to a dict - self.facets = solr_response.facets.get('facet_fields', {}) - for field, values in six.iteritems(self.facets): - self.facets[field] = dict(zip(values[0::2], values[1::2])) + (query, e.reason)) + try: + data = json.loads(solr_response) + response = data['response'] + self.count = response.get('numFound', 0) + self.results = response.get('docs', []) + + # #1683 Filter out the last row that is sometimes out of order + self.results = self.results[:rows_to_return] + + # get any extras and add to 'extras' dict + for result in self.results: + extra_keys = filter(lambda x: x.startswith('extras_'), result.keys()) + extras = {} + for extra_key in extra_keys: + value = result.pop(extra_key) + extras[extra_key[len('extras_'):]] = value + if extra_keys: + result['extras'] = extras + + # if just fetching the id or name, return a list instead of a dict + if query.get('fl') in ['id', 'name']: + self.results = [r.get(query.get('fl')) for r in self.results] + + # get facets and convert facets list to a dict + self.facets = data.get('facet_counts', {}).get('facet_fields', {}) + for field, values in self.facets.iteritems(): + self.facets[field] = dict(zip(values[0::2], values[1::2])) + self.facet_ranges = data.get('facet_counts', {}).get('facet_ranges', {}) + except Exception, e: + log.exception(e) + raise SearchError(e) + finally: + conn.close() return {'results': self.results, 'count': self.count} diff --git a/ckan/logic/__init__.py b/ckan/logic/__init__.py index 7f868881477..2f6585d55c2 100644 --- a/ckan/logic/__init__.py +++ b/ckan/logic/__init__.py @@ -3,7 +3,7 @@ import functools import logging import re -import sys +from collections import defaultdict import formencode.validators @@ -36,6 +36,7 @@ def __str__(self): return self.message + class NotFound(ActionError): '''Exception raised by logic functions when a given object is not found. @@ -308,6 +309,15 @@ def clear_actions_cache(): _actions.clear() +def chained_action(func): + func.chained_action = True + return func + + +def _is_chained_action(func): + return getattr(func, 'chained_action', False) + + def get_action(action): '''Return the named :py:mod:`ckan.logic.action` function. @@ -362,6 +372,7 @@ def get_action(action): if action not in _actions: raise KeyError("Action '%s' not found" % action) return _actions.get(action) + # Otherwise look in all the plugins to resolve all possible # First get the default ones in the ckan/logic/action directory # Rather than writing them out in full will use __import__ @@ -390,20 +401,32 @@ def get_action(action): # Then overwrite them with any specific ones in the plugins: resolved_action_plugins = {} fetched_actions = {} + chained_actions = defaultdict(list) for plugin in p.PluginImplementations(p.IActions): for name, auth_function in plugin.get_actions().items(): - if name in resolved_action_plugins: + if _is_chained_action(auth_function): + chained_actions[name].append(auth_function) + elif name in resolved_action_plugins: raise NameConflict( 'The action %r is already implemented in %r' % ( name, resolved_action_plugins[name] ) ) - resolved_action_plugins[name] = plugin.name - # Extensions are exempted from the auth audit for now - # This needs to be resolved later - auth_function.auth_audit_exempt = True - fetched_actions[name] = auth_function + else: + resolved_action_plugins[name] = plugin.name + # Extensions are exempted from the auth audit for now + # This needs to be resolved later + auth_function.auth_audit_exempt = True + fetched_actions[name] = auth_function + for name, func_list in chained_actions.iteritems(): + if name not in fetched_actions: + raise NotFound('The action %r is not found for chained action' % ( + name)) + for func in reversed(func_list): + prev_func = fetched_actions[name] + fetched_actions[name] = functools.partial(func, prev_func) + # Use the updated ones in preference to the originals. _actions.update(fetched_actions) @@ -574,6 +597,15 @@ def wrapper(context, data_dict): return wrapper +def auth_read_safe(action): + @functools.wraps(action) + def wrapper(context, data_dict): + return action(context, data_dict) + + wrapper.auth_read_safe = True + return wrapper + + def auth_audit_exempt(action): ''' Dirty hack to stop auth audit being done ''' @functools.wraps(action) diff --git a/ckan/logic/action/delete.py b/ckan/logic/action/delete.py index 12fc65d7a01..98275d48fa5 100644 --- a/ckan/logic/action/delete.py +++ b/ckan/logic/action/delete.py @@ -26,9 +26,7 @@ def user_delete(context, data_dict): '''Delete a user. - Only sysadmins can delete users. - :param id: the id or usernamename of the user to delete :type id: string ''' @@ -47,13 +45,17 @@ def user_delete(context, data_dict): if user is None: raise NotFound('User "{id}" was not found.'.format(id=user_id)) - user.delete() + with model.Session.begin_nested(): + user.delete() - user_memberships = model.Session.query(model.Member).filter( - model.Member.table_id == user.id).all() + user_memberships = model.Session.query( + model.Member + ).filter( + model.Member.table_id == user.id + ).all() - for membership in user_memberships: - membership.delete() + for membership in user_memberships: + membership.delete() model.repo.commit() diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index 16da4f75d72..ded077e629b 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -23,7 +23,6 @@ import ckan.plugins as plugins import ckan.lib.search as search import ckan.lib.plugins as lib_plugins -import ckan.lib.activity_streams as activity_streams import ckan.lib.datapreview as datapreview import ckan.authz as authz @@ -1404,6 +1403,8 @@ def user_show(context, data_dict): :rtype: dictionary ''' + _check_access('user_show', context, data_dict) + model = context['model'] id = data_dict.get('id', None) @@ -1418,8 +1419,6 @@ def user_show(context, data_dict): else: raise NotFound - _check_access('user_show', context, data_dict) - # include private and draft datasets? requester = context.get('user') sysadmin = False @@ -1780,8 +1779,9 @@ def package_search(context, data_dict): fl The parameter that controls which fields are returned in the solr - query cannot be changed. CKAN always returns the matched datasets as - dictionary objects. + query. + fl can be None or a list of result fields, such as ['id', 'extras_custom_field']. + if fl = None, datasets are returned as a list of full dictionary. ''' # sometimes context['schema'] is None schema = (context.get('schema') or @@ -1824,8 +1824,12 @@ def package_search(context, data_dict): else: data_source = 'validated_data_dict' data_dict.pop('use_default_schema', None) - # return a list of package ids - data_dict['fl'] = 'id {0}'.format(data_source) + + result_fl = data_dict.get('fl') + if not result_fl: + data_dict['fl'] = 'id {0}'.format(data_source) + else: + data_dict['fl'] = ' '.join(result_fl) # we should remove any mention of capacity from the fq and # instead set it to only retrieve public datasets @@ -1877,32 +1881,42 @@ def package_search(context, data_dict): # Add them back so extensions can use them on after_search data_dict['extras'] = extras - for package in query.results: - # get the package object - package_dict = package.get(data_source) - ## use data in search index if there - if package_dict: - # the package_dict still needs translating when being viewed - package_dict = json.loads(package_dict) - if context.get('for_view'): - for item in plugins.PluginImplementations( - plugins.IPackageController): - package_dict = item.before_view(package_dict) - results.append(package_dict) - else: - log.error('No package_dict is coming from solr for package ' - 'id %s', package['id']) + if result_fl: + for package in query.results: + if package.get('extras'): + package.update(package['extras'] ) + package.pop('extras') + results.append(package) + else: + for package in query.results: + # get the package object + package_dict = package.get(data_source) + ## use data in search index if there + if package_dict: + # the package_dict still needs translating when being viewed + package_dict = json.loads(package_dict) + if context.get('for_view'): + for item in plugins.PluginImplementations( + plugins.IPackageController): + package_dict = item.before_view(package_dict) + results.append(package_dict) + else: + log.error('No package_dict is coming from solr for package ' + 'id %s', package['id']) count = query.count facets = query.facets + facet_ranges = query.facet_ranges else: count = 0 facets = {} + facet_ranges = None results = [] search_results = { 'count': count, 'facets': facets, + 'facet_ranges': facet_ranges, 'results': results, 'sort': data_dict['sort'] } @@ -2519,17 +2533,27 @@ def package_activity_list(context, data_dict): package_ref = data_dict.get('id') # May be name or ID. package = model.Package.get(package_ref) + if package is None: raise logic.NotFound offset = int(data_dict.get('offset', 0)) limit = int( - data_dict.get('limit', config.get('ckan.activity_list_limit', 31))) + data_dict.get( + 'limit', + config.get('ckan.activity_list_limit', 31) + ) + ) - _activity_objects = model.activity.package_activity_list(package.id, - limit=limit, offset=offset) - activity_objects = _filter_activity_by_user(_activity_objects, - _activity_stream_get_filtered_users()) + _activity_objects = model.activity.package_activity_list( + package.id, + limit=limit, + offset=offset + ) + activity_objects = _filter_activity_by_user( + _activity_objects, + _activity_stream_get_filtered_users() + ) return model_dictize.activity_list_dictize(activity_objects, context) @@ -2599,10 +2623,12 @@ def organization_activity_list(context, data_dict): org_show = logic.get_action('organization_show') org_id = org_show(context, {'id': org_id})['id'] - _activity_objects = model.activity.group_activity_list(org_id, + activity_objects = model.activity.group_activity_list(org_id, limit=limit, offset=offset) + """ activity_objects = _filter_activity_by_user(_activity_objects, _activity_stream_get_filtered_users()) + """ return model_dictize.activity_list_dictize(activity_objects, context) @@ -2654,154 +2680,6 @@ def activity_detail_list(context, data_dict): activity_detail_objects, context) -def user_activity_list_html(context, data_dict): - '''Return a user's public activity stream as HTML. - - The activity stream is rendered as a snippet of HTML meant to be included - in an HTML page, i.e. it doesn't have any HTML header or footer. - - :param id: The id or name of the user. - :type id: string - :param offset: where to start getting activity items from - (optional, default: 0) - :type offset: int - :param limit: the maximum number of activities to return - (optional, default: 31, the default value is configurable via the - ckan.activity_list_limit setting) - :type limit: int - - :rtype: string - - ''' - activity_stream = user_activity_list(context, data_dict) - offset = int(data_dict.get('offset', 0)) - extra_vars = { - 'controller': 'user', - 'action': 'activity', - 'id': data_dict['id'], - 'offset': offset, - } - return activity_streams.activity_list_to_html( - context, activity_stream, extra_vars) - - -def package_activity_list_html(context, data_dict): - '''Return a package's activity stream as HTML. - - The activity stream is rendered as a snippet of HTML meant to be included - in an HTML page, i.e. it doesn't have any HTML header or footer. - - :param id: the id or name of the package - :type id: string - :param offset: where to start getting activity items from - (optional, default: 0) - :type offset: int - :param limit: the maximum number of activities to return - (optional, default: 31, the default value is configurable via the - ckan.activity_list_limit setting) - :type limit: int - - :rtype: string - - ''' - activity_stream = package_activity_list(context, data_dict) - offset = int(data_dict.get('offset', 0)) - extra_vars = { - 'controller': 'package', - 'action': 'activity', - 'id': data_dict['id'], - 'offset': offset, - } - return activity_streams.activity_list_to_html( - context, activity_stream, extra_vars) - - -def group_activity_list_html(context, data_dict): - '''Return a group's activity stream as HTML. - - The activity stream is rendered as a snippet of HTML meant to be included - in an HTML page, i.e. it doesn't have any HTML header or footer. - - :param id: the id or name of the group - :type id: string - :param offset: where to start getting activity items from - (optional, default: 0) - :type offset: int - :param limit: the maximum number of activities to return - (optional, default: 31, the default value is configurable via the - ckan.activity_list_limit setting) - :type limit: int - - :rtype: string - - ''' - activity_stream = group_activity_list(context, data_dict) - offset = int(data_dict.get('offset', 0)) - extra_vars = { - 'controller': 'group', - 'action': 'activity', - 'id': data_dict['id'], - 'offset': offset, - } - return activity_streams.activity_list_to_html( - context, activity_stream, extra_vars) - - -def organization_activity_list_html(context, data_dict): - '''Return a organization's activity stream as HTML. - - The activity stream is rendered as a snippet of HTML meant to be included - in an HTML page, i.e. it doesn't have any HTML header or footer. - - :param id: the id or name of the organization - :type id: string - - :rtype: string - - ''' - activity_stream = organization_activity_list(context, data_dict) - offset = int(data_dict.get('offset', 0)) - extra_vars = { - 'controller': 'organization', - 'action': 'activity', - 'id': data_dict['id'], - 'offset': offset, - } - - return activity_streams.activity_list_to_html( - context, activity_stream, extra_vars) - - -def recently_changed_packages_activity_list_html(context, data_dict): - '''Return the activity stream of all recently changed packages as HTML. - - The activity stream includes all recently added or changed packages. It is - rendered as a snippet of HTML meant to be included in an HTML page, i.e. it - doesn't have any HTML header or footer. - - :param offset: where to start getting activity items from - (optional, default: 0) - :type offset: int - :param limit: the maximum number of activities to return - (optional, default: 31, the default value is configurable via the - ckan.activity_list_limit setting) - :type limit: int - - :rtype: string - - ''' - activity_stream = recently_changed_packages_activity_list( - context, data_dict) - offset = int(data_dict.get('offset', 0)) - extra_vars = { - 'controller': 'package', - 'action': 'activity', - 'offset': offset, - } - return activity_streams.activity_list_to_html( - context, activity_stream, extra_vars) - - def _follower_count(context, data_dict, default_schema, ModelClass): schema = context.get('schema', default_schema) data_dict, errors = _validate(data_dict, schema, context) @@ -3330,37 +3208,6 @@ def dashboard_activity_list(context, data_dict): return activity_dicts -@logic.validate(ckan.logic.schema.default_pagination_schema) -def dashboard_activity_list_html(context, data_dict): - '''Return the authorized (via login or API key) user's dashboard activity - stream as HTML. - - The activity stream is rendered as a snippet of HTML meant to be included - in an HTML page, i.e. it doesn't have any HTML header or footer. - - :param offset: where to start getting activity items from - (optional, default: 0) - :type offset: int - :param limit: the maximum number of activities to return - (optional, default: 31, the default value is configurable via the - ckan.activity_list_limit setting) - :type limit: int - - :rtype: string - - ''' - activity_stream = dashboard_activity_list(context, data_dict) - model = context['model'] - offset = data_dict.get('offset', 0) - extra_vars = { - 'controller': 'user', - 'action': 'dashboard', - 'offset': offset, - } - return activity_streams.activity_list_to_html(context, activity_stream, - extra_vars) - - def dashboard_new_activities_count(context, data_dict): '''Return the number of new activities in the user's dashboard. diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py index db451f5b887..f8d08bb90c1 100644 --- a/ckan/logic/action/update.py +++ b/ckan/logic/action/update.py @@ -27,6 +27,7 @@ from ckan.common import _, request +from ckan import new_authz log = logging.getLogger(__name__) @@ -619,7 +620,7 @@ def user_update(context, data_dict): '''Update a user account. Normal users can only update their own user accounts. Sysadmins can update - any user account. + any user account. Can not modify exisiting user's name. For further parameters see :py:func:`~ckan.logic.action.create.user_create`. diff --git a/ckan/logic/auth/get.py b/ckan/logic/auth/get.py index 011b19c2e84..5abb443a92e 100644 --- a/ckan/logic/auth/get.py +++ b/ckan/logic/auth/get.py @@ -3,8 +3,11 @@ import ckan.logic as logic import ckan.authz as authz from ckan.lib.base import _ -from ckan.logic.auth import (get_package_object, get_group_object, - get_resource_object) +from ckan.logic.auth import ( + get_package_object, + get_group_object, + get_resource_object +) def sysadmin(context, data_dict): @@ -12,6 +15,7 @@ def sysadmin(context, data_dict): return {'success': False, 'msg': _('Not authorized')} +@logic.auth_read_safe def site_read(context, data_dict): """\ This function should be deprecated. It is only here because we couldn't @@ -23,72 +27,103 @@ def site_read(context, data_dict): # FIXME we need to remove this for now we allow site read return {'success': True} + +@logic.auth_read_safe def package_search(context, data_dict): # Everyone can search by default return {'success': True} + +@logic.auth_read_safe def package_list(context, data_dict): # List of all active packages are visible by default return {'success': True} +@logic.auth_read_safe def current_package_list_with_resources(context, data_dict): return authz.is_authorized('package_list', context, data_dict) + +@logic.auth_read_safe def revision_list(context, data_dict): # In our new model everyone can read the revison list return {'success': True} +@logic.auth_read_safe def group_revision_list(context, data_dict): return authz.is_authorized('group_show', context, data_dict) + +@logic.auth_read_safe def organization_revision_list(context, data_dict): return authz.is_authorized('group_show', context, data_dict) + +@logic.auth_read_safe def package_revision_list(context, data_dict): return authz.is_authorized('package_show', context, data_dict) + +@logic.auth_read_safe def group_list(context, data_dict): # List of all active groups is visible by default return {'success': True} +@logic.auth_read_safe def group_list_authz(context, data_dict): return authz.is_authorized('group_list', context, data_dict) + +@logic.auth_read_safe def group_list_available(context, data_dict): return authz.is_authorized('group_list', context, data_dict) + +@logic.auth_read_safe def organization_list(context, data_dict): # List of all active organizations are visible by default return {'success': True} + +@logic.auth_read_safe def organization_list_for_user(context, data_dict): return {'success': True} + +@logic.auth_read_safe def license_list(context, data_dict): # Licenses list is visible by default return {'success': True} + +@logic.auth_read_safe def vocabulary_list(context, data_dict): # List of all vocabularies are visible by default return {'success': True} + +@logic.auth_read_safe def tag_list(context, data_dict): # Tags list is visible by default return {'success': True} + +@logic.auth_read_safe def user_list(context, data_dict): # Users list is visible by default return {'success': True} + +@logic.auth_read_safe def package_relationships_list(context, data_dict): user = context.get('user') @@ -105,18 +140,26 @@ def package_relationships_list(context, data_dict): authorized2 = True if not (authorized1 and authorized2): - return {'success': False, 'msg': _('User %s not authorized to read these packages') % user} + return { + 'success': False, + 'msg': _('User %s not authorized to read these packages') % user + } else: return {'success': True} + +@logic.auth_read_safe def package_show(context, data_dict): user = context.get('user') package = get_package_object(context, data_dict) # draft state indicates package is still in the creation process # so we need to check we have creation rights. if package.state.startswith('draft'): - auth = authz.is_authorized('package_update', - context, data_dict) + auth = 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} @@ -127,11 +170,23 @@ def package_show(context, data_dict): authorized = authz.has_user_permission_for_group_or_org( package.owner_org, user, 'read') if not authorized: - return {'success': False, 'msg': _('User %s not authorized to read package %s') % (user, package.id)} + return { + 'success': False, + 'msg': _('User %s not authorized to read package %s') % ( + user, + package.id + ) + } else: return {'success': True} +@logic.auth_read_safe +def related_show(context, data_dict=None): + return {'success': True} + + +@logic.auth_read_safe def resource_show(context, data_dict): model = context['model'] user = context.get('user') @@ -140,29 +195,48 @@ def resource_show(context, data_dict): # check authentication against package pkg = model.Package.get(resource.package_id) if not pkg: - raise logic.NotFound(_('No package found for this resource, cannot check auth.')) + raise logic.NotFound( + _('No package found for this resource, cannot check auth.') + ) pkg_dict = {'id': pkg.id} - authorized = authz.is_authorized('package_show', context, pkg_dict).get('success') + authorized = authz.is_authorized( + 'package_show', + context, + pkg_dict + ).get('success') if not authorized: - return {'success': False, 'msg': _('User %s not authorized to read resource %s') % (user, resource.id)} + return { + 'success': False, + 'msg': _('User %s not authorized to read resource %s') % ( + user, + resource.id + ) + } else: return {'success': True} +@logic.auth_read_safe def resource_view_show(context, data_dict): return authz.is_authorized('resource_show', context, data_dict) + +@logic.auth_read_safe def resource_view_list(context, data_dict): return authz.is_authorized('resource_show', context, data_dict) + +@logic.auth_read_safe def revision_show(context, data_dict): # No authz check in the logic function return {'success': True} + +@logic.auth_read_safe def group_show(context, data_dict): user = context.get('user') group = get_group_object(context, data_dict) @@ -173,70 +247,105 @@ def group_show(context, data_dict): if authorized: return {'success': True} else: - return {'success': False, 'msg': _('User %s not authorized to read group %s') % (user, group.id)} + return { + 'success': False, + 'msg': _('User %s not authorized to read group %s') % ( + user, + group.id + ) + } +@logic.auth_read_safe def organization_show(context, data_dict): return authz.is_authorized('group_show', context, data_dict) + +@logic.auth_read_safe def vocabulary_show(context, data_dict): # Allow viewing of vocabs by default return {'success': True} + +@logic.auth_read_safe def tag_show(context, data_dict): # No authz check in the logic function return {'success': True} + +@logic.auth_read_safe def user_show(context, data_dict): # By default, user details can be read by anyone, but some properties like # the API key are stripped at the action level if not not logged in. return {'success': True} +@logic.auth_read_safe def package_autocomplete(context, data_dict): return authz.is_authorized('package_list', context, data_dict) + +@logic.auth_read_safe def group_autocomplete(context, data_dict): return authz.is_authorized('group_list', context, data_dict) + +@logic.auth_read_safe def organization_autocomplete(context, data_dict): return authz.is_authorized('organization_list', context, data_dict) + +@logic.auth_read_safe def tag_autocomplete(context, data_dict): return authz.is_authorized('tag_list', context, data_dict) + +@logic.auth_read_safe def user_autocomplete(context, data_dict): return authz.is_authorized('user_list', context, data_dict) + +@logic.auth_read_safe def format_autocomplete(context, data_dict): return {'success': True} + +@logic.auth_read_safe def task_status_show(context, data_dict): return {'success': True} + +@logic.auth_read_safe def resource_status_show(context, data_dict): return {'success': True} ## Modifications for rest api +@logic.auth_read_safe def package_show_rest(context, data_dict): return authz.is_authorized('package_show', context, data_dict) + +@logic.auth_read_safe def group_show_rest(context, data_dict): return authz.is_authorized('group_show', context, data_dict) + +@logic.auth_read_safe def tag_show_rest(context, data_dict): return authz.is_authorized('tag_show', context, data_dict) + +@logic.auth_read_safe def get_site_user(context, data_dict): # FIXME this is available to sysadmins currently till # @auth_sysadmins_check decorator is added @@ -244,10 +353,12 @@ def get_site_user(context, data_dict): 'msg': 'Only internal services allowed to use this action'} +@logic.auth_read_safe def member_roles_list(context, data_dict): return {'success': True} +@logic.auth_read_safe def dashboard_activity_list(context, data_dict): # FIXME: context['user'] could be an IP address but that case is not # handled here. Maybe add an auth helper function like is_logged_in(). @@ -258,30 +369,39 @@ def dashboard_activity_list(context, data_dict): 'msg': _("You must be logged in to access your dashboard.")} +@logic.auth_read_safe def dashboard_new_activities_count(context, data_dict): # FIXME: This should go through check_access() not call is_authorized() # directly, but wait until 2939-orgs is merged before fixing this. # This is so a better not authourized message can be sent. - return authz.is_authorized('dashboard_activity_list', - context, data_dict) + return authz.is_authorized( + 'dashboard_activity_list', + context, + data_dict + ) +@logic.auth_read_safe def user_follower_list(context, data_dict): return authz.is_authorized('sysadmin', context, data_dict) +@logic.auth_read_safe def dataset_follower_list(context, data_dict): return authz.is_authorized('sysadmin', context, data_dict) +@logic.auth_read_safe def group_follower_list(context, data_dict): return authz.is_authorized('sysadmin', context, data_dict) +@logic.auth_read_safe def organization_follower_list(context, data_dict): return authz.is_authorized('sysadmin', context, data_dict) +@logic.auth_read_safe def _followee_list(context, data_dict): model = context['model'] @@ -299,47 +419,57 @@ def _followee_list(context, data_dict): return authz.is_authorized('sysadmin', context, data_dict) +@logic.auth_read_safe def followee_list(context, data_dict): return _followee_list(context, data_dict) +@logic.auth_read_safe @logic.auth_audit_exempt def user_followee_list(context, data_dict): return _followee_list(context, data_dict) +@logic.auth_read_safe @logic.auth_audit_exempt def dataset_followee_list(context, data_dict): return _followee_list(context, data_dict) +@logic.auth_read_safe @logic.auth_audit_exempt def group_followee_list(context, data_dict): return _followee_list(context, data_dict) +@logic.auth_read_safe @logic.auth_audit_exempt def organization_followee_list(context, data_dict): return _followee_list(context, data_dict) +@logic.auth_read_safe def user_reset(context, data_dict): return {'success': True} +@logic.auth_read_safe def request_reset(context, data_dict): return {'success': True} +@logic.auth_read_safe def help_show(context, data_dict): return {'success': True} +@logic.auth_read_safe def config_option_show(context, data_dict): '''Show runtime-editable configuration option. Only sysadmins.''' return {'success': False} +@logic.auth_read_safe def config_option_list(context, data_dict): '''List runtime-editable configuration options. Only sysadmins.''' return {'success': False} diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py index 78ac4ed5a40..e1f5f3b86b6 100644 --- a/ckan/logic/schema.py +++ b/ckan/logic/schema.py @@ -588,6 +588,7 @@ def default_autocomplete_schema(): def default_package_search_schema(): schema = { 'q': [ignore_missing, unicode], + 'fl': [ignore_missing, list_of_strings], 'fq': [ignore_missing, unicode], 'rows': [ignore_missing, natural_number_validator], 'sort': [ignore_missing, unicode], diff --git a/ckan/logic/validators.py b/ckan/logic/validators.py index ad8a91c5a8c..863b8689f5f 100644 --- a/ckan/logic/validators.py +++ b/ckan/logic/validators.py @@ -544,10 +544,9 @@ def user_name_validator(key, data, errors, context): raise Invalid(_('User names must be strings')) user = model.User.get(new_user_name) + user_obj_from_context = context.get('user_obj') if user is not None: # A user with new_user_name already exists in the database. - - user_obj_from_context = context.get('user_obj') if user_obj_from_context and user_obj_from_context.id == user.id: # If there's a user_obj in context with the same id as the user # found in the db, then we must be doing a user_update and not @@ -558,6 +557,12 @@ def user_name_validator(key, data, errors, context): # name, so you can create a new user with that name or update an # existing user's name to that name. errors[key].append(_('That login name is not available.')) + elif user_obj_from_context: + old_user = model.User.get(user_obj_from_context.id) + if old_user is not None and old_user.state != model.State.PENDING: + errors[key].append(_('That login name can not be modified.')) + else: + return def user_both_passwords_entered(key, data, errors, context): diff --git a/ckan/model/activity.py b/ckan/model/activity.py index cfd6d02e2a5..f165f7fb5b7 100644 --- a/ckan/model/activity.py +++ b/ckan/model/activity.py @@ -3,7 +3,17 @@ import datetime from sqlalchemy import ( - orm, types, Column, Table, ForeignKey, desc, or_, union_all) + orm, + types, + Column, + Table, + ForeignKey, + desc, + or_, + and_, + union_all, + func +) import ckan.model import meta @@ -127,6 +137,15 @@ def _user_activity_query(user_id, limit): q2 = _activities_limit(_activities_about_user_query(user_id), limit) return _activities_union_all(q1, q2) +def _package_activity_query(package_id): + '''Return an SQLAlchemy query for all activities about package_id. + + ''' + import ckan.model as model + q = model.Session.query(model.Activity) + q = q.filter_by(object_id=package_id) + return q + def user_activity_list(user_id, limit, offset): '''Return user_id's public activity stream. @@ -143,16 +162,6 @@ def user_activity_list(user_id, limit, offset): return _activities_at_offset(q, limit, offset) -def _package_activity_query(package_id): - '''Return an SQLAlchemy query for all activities about package_id. - - ''' - import ckan.model as model - q = model.Session.query(model.Activity) - q = q.filter_by(object_id=package_id) - return q - - def package_activity_list(package_id, limit, offset): '''Return the given dataset (package)'s public activity stream. @@ -164,8 +173,26 @@ def package_activity_list(package_id, limit, offset): etc. ''' - q = _package_activity_query(package_id) - return _activities_at_offset(q, limit, offset) + import ckan.model as model + + q = model.Session.query( + model.Activity + ).filter_by( + object_id=package_id + ) + + if offset: + q = q.filter( + model.Activity.timestamp < func.to_timestamp(offset) + ) + + q = q.order_by( + model.Activity.timestamp.desc() + ).limit( + limit + ) + + return q def _group_activity_query(group_id): @@ -182,14 +209,33 @@ def _group_activity_query(group_id): # Return a query with no results. return model.Session.query(model.Activity).filter("0=1") - dataset_ids = [dataset.id for dataset in group.packages()] + q = model.Session.query( + model.Activity + ).outerjoin( + model.Member, + and_( + model.Activity.object_id == model.Member.table_id, + model.Member.state == 'active' + ) + ).outerjoin( + model.Package, + and_( + model.Package.id == model.Member.table_id, + model.Package.private == False, + model.Package.state == 'active' + ) + ).filter( + # We only care about activity either on the the group itself or on + # packages within that group. + # FIXME: This means that activity that occured while a package belonged + # to a group but was then removed will not show up. This may not be + # desired but is consistent with legacy behaviour. + or_( + model.Member.group_id == group_id, + model.Activity.object_id == group_id + ), + ) - q = model.Session.query(model.Activity) - if dataset_ids: - q = q.filter(or_(model.Activity.object_id == group_id, - model.Activity.object_id.in_(dataset_ids))) - else: - q = q.filter(model.Activity.object_id == group_id) return q diff --git a/ckan/model/package.py b/ckan/model/package.py index 7b9b9528ec9..a67306e975c 100644 --- a/ckan/model/package.py +++ b/ckan/model/package.py @@ -1,11 +1,10 @@ # encoding: utf-8 import datetime -from calendar import timegm import logging logger = logging.getLogger(__name__) -from sqlalchemy.sql import select, and_, union, or_ +from sqlalchemy.sql import and_, or_ from sqlalchemy import orm from sqlalchemy import types, Column, Table from ckan.common import config @@ -24,7 +23,7 @@ __all__ = ['Package', 'package_table', 'package_revision_table', 'PACKAGE_NAME_MAX_LENGTH', 'PACKAGE_NAME_MIN_LENGTH', - 'PACKAGE_VERSION_MAX_LENGTH', 'PackageTag', 'PackageTagRevision', + 'PACKAGE_VERSION_MAX_LENGTH', 'PackageTagRevision', 'PackageRevision'] @@ -510,6 +509,7 @@ def get_fields(core_only=False, fields_to_ignore=None): def activity_stream_item(self, activity_type, revision, user_id): import ckan.model import ckan.logic + assert activity_type in ("new", "changed"), ( str(activity_type)) @@ -529,10 +529,17 @@ def activity_stream_item(self, activity_type, revision, user_id): activity_type = 'deleted' try: - d = {'package': dictization.table_dictize(self, - context={'model': ckan.model})} - return activity.Activity(user_id, self.id, revision.id, - "%s package" % activity_type, d) + # We save the entire rendered package dict so we can support + # viewing the past packages from the activity feed. + dictized_package = ckan.logic.get_action('package_show')({ + 'model': ckan.model, + 'session': ckan.model.Session, + 'for_view': True, + 'ignore_auth': True + }, { + 'id': self.id, + 'include_tracking': True + }) except ckan.logic.NotFound: # This happens if this package is being purged and therefore has no # current revision. @@ -540,6 +547,22 @@ def activity_stream_item(self, activity_type, revision, user_id): # is purged. return None + actor = meta.Session.query(ckan.model.User).get(user_id) + + return activity.Activity( + user_id, + self.id, + revision.id, + "%s package" % activity_type, + { + 'package': dictized_package, + # We keep the acting user name around so that actions can be + # properly displayed even if the user is deleted in the future. + # Legacy tests do not include valid users :( + 'actor': actor.name if actor else None + } + ) + def activity_stream_detail(self, activity_id, activity_type): import ckan.model diff --git a/ckan/model/resource.py b/ckan/model/resource.py index aa608d46eb9..529a7694401 100644 --- a/ckan/model/resource.py +++ b/ckan/model/resource.py @@ -189,7 +189,6 @@ def activity_stream_detail(self, activity_id, activity_type): ), ) }, -order_by=[resource_table.c.package_id], extension=[vdm.sqlalchemy.Revisioner(resource_revision_table), extension.PluginMapperExtension(), ], diff --git a/ckan/model/user.py b/ckan/model/user.py index 83b1c5b3df7..4e6e89a9a3f 100644 --- a/ckan/model/user.py +++ b/ckan/model/user.py @@ -9,7 +9,7 @@ from passlib.hash import pbkdf2_sha512 from sqlalchemy.sql.expression import or_ from sqlalchemy.orm import synonym -from sqlalchemy import types, Column, Table +from sqlalchemy import types, Column, Table, func import vdm.sqlalchemy import meta @@ -189,21 +189,45 @@ def as_dict(self): def number_of_edits(self): # have to import here to avoid circular imports import ckan.model as model - revisions_q = meta.Session.query(model.Revision) - revisions_q = revisions_q.filter_by(author=self.name) - return revisions_q.count() + + # Get count efficiently without spawning the SQLAlchemy subquery + # wrapper. Reset the VDM-forced order_by on timestamp. + return meta.Session.execute( + meta.Session.query( + model.Revision + ).filter_by( + author=self.name + ).statement.with_only_columns( + [func.count()] + ).order_by( + None + ) + ).scalar() def number_created_packages(self, include_private_and_draft=False): # have to import here to avoid circular imports import ckan.model as model - q = meta.Session.query(model.Package)\ - .filter_by(creator_user_id=self.id) + + # Get count efficiently without spawning the SQLAlchemy subquery + # wrapper. Reset the VDM-forced order_by on timestamp. + q = meta.Session.query( + model.Package + ).filter_by( + creator_user_id=self.id + ) + if include_private_and_draft: q = q.filter(model.Package.state != 'deleted') else: - q = q.filter_by(state='active')\ - .filter_by(private=False) - return q.count() + q = q.filter_by(state='active', private=False) + + return meta.Session.execute( + q.statement.with_only_columns( + [func.count()] + ).order_by( + None + ) + ).scalar() def activate(self): ''' Activate the user ''' diff --git a/ckan/plugins/interfaces.py b/ckan/plugins/interfaces.py index 2651c394a87..bcf4a92eb4e 100644 --- a/ckan/plugins/interfaces.py +++ b/ckan/plugins/interfaces.py @@ -233,7 +233,7 @@ def info(self): :param default_description: default description that will be used if the view is created automatically (optional, defaults to ''). :param icon: icon for the view type. Should be one of the - `Font Awesome`_ types without the `icon-` prefix eg. `compass` + `Font Awesome`_ types without the `fa fa-` prefix eg. `compass` (optional, defaults to 'picture'). :param always_available: the view type should be always available when creating new views regardless of the format of the resource @@ -264,7 +264,7 @@ def info(self): 'schema': { 'image_url': [ignore_empty, unicode] }, - 'icon': 'picture', + 'icon': 'picture-o', 'always_available': True, 'iframed': False, } @@ -797,6 +797,17 @@ def get_actions(self): By decorating a function with the `ckan.logic.side_effect_free` decorator, the associated action will be made available by a GET request (as well as the usual POST request) through the action API. + + By decrorating a function with the 'ckan.plugins.toolkit.chained_action, + the action will be chained to another function defined in plugins with a + "first plugin wins" pattern, which means the first plugin declaring a + chained action should be called first. Chained actions must be + defined as action_function(original_action, context, data_dict) + where the first parameter will be set to the action function in + the next plugin or in core ckan. The chained action may call the + original_action function, optionally passing different values, + handling exceptions, returning different values and/or raising + different exceptions to the caller. """ diff --git a/ckan/plugins/toolkit.py b/ckan/plugins/toolkit.py index 899763806ea..41c9eeb3cf7 100644 --- a/ckan/plugins/toolkit.py +++ b/ckan/plugins/toolkit.py @@ -224,6 +224,7 @@ def _initialize(self): t['literal'] = webhelpers.html.tags.literal t['get_action'] = logic.get_action + t['chained_action'] = logic.chained_action t['get_converter'] = logic.get_validator # For backwards compatibility t['get_validator'] = logic.get_validator t['check_access'] = logic.check_access diff --git a/ckan/public/base/css/fuchsia.css b/ckan/public/base/css/fuchsia.css index 5b71168593b..7d30bd4147e 100644 --- a/ckan/public/base/css/fuchsia.css +++ b/ckan/public/base/css/fuchsia.css @@ -2298,8 +2298,8 @@ button.close { -moz-border-radius: 6px; border-radius: 6px; } -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { +.btn-large [class^="fa fa-"], +.btn-large [class*=" fa fa-"] { margin-top: 4px; } .btn-small { @@ -2309,12 +2309,12 @@ button.close { -moz-border-radius: 3px; border-radius: 3px; } -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { +.btn-small [class^="fa fa-"], +.btn-small [class*=" fa fa-"] { margin-top: 0; } -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { +.btn-mini [class^="fa fa-"], +.btn-mini [class*=" fa fa-"] { margin-top: -1px; } .btn-mini { @@ -2915,8 +2915,8 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #e73892; } -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { +.nav-list [class^="fa fa-"], +.nav-list [class*=" fa fa-"] { margin-right: 2px; } .nav-list .divider { @@ -3483,7 +3483,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active { background-color: #cccccc \9; } -.navbar .btn-navbar .icon-bar { +.navbar .btn-navbar .fa-bar { display: block; width: 18px; height: 2px; @@ -3495,7 +3495,7 @@ input[type="submit"].btn.btn-mini { -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); } -.btn-navbar .icon-bar + .icon-bar { +.btn-navbar .fa-bar + .fa-bar { margin-top: 3px; } .navbar .nav > li > .dropdown-menu:before { @@ -6376,8 +6376,8 @@ textarea { .form-horizontal .info-inline:before { top: 8px; } -.info-block .icon-large, -.info-inline .icon-large { +.info-block .fa-lg, +.info-inline .fa-lg { float: left; font-size: 22px; margin-right: 15px; @@ -6912,7 +6912,7 @@ textarea { -moz-border-radius: 100px; border-radius: 100px; } -.js .image-upload .btn-remove-url .icon-remove { +.js .image-upload .btn-remove-url .fa-times { margin-right: 0; } .add-member-form .control-label { @@ -6975,7 +6975,7 @@ textarea { margin-right: 10px; text-transform: uppercase; } -.dataset-private .icon-lock { +.dataset-private .fa-lock { width: 9px; } .dataset-private.pull-right { @@ -7908,39 +7908,39 @@ h4 small { height: 35px; background-position: -320px -62px; } -[class^="icon-"], -[class*=" icon-"] { +[class^=" fa fa-"], +[class*=" fa fa-"] { display: inline-block; text-align: right; font-size: 14px; line-height: 1; width: 14px; } -.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-"] { +.btn [class^="fa fa-"], +.nav [class^="fa fa-"], +.module-heading [class^="fa fa-"], +.dropdown [class^="fa fa-"], +.btn [class*=" fa fa-"], +.nav [class*=" fa fa-"], +.module-heading [class*=" fa fa-"], +.dropdown [class*=" fa fa-"] { margin-right: 4px; } -.info-block [class^="icon-"], -.info-block [class*=" icon-"] { +.info-block [class^="fa fa-"], +.info-block [class*=" fa fa-"] { float: left; font-size: 28px; width: 28px; margin-right: 5px; margin-top: 2px; } -.breadcrumb .home .icon-home { +.breadcrumb .home .fa-home { font-size: 24px; width: 24px; vertical-align: -1px; } -.info-block-small [class^="icon-"], -.info-block-small [class*=" icon-"] { +.info-block-small [class^="fa fa-"], +.info-block-small [class*=" fa fa-"] { font-size: 14px; width: 14px; margin-top: 1px; @@ -8522,13 +8522,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.masthead .btn-navbar .icon-bar, -.masthead .btn-navbar:hover .icon-bar, -.masthead .btn-navbar:focus .icon-bar, -.masthead .btn-navbar:active .icon-bar, -.masthead .btn-navbar.active .icon-bar, -.masthead .btn-navbar.disabled .icon-bar, -.masthead .btn-navbar[disabled] .icon-bar { +.masthead .btn-navbar .fa-bar, +.masthead .btn-navbar:hover .fa-bar, +.masthead .btn-navbar:focus .fa-bar, +.masthead .btn-navbar:active .fa-bar, +.masthead .btn-navbar.active .fa-bar, +.masthead .btn-navbar.disabled .fa-bar, +.masthead .btn-navbar[disabled] .fa-bar { margin-right: 0; } .masthead .debug { @@ -8659,13 +8659,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.site-footer .btn-navbar .icon-bar, -.site-footer .btn-navbar:hover .icon-bar, -.site-footer .btn-navbar:focus .icon-bar, -.site-footer .btn-navbar:active .icon-bar, -.site-footer .btn-navbar.active .icon-bar, -.site-footer .btn-navbar.disabled .icon-bar, -.site-footer .btn-navbar[disabled] .icon-bar { +.site-footer .btn-navbar .fa-bar, +.site-footer .btn-navbar:hover .fa-bar, +.site-footer .btn-navbar:focus .fa-bar, +.site-footer .btn-navbar:active .fa-bar, +.site-footer .btn-navbar.active .fa-bar, +.site-footer .btn-navbar.disabled .fa-bar, +.site-footer .btn-navbar[disabled] .fa-bar { margin-right: 0; } .site-footer .debug { @@ -9313,197 +9313,25 @@ iframe { white-space: nowrap; } .ie9 .homepage .media.module-heading .media-image img, -.ie8 .homepage .media.module-heading .media-image img, -.ie7 .homepage .media.module-heading .media-image img { +.ie8 .homepage .media.module-heading .media-image img { width: 85px !important; } -.ie8 .masthead .nav-collapse, -.ie7 .masthead .nav-collapse { +.ie8 .masthead .nav-collapse { float: right; } .ie8 [role=main], -.ie7 [role=main], -.ie8 .main, -.ie7 .main { +.ie8 .main { padding-top: 10px; background: #eeeeee url("../../../base/images/bg.png"); } -.ie8 .hero, -.ie7 .hero { +.ie8 .hero { background: url("../../../base/images/background-tile.png"); } -.ie8 .hero .hero-primary.module-popup .box, -.ie7 .hero .hero-primary.module-popup .box { +.ie8 .hero .hero-primary.module-popup .box { padding-bottom: 20px !important; margin-bottom: 0 !important; } -.ie8 .lang-dropdown, -.ie7 .lang-dropdown { +.ie8 .lang-dropdown { position: relative !important; top: -90px !important; } -.ie7 .alert { - position: relative; -} -.ie7 .alert .close { - position: absolute; - top: 6px !important; - right: 20px; -} -.ie7 .media-item { - width: 30%; -} -.ie7 .tags .tag-list { - *zoom: 1; -} -.ie7 .tags .tag-list:before, -.ie7 .tags .tag-list:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .tags .tag-list:after { - clear: both; -} -.ie7 .tags .tag-list li { - display: block; - float: left; -} -.ie7 .tags h3 { - float: left; -} -.ie7 .tags .tag { - display: block; -} -.ie7 .search-giant input { - width: 95%; -} -.ie7 .control-full input, -.ie7 .control-full select, -.ie7 .control-full textarea { - width: 95%; -} -.ie7 .control-full.control-large .controls input { - padding-bottom: 20px; -} -.ie7 .controls { - position: relative; -} -.ie7 .controls .info-block, -.ie7 .controls .info-inline { - position: absolute; - top: 0; - right: 0; -} -.ie7 .form-horizontal .controls { - margin-left: 0; -} -.ie7 .control-custom .checkbox { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .stages { - overflow: hidden; - background-color: #ededed; -} -.ie7 .stages li { - height: 30px; - width: 27.5%; -} -.ie7 .stages li button, -.ie7 .stages li span { - display: block; - height: 30px; - padding-left: 20px; -} -.ie7 .stages li button { - height: 50px; -} -.ie7 .stages li .highlight { - width: auto; -} -.ie7 .account-masthead .account a i { - line-height: 31px; -} -.ie7 .masthead { - position: relative; - z-index: 1; -} -.ie7 .masthead .logo img, -.ie7 .masthead nav { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .masthead .header-image { - display: block; -} -.ie7 .masthead .account .dropdown-menu { - z-index: 10000; -} -.ie7 .module-narrow .nav-item.image { - *zoom: 1; -} -.ie7 .module-narrow .nav-item.image:before, -.ie7 .module-narrow .nav-item.image:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .module-narrow .nav-item.image:after { - clear: both; -} -.ie7 .nav-facet .nav-item.active a { - content: 'x'; -} -.ie7 .toolbar .breadcrumb li { - padding-right: 10px; - margin-right: 5px; - background: transparent url("../../../base/images/breadcrumb-slash-ie7.png") 100% 50% no-repeat; -} -.ie7 .toolbar .breadcrumb li.active { - background-image: none; -} -.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; -} -.ie7 .module-heading .media-content { - position: relative; -} -.ie7 .module-heading .media-image img { - float: left; -} -.ie7 .group-listing { - 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 cf1eca19a31..1e88c493b21 100644 --- a/ckan/public/base/css/green.css +++ b/ckan/public/base/css/green.css @@ -2298,8 +2298,8 @@ button.close { -moz-border-radius: 6px; border-radius: 6px; } -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { +.btn-large [class^="fa fa-"], +.btn-large [class*=" fa fa-"] { margin-top: 4px; } .btn-small { @@ -2309,12 +2309,12 @@ button.close { -moz-border-radius: 3px; border-radius: 3px; } -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { +.btn-small [class^="fa fa-"], +.btn-small [class*=" fa fa-"] { margin-top: 0; } -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { +.btn-mini [class^="fa fa-"], +.btn-mini [class*=" fa fa-"] { margin-top: -1px; } .btn-mini { @@ -2915,8 +2915,8 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #2f9b45; } -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { +.nav-list [class^="fa fa-"], +.nav-list [class*=" fa fa-"] { margin-right: 2px; } .nav-list .divider { @@ -3483,7 +3483,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active { background-color: #cccccc \9; } -.navbar .btn-navbar .icon-bar { +.navbar .btn-navbar .fa-bar { display: block; width: 18px; height: 2px; @@ -3495,7 +3495,7 @@ input[type="submit"].btn.btn-mini { -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); } -.btn-navbar .icon-bar + .icon-bar { +.btn-navbar .fa-bar + .fa-bar { margin-top: 3px; } .navbar .nav > li > .dropdown-menu:before { @@ -6376,8 +6376,8 @@ textarea { .form-horizontal .info-inline:before { top: 8px; } -.info-block .icon-large, -.info-inline .icon-large { +.info-block .fa-lg, +.info-inline .fa-lg { float: left; font-size: 22px; margin-right: 15px; @@ -6912,7 +6912,7 @@ textarea { -moz-border-radius: 100px; border-radius: 100px; } -.js .image-upload .btn-remove-url .icon-remove { +.js .image-upload .btn-remove-url .fa-times { margin-right: 0; } .add-member-form .control-label { @@ -6975,7 +6975,7 @@ textarea { margin-right: 10px; text-transform: uppercase; } -.dataset-private .icon-lock { +.dataset-private .fa-lock { width: 9px; } .dataset-private.pull-right { @@ -7908,39 +7908,39 @@ h4 small { height: 35px; background-position: -320px -62px; } -[class^="icon-"], -[class*=" icon-"] { +[class^="fa fa-"], +[class*=" fa fa-"] { display: inline-block; text-align: right; font-size: 14px; line-height: 1; width: 14px; } -.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-"] { +.btn [class^="fa fa-"], +.nav [class^="fa fa-"], +.module-heading [class^="fa fa-"], +.dropdown [class^="fa fa-"], +.btn [class*=" fa fa-"], +.nav [class*=" fa fa-"], +.module-heading [class*=" fa fa-"], +.dropdown [class*=" fa fa-"] { margin-right: 4px; } -.info-block [class^="icon-"], -.info-block [class*=" icon-"] { +.info-block [class^="fa fa-"], +.info-block [class*=" fa fa-"] { float: left; font-size: 28px; width: 28px; margin-right: 5px; margin-top: 2px; } -.breadcrumb .home .icon-home { +.breadcrumb .home .fa-home { font-size: 24px; width: 24px; vertical-align: -1px; } -.info-block-small [class^="icon-"], -.info-block-small [class*=" icon-"] { +.info-block-small [class^="fa fa-"], +.info-block-small [class*=" fa fa-"] { font-size: 14px; width: 14px; margin-top: 1px; @@ -8522,13 +8522,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.masthead .btn-navbar .icon-bar, -.masthead .btn-navbar:hover .icon-bar, -.masthead .btn-navbar:focus .icon-bar, -.masthead .btn-navbar:active .icon-bar, -.masthead .btn-navbar.active .icon-bar, -.masthead .btn-navbar.disabled .icon-bar, -.masthead .btn-navbar[disabled] .icon-bar { +.masthead .btn-navbar .fa-bar, +.masthead .btn-navbar:hover .fa-bar, +.masthead .btn-navbar:focus .fa-bar, +.masthead .btn-navbar:active .fa-bar, +.masthead .btn-navbar.active .fa-bar, +.masthead .btn-navbar.disabled .fa-bar, +.masthead .btn-navbar[disabled] .fa-bar { margin-right: 0; } .masthead .debug { @@ -8659,13 +8659,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.site-footer .btn-navbar .icon-bar, -.site-footer .btn-navbar:hover .icon-bar, -.site-footer .btn-navbar:focus .icon-bar, -.site-footer .btn-navbar:active .icon-bar, -.site-footer .btn-navbar.active .icon-bar, -.site-footer .btn-navbar.disabled .icon-bar, -.site-footer .btn-navbar[disabled] .icon-bar { +.site-footer .btn-navbar .fa-bar, +.site-footer .btn-navbar:hover .fa-bar, +.site-footer .btn-navbar:focus .fa-bar, +.site-footer .btn-navbar:active .fa-bar, +.site-footer .btn-navbar.active .fa-bar, +.site-footer .btn-navbar.disabled .fa-bar, +.site-footer .btn-navbar[disabled] .fa-bar { margin-right: 0; } .site-footer .debug { @@ -9313,197 +9313,25 @@ iframe { white-space: nowrap; } .ie9 .homepage .media.module-heading .media-image img, -.ie8 .homepage .media.module-heading .media-image img, -.ie7 .homepage .media.module-heading .media-image img { +.ie8 .homepage .media.module-heading .media-image img { width: 85px !important; } -.ie8 .masthead .nav-collapse, -.ie7 .masthead .nav-collapse { +.ie8 .masthead .nav-collapse { float: right; } .ie8 [role=main], -.ie7 [role=main], -.ie8 .main, -.ie7 .main { +.ie8 .main { padding-top: 10px; background: #eeeeee url("../../../base/images/bg.png"); } -.ie8 .hero, -.ie7 .hero { +.ie8 .hero { background: url("../../../base/images/background-tile.png"); } -.ie8 .hero .hero-primary.module-popup .box, -.ie7 .hero .hero-primary.module-popup .box { +.ie8 .hero .hero-primary.module-popup .box { padding-bottom: 20px !important; margin-bottom: 0 !important; } -.ie8 .lang-dropdown, -.ie7 .lang-dropdown { +.ie8 .lang-dropdown { position: relative !important; top: -90px !important; } -.ie7 .alert { - position: relative; -} -.ie7 .alert .close { - position: absolute; - top: 6px !important; - right: 20px; -} -.ie7 .media-item { - width: 30%; -} -.ie7 .tags .tag-list { - *zoom: 1; -} -.ie7 .tags .tag-list:before, -.ie7 .tags .tag-list:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .tags .tag-list:after { - clear: both; -} -.ie7 .tags .tag-list li { - display: block; - float: left; -} -.ie7 .tags h3 { - float: left; -} -.ie7 .tags .tag { - display: block; -} -.ie7 .search-giant input { - width: 95%; -} -.ie7 .control-full input, -.ie7 .control-full select, -.ie7 .control-full textarea { - width: 95%; -} -.ie7 .control-full.control-large .controls input { - padding-bottom: 20px; -} -.ie7 .controls { - position: relative; -} -.ie7 .controls .info-block, -.ie7 .controls .info-inline { - position: absolute; - top: 0; - right: 0; -} -.ie7 .form-horizontal .controls { - margin-left: 0; -} -.ie7 .control-custom .checkbox { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .stages { - overflow: hidden; - background-color: #ededed; -} -.ie7 .stages li { - height: 30px; - width: 27.5%; -} -.ie7 .stages li button, -.ie7 .stages li span { - display: block; - height: 30px; - padding-left: 20px; -} -.ie7 .stages li button { - height: 50px; -} -.ie7 .stages li .highlight { - width: auto; -} -.ie7 .account-masthead .account a i { - line-height: 31px; -} -.ie7 .masthead { - position: relative; - z-index: 1; -} -.ie7 .masthead .logo img, -.ie7 .masthead nav { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .masthead .header-image { - display: block; -} -.ie7 .masthead .account .dropdown-menu { - z-index: 10000; -} -.ie7 .module-narrow .nav-item.image { - *zoom: 1; -} -.ie7 .module-narrow .nav-item.image:before, -.ie7 .module-narrow .nav-item.image:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .module-narrow .nav-item.image:after { - clear: both; -} -.ie7 .nav-facet .nav-item.active a { - content: 'x'; -} -.ie7 .toolbar .breadcrumb li { - padding-right: 10px; - margin-right: 5px; - background: transparent url("../../../base/images/breadcrumb-slash-ie7.png") 100% 50% no-repeat; -} -.ie7 .toolbar .breadcrumb li.active { - background-image: none; -} -.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; -} -.ie7 .module-heading .media-content { - position: relative; -} -.ie7 .module-heading .media-image img { - float: left; -} -.ie7 .group-listing { - 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 937787aab93..637aa850fe8 100644 --- a/ckan/public/base/css/main.css +++ b/ckan/public/base/css/main.css @@ -2298,8 +2298,8 @@ button.close { -moz-border-radius: 6px; border-radius: 6px; } -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { +.btn-large [class^="fa fa-"], +.btn-large [class*=" fa fa-"] { margin-top: 4px; } .btn-small { @@ -2309,12 +2309,12 @@ button.close { -moz-border-radius: 3px; border-radius: 3px; } -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { +.btn-small [class^="fa fa-"], +.btn-small [class*=" fa fa-"] { margin-top: 0; } -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { +.btn-mini [class^="fa fa-"], +.btn-mini [class*=" fa fa-"] { margin-top: -1px; } .btn-mini { @@ -2915,8 +2915,8 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #187794; } -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { +.nav-list [class^="fa fa-"], +.nav-list [class*=" fa fa-"] { margin-right: 2px; } .nav-list .divider { @@ -3483,7 +3483,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active { background-color: #cccccc \9; } -.navbar .btn-navbar .icon-bar { +.navbar .btn-navbar .fa-bar { display: block; width: 18px; height: 2px; @@ -3495,7 +3495,7 @@ input[type="submit"].btn.btn-mini { -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); } -.btn-navbar .icon-bar + .icon-bar { +.btn-navbar .fa-bar + .fa-bar { margin-top: 3px; } .navbar .nav > li > .dropdown-menu:before { @@ -6376,8 +6376,8 @@ textarea { .form-horizontal .info-inline:before { top: 8px; } -.info-block .icon-large, -.info-inline .icon-large { +.info-block .fa-lg, +.info-inline .fa-lg { float: left; font-size: 22px; margin-right: 15px; @@ -6912,7 +6912,7 @@ textarea { -moz-border-radius: 100px; border-radius: 100px; } -.js .image-upload .btn-remove-url .icon-remove { +.js .image-upload .btn-remove-url .fa-times { margin-right: 0; } .add-member-form .control-label { @@ -6975,7 +6975,7 @@ textarea { margin-right: 10px; text-transform: uppercase; } -.dataset-private .icon-lock { +.dataset-private .fa-lock { width: 9px; } .dataset-private.pull-right { @@ -7908,39 +7908,40 @@ h4 small { height: 35px; background-position: -320px -62px; } -[class^="icon-"], -[class*=" icon-"] { + +[class^="fa fa-"], +[class*=" fa fa-"] { display: inline-block; text-align: right; font-size: 14px; line-height: 1; width: 14px; } -.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-"] { +.btn [class^="fa fa-"], +.nav [class^="fa fa-"], +.module-heading [class^="fa fa-"], +.dropdown [class^="fa fa-"], +.btn [class*=" fa fa-"], +.nav [class*=" fa fa-"], +.module-heading [class*=" fa fa-"], +.dropdown [class*=" fa fa-"] { margin-right: 4px; } -.info-block [class^="icon-"], -.info-block [class*=" icon-"] { +.info-block [class^="fa fa-"], +.info-block [class*=" fa fa-"] { float: left; font-size: 28px; width: 28px; margin-right: 5px; margin-top: 2px; } -.breadcrumb .home .icon-home { +.breadcrumb .home .fa-home { font-size: 24px; width: 24px; vertical-align: -1px; } -.info-block-small [class^="icon-"], -.info-block-small [class*=" icon-"] { +.info-block-small [class^="fa fa-"], +.info-block-small [class*=" fa fa-"] { font-size: 14px; width: 14px; margin-top: 1px; @@ -8522,13 +8523,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.masthead .btn-navbar .icon-bar, -.masthead .btn-navbar:hover .icon-bar, -.masthead .btn-navbar:focus .icon-bar, -.masthead .btn-navbar:active .icon-bar, -.masthead .btn-navbar.active .icon-bar, -.masthead .btn-navbar.disabled .icon-bar, -.masthead .btn-navbar[disabled] .icon-bar { +.masthead .btn-navbar .fa-bar, +.masthead .btn-navbar:hover .fa-bar, +.masthead .btn-navbar:focus .fa-bar, +.masthead .btn-navbar:active .fa-bar, +.masthead .btn-navbar.active .fa-bar, +.masthead .btn-navbar.disabled .fa-bar, +.masthead .btn-navbar[disabled] .fa-bar { margin-right: 0; } .masthead .debug { @@ -8659,13 +8660,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.site-footer .btn-navbar .icon-bar, -.site-footer .btn-navbar:hover .icon-bar, -.site-footer .btn-navbar:focus .icon-bar, -.site-footer .btn-navbar:active .icon-bar, -.site-footer .btn-navbar.active .icon-bar, -.site-footer .btn-navbar.disabled .icon-bar, -.site-footer .btn-navbar[disabled] .icon-bar { +.site-footer .btn-navbar .fa-bar, +.site-footer .btn-navbar:hover .fa-bar, +.site-footer .btn-navbar:focus .fa-bar, +.site-footer .btn-navbar:active .fa-bar, +.site-footer .btn-navbar.active .fa-bar, +.site-footer .btn-navbar.disabled .fa-bar, +.site-footer .btn-navbar[disabled] .fa-bar { margin-right: 0; } .site-footer .debug { @@ -9313,197 +9314,25 @@ iframe { white-space: nowrap; } .ie9 .homepage .media.module-heading .media-image img, -.ie8 .homepage .media.module-heading .media-image img, -.ie7 .homepage .media.module-heading .media-image img { +.ie8 .homepage .media.module-heading .media-image img { width: 85px !important; } -.ie8 .masthead .nav-collapse, -.ie7 .masthead .nav-collapse { +.ie8 .masthead .nav-collapse { float: right; } .ie8 [role=main], -.ie7 [role=main], -.ie8 .main, -.ie7 .main { +.ie8 .main { padding-top: 10px; background: #eeeeee url("../../../base/images/bg.png"); } -.ie8 .hero, -.ie7 .hero { +.ie8 .hero { background: url("../../../base/images/background-tile.png"); } -.ie8 .hero .hero-primary.module-popup .box, -.ie7 .hero .hero-primary.module-popup .box { +.ie8 .hero .hero-primary.module-popup .box { padding-bottom: 20px !important; margin-bottom: 0 !important; } -.ie8 .lang-dropdown, -.ie7 .lang-dropdown { +.ie8 .lang-dropdown { position: relative !important; top: -90px !important; } -.ie7 .alert { - position: relative; -} -.ie7 .alert .close { - position: absolute; - top: 6px !important; - right: 20px; -} -.ie7 .media-item { - width: 30%; -} -.ie7 .tags .tag-list { - *zoom: 1; -} -.ie7 .tags .tag-list:before, -.ie7 .tags .tag-list:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .tags .tag-list:after { - clear: both; -} -.ie7 .tags .tag-list li { - display: block; - float: left; -} -.ie7 .tags h3 { - float: left; -} -.ie7 .tags .tag { - display: block; -} -.ie7 .search-giant input { - width: 95%; -} -.ie7 .control-full input, -.ie7 .control-full select, -.ie7 .control-full textarea { - width: 95%; -} -.ie7 .control-full.control-large .controls input { - padding-bottom: 20px; -} -.ie7 .controls { - position: relative; -} -.ie7 .controls .info-block, -.ie7 .controls .info-inline { - position: absolute; - top: 0; - right: 0; -} -.ie7 .form-horizontal .controls { - margin-left: 0; -} -.ie7 .control-custom .checkbox { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .stages { - overflow: hidden; - background-color: #ededed; -} -.ie7 .stages li { - height: 30px; - width: 27.5%; -} -.ie7 .stages li button, -.ie7 .stages li span { - display: block; - height: 30px; - padding-left: 20px; -} -.ie7 .stages li button { - height: 50px; -} -.ie7 .stages li .highlight { - width: auto; -} -.ie7 .account-masthead .account a i { - line-height: 31px; -} -.ie7 .masthead { - position: relative; - z-index: 1; -} -.ie7 .masthead .logo img, -.ie7 .masthead nav { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .masthead .header-image { - display: block; -} -.ie7 .masthead .account .dropdown-menu { - z-index: 10000; -} -.ie7 .module-narrow .nav-item.image { - *zoom: 1; -} -.ie7 .module-narrow .nav-item.image:before, -.ie7 .module-narrow .nav-item.image:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .module-narrow .nav-item.image:after { - clear: both; -} -.ie7 .nav-facet .nav-item.active a { - content: 'x'; -} -.ie7 .toolbar .breadcrumb li { - padding-right: 10px; - margin-right: 5px; - background: transparent url("../../../base/images/breadcrumb-slash-ie7.png") 100% 50% no-repeat; -} -.ie7 .toolbar .breadcrumb li.active { - background-image: none; -} -.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; -} -.ie7 .module-heading .media-content { - position: relative; -} -.ie7 .module-heading .media-image img { - float: left; -} -.ie7 .group-listing { - 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/maroon.css b/ckan/public/base/css/maroon.css index 5c1515ca9c2..e8489a70022 100644 --- a/ckan/public/base/css/maroon.css +++ b/ckan/public/base/css/maroon.css @@ -2298,8 +2298,8 @@ button.close { -moz-border-radius: 6px; border-radius: 6px; } -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { +.btn-large [class^="fa fa-"], +.btn-large [class*=" fa fa-"] { margin-top: 4px; } .btn-small { @@ -2309,12 +2309,12 @@ button.close { -moz-border-radius: 3px; border-radius: 3px; } -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { +.btn-small [class^="fa fa-"], +.btn-small [class*=" fa fa-"] { margin-top: 0; } -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { +.btn-mini [class^="fa fa-"], +.btn-mini [class*=" fa fa-"] { margin-top: -1px; } .btn-mini { @@ -2915,8 +2915,8 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #810606; } -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { +.nav-list [class^="fa fa-"], +.nav-list [class*=" fa fa-"] { margin-right: 2px; } .nav-list .divider { @@ -3483,7 +3483,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active { background-color: #cccccc \9; } -.navbar .btn-navbar .icon-bar { +.navbar .btn-navbar .fa-bar { display: block; width: 18px; height: 2px; @@ -3495,7 +3495,7 @@ input[type="submit"].btn.btn-mini { -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); } -.btn-navbar .icon-bar + .icon-bar { +.btn-navbar .fa-bar + .fa-bar { margin-top: 3px; } .navbar .nav > li > .dropdown-menu:before { @@ -6376,8 +6376,8 @@ textarea { .form-horizontal .info-inline:before { top: 8px; } -.info-block .icon-large, -.info-inline .icon-large { +.info-block .fa-lg, +.info-inline .fa-lg { float: left; font-size: 22px; margin-right: 15px; @@ -6912,7 +6912,7 @@ textarea { -moz-border-radius: 100px; border-radius: 100px; } -.js .image-upload .btn-remove-url .icon-remove { +.js .image-upload .btn-remove-url .fa-times { margin-right: 0; } .add-member-form .control-label { @@ -6975,7 +6975,7 @@ textarea { margin-right: 10px; text-transform: uppercase; } -.dataset-private .icon-lock { +.dataset-private .fa-lock { width: 9px; } .dataset-private.pull-right { @@ -7908,39 +7908,39 @@ h4 small { height: 35px; background-position: -320px -62px; } -[class^="icon-"], -[class*=" icon-"] { +[class^="fa fa-"], +[class*=" fa fa-"] { display: inline-block; text-align: right; font-size: 14px; line-height: 1; width: 14px; } -.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-"] { +.btn [class^="fa fa-"], +.nav [class^="fa fa-"], +.module-heading [class^="fa fa-"], +.dropdown [class^="fa fa-"], +.btn [class*=" fa fa-"], +.nav [class*=" fa fa-"], +.module-heading [class*=" fa fa-"], +.dropdown [class*=" fa fa-"] { margin-right: 4px; } -.info-block [class^="icon-"], -.info-block [class*=" icon-"] { +.info-block [class^="fa fa-"], +.info-block [class*=" fa fa-"] { float: left; font-size: 28px; width: 28px; margin-right: 5px; margin-top: 2px; } -.breadcrumb .home .icon-home { +.breadcrumb .home .fa-home { font-size: 24px; width: 24px; vertical-align: -1px; } -.info-block-small [class^="icon-"], -.info-block-small [class*=" icon-"] { +.info-block-small [class^="fa fa-"], +.info-block-small [class*=" fa fa-"] { font-size: 14px; width: 14px; margin-top: 1px; @@ -8522,13 +8522,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.masthead .btn-navbar .icon-bar, -.masthead .btn-navbar:hover .icon-bar, -.masthead .btn-navbar:focus .icon-bar, -.masthead .btn-navbar:active .icon-bar, -.masthead .btn-navbar.active .icon-bar, -.masthead .btn-navbar.disabled .icon-bar, -.masthead .btn-navbar[disabled] .icon-bar { +.masthead .btn-navbar .fa-bar, +.masthead .btn-navbar:hover .fa-bar, +.masthead .btn-navbar:focus .fa-bar, +.masthead .btn-navbar:active .fa-bar, +.masthead .btn-navbar.active .fa-bar, +.masthead .btn-navbar.disabled .fa-bar, +.masthead .btn-navbar[disabled] .fa-bar { margin-right: 0; } .masthead .debug { @@ -8659,13 +8659,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.site-footer .btn-navbar .icon-bar, -.site-footer .btn-navbar:hover .icon-bar, -.site-footer .btn-navbar:focus .icon-bar, -.site-footer .btn-navbar:active .icon-bar, -.site-footer .btn-navbar.active .icon-bar, -.site-footer .btn-navbar.disabled .icon-bar, -.site-footer .btn-navbar[disabled] .icon-bar { +.site-footer .btn-navbar .fa-bar, +.site-footer .btn-navbar:hover .fa-bar, +.site-footer .btn-navbar:focus .fa-bar, +.site-footer .btn-navbar:active .fa-bar, +.site-footer .btn-navbar.active .fa-bar, +.site-footer .btn-navbar.disabled .fa-bar, +.site-footer .btn-navbar[disabled] .fa-bar { margin-right: 0; } .site-footer .debug { @@ -9313,197 +9313,25 @@ iframe { white-space: nowrap; } .ie9 .homepage .media.module-heading .media-image img, -.ie8 .homepage .media.module-heading .media-image img, -.ie7 .homepage .media.module-heading .media-image img { +.ie8 .homepage .media.module-heading .media-image img { width: 85px !important; } -.ie8 .masthead .nav-collapse, -.ie7 .masthead .nav-collapse { +.ie8 .masthead .nav-collapse { float: right; } .ie8 [role=main], -.ie7 [role=main], -.ie8 .main, -.ie7 .main { +.ie8 .main { padding-top: 10px; background: #eeeeee url("../../../base/images/bg.png"); } -.ie8 .hero, -.ie7 .hero { +.ie8 .hero { background: url("../../../base/images/background-tile.png"); } -.ie8 .hero .hero-primary.module-popup .box, -.ie7 .hero .hero-primary.module-popup .box { +.ie8 .hero .hero-primary.module-popup .box { padding-bottom: 20px !important; margin-bottom: 0 !important; } -.ie8 .lang-dropdown, -.ie7 .lang-dropdown { +.ie8 .lang-dropdown { position: relative !important; top: -90px !important; } -.ie7 .alert { - position: relative; -} -.ie7 .alert .close { - position: absolute; - top: 6px !important; - right: 20px; -} -.ie7 .media-item { - width: 30%; -} -.ie7 .tags .tag-list { - *zoom: 1; -} -.ie7 .tags .tag-list:before, -.ie7 .tags .tag-list:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .tags .tag-list:after { - clear: both; -} -.ie7 .tags .tag-list li { - display: block; - float: left; -} -.ie7 .tags h3 { - float: left; -} -.ie7 .tags .tag { - display: block; -} -.ie7 .search-giant input { - width: 95%; -} -.ie7 .control-full input, -.ie7 .control-full select, -.ie7 .control-full textarea { - width: 95%; -} -.ie7 .control-full.control-large .controls input { - padding-bottom: 20px; -} -.ie7 .controls { - position: relative; -} -.ie7 .controls .info-block, -.ie7 .controls .info-inline { - position: absolute; - top: 0; - right: 0; -} -.ie7 .form-horizontal .controls { - margin-left: 0; -} -.ie7 .control-custom .checkbox { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .stages { - overflow: hidden; - background-color: #ededed; -} -.ie7 .stages li { - height: 30px; - width: 27.5%; -} -.ie7 .stages li button, -.ie7 .stages li span { - display: block; - height: 30px; - padding-left: 20px; -} -.ie7 .stages li button { - height: 50px; -} -.ie7 .stages li .highlight { - width: auto; -} -.ie7 .account-masthead .account a i { - line-height: 31px; -} -.ie7 .masthead { - position: relative; - z-index: 1; -} -.ie7 .masthead .logo img, -.ie7 .masthead nav { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .masthead .header-image { - display: block; -} -.ie7 .masthead .account .dropdown-menu { - z-index: 10000; -} -.ie7 .module-narrow .nav-item.image { - *zoom: 1; -} -.ie7 .module-narrow .nav-item.image:before, -.ie7 .module-narrow .nav-item.image:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .module-narrow .nav-item.image:after { - clear: both; -} -.ie7 .nav-facet .nav-item.active a { - content: 'x'; -} -.ie7 .toolbar .breadcrumb li { - padding-right: 10px; - margin-right: 5px; - background: transparent url("../../../base/images/breadcrumb-slash-ie7.png") 100% 50% no-repeat; -} -.ie7 .toolbar .breadcrumb li.active { - background-image: none; -} -.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; -} -.ie7 .module-heading .media-content { - position: relative; -} -.ie7 .module-heading .media-image img { - float: left; -} -.ie7 .group-listing { - 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 e1d29a42c52..d32e4fe0f6e 100644 --- a/ckan/public/base/css/red.css +++ b/ckan/public/base/css/red.css @@ -2298,8 +2298,8 @@ button.close { -moz-border-radius: 6px; border-radius: 6px; } -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { +.btn-large [class^="fa fa-"], +.btn-large [class*=" fa fa-"] { margin-top: 4px; } .btn-small { @@ -2309,12 +2309,12 @@ button.close { -moz-border-radius: 3px; border-radius: 3px; } -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { +.btn-small [class^="fa fa-"], +.btn-small [class*=" fa fa-"] { margin-top: 0; } -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { +.btn-mini [class^="fa fa-"], +.btn-mini [class*=" fa fa-"] { margin-top: -1px; } .btn-mini { @@ -2915,8 +2915,8 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #c14531; } -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { +.nav-list [class^="fa fa-"], +.nav-list [class*=" fa fa-"] { margin-right: 2px; } .nav-list .divider { @@ -3483,7 +3483,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active { background-color: #cccccc \9; } -.navbar .btn-navbar .icon-bar { +.navbar .btn-navbar .fa-bar { display: block; width: 18px; height: 2px; @@ -3495,7 +3495,7 @@ input[type="submit"].btn.btn-mini { -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); } -.btn-navbar .icon-bar + .icon-bar { +.btn-navbar .fa-bar + .fa-bar { margin-top: 3px; } .navbar .nav > li > .dropdown-menu:before { @@ -6376,8 +6376,8 @@ textarea { .form-horizontal .info-inline:before { top: 8px; } -.info-block .icon-large, -.info-inline .icon-large { +.info-block .fa-lg, +.info-inline .fa-lg { float: left; font-size: 22px; margin-right: 15px; @@ -6912,7 +6912,7 @@ textarea { -moz-border-radius: 100px; border-radius: 100px; } -.js .image-upload .btn-remove-url .icon-remove { +.js .image-upload .btn-remove-url .fa-times { margin-right: 0; } .add-member-form .control-label { @@ -6975,7 +6975,7 @@ textarea { margin-right: 10px; text-transform: uppercase; } -.dataset-private .icon-lock { +.dataset-private .fa-lock { width: 9px; } .dataset-private.pull-right { @@ -7908,39 +7908,39 @@ h4 small { height: 35px; background-position: -320px -62px; } -[class^="icon-"], -[class*=" icon-"] { +[class^="fa fa-"], +[class*=" fa fa-"] { display: inline-block; text-align: right; font-size: 14px; line-height: 1; width: 14px; } -.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-"] { +.btn [class^="fa fa-"], +.nav [class^="fa fa-"], +.module-heading [class^="fa fa-"], +.dropdown [class^="fa fa-"], +.btn [class*=" fa fa-"], +.nav [class*=" fa fa-"], +.module-heading [class*=" fa fa-"], +.dropdown [class*=" fa fa-"] { margin-right: 4px; } -.info-block [class^="icon-"], -.info-block [class*=" icon-"] { +.info-block [class^="fa fa-"], +.info-block [class*=" fa fa-"] { float: left; font-size: 28px; width: 28px; margin-right: 5px; margin-top: 2px; } -.breadcrumb .home .icon-home { +.breadcrumb .home .fa-home { font-size: 24px; width: 24px; vertical-align: -1px; } -.info-block-small [class^="icon-"], -.info-block-small [class*=" icon-"] { +.info-block-small [class^="fa fa-"], +.info-block-small [class*=" fa fa-"] { font-size: 14px; width: 14px; margin-top: 1px; @@ -8522,13 +8522,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.masthead .btn-navbar .icon-bar, -.masthead .btn-navbar:hover .icon-bar, -.masthead .btn-navbar:focus .icon-bar, -.masthead .btn-navbar:active .icon-bar, -.masthead .btn-navbar.active .icon-bar, -.masthead .btn-navbar.disabled .icon-bar, -.masthead .btn-navbar[disabled] .icon-bar { +.masthead .btn-navbar .fa-bar, +.masthead .btn-navbar:hover .fa-bar, +.masthead .btn-navbar:focus .fa-bar, +.masthead .btn-navbar:active .fa-bar, +.masthead .btn-navbar.active .fa-bar, +.masthead .btn-navbar.disabled .fa-bar, +.masthead .btn-navbar[disabled] .fa-bar { margin-right: 0; } .masthead .debug { @@ -8659,13 +8659,13 @@ h4 small { text-shadow: none; margin-top: 15px; } -.site-footer .btn-navbar .icon-bar, -.site-footer .btn-navbar:hover .icon-bar, -.site-footer .btn-navbar:focus .icon-bar, -.site-footer .btn-navbar:active .icon-bar, -.site-footer .btn-navbar.active .icon-bar, -.site-footer .btn-navbar.disabled .icon-bar, -.site-footer .btn-navbar[disabled] .icon-bar { +.site-footer .btn-navbar .fa-bar, +.site-footer .btn-navbar:hover .fa-bar, +.site-footer .btn-navbar:focus .fa-bar, +.site-footer .btn-navbar:active .fa-bar, +.site-footer .btn-navbar.active .fa-bar, +.site-footer .btn-navbar.disabled .fa-bar, +.site-footer .btn-navbar[disabled] .fa-bar { margin-right: 0; } .site-footer .debug { @@ -9313,197 +9313,25 @@ iframe { white-space: nowrap; } .ie9 .homepage .media.module-heading .media-image img, -.ie8 .homepage .media.module-heading .media-image img, -.ie7 .homepage .media.module-heading .media-image img { +.ie8 .homepage .media.module-heading .media-image img { width: 85px !important; } -.ie8 .masthead .nav-collapse, -.ie7 .masthead .nav-collapse { +.ie8 .masthead .nav-collapse { float: right; } .ie8 [role=main], -.ie7 [role=main], -.ie8 .main, -.ie7 .main { +.ie8 .main { padding-top: 10px; background: #eeeeee url("../../../base/images/bg.png"); } -.ie8 .hero, -.ie7 .hero { +.ie8 .hero { background: url("../../../base/images/background-tile.png"); } -.ie8 .hero .hero-primary.module-popup .box, -.ie7 .hero .hero-primary.module-popup .box { +.ie8 .hero .hero-primary.module-popup .box { padding-bottom: 20px !important; margin-bottom: 0 !important; } -.ie8 .lang-dropdown, -.ie7 .lang-dropdown { +.ie8 .lang-dropdown { position: relative !important; top: -90px !important; } -.ie7 .alert { - position: relative; -} -.ie7 .alert .close { - position: absolute; - top: 6px !important; - right: 20px; -} -.ie7 .media-item { - width: 30%; -} -.ie7 .tags .tag-list { - *zoom: 1; -} -.ie7 .tags .tag-list:before, -.ie7 .tags .tag-list:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .tags .tag-list:after { - clear: both; -} -.ie7 .tags .tag-list li { - display: block; - float: left; -} -.ie7 .tags h3 { - float: left; -} -.ie7 .tags .tag { - display: block; -} -.ie7 .search-giant input { - width: 95%; -} -.ie7 .control-full input, -.ie7 .control-full select, -.ie7 .control-full textarea { - width: 95%; -} -.ie7 .control-full.control-large .controls input { - padding-bottom: 20px; -} -.ie7 .controls { - position: relative; -} -.ie7 .controls .info-block, -.ie7 .controls .info-inline { - position: absolute; - top: 0; - right: 0; -} -.ie7 .form-horizontal .controls { - margin-left: 0; -} -.ie7 .control-custom .checkbox { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .stages { - overflow: hidden; - background-color: #ededed; -} -.ie7 .stages li { - height: 30px; - width: 27.5%; -} -.ie7 .stages li button, -.ie7 .stages li span { - display: block; - height: 30px; - padding-left: 20px; -} -.ie7 .stages li button { - height: 50px; -} -.ie7 .stages li .highlight { - width: auto; -} -.ie7 .account-masthead .account a i { - line-height: 31px; -} -.ie7 .masthead { - position: relative; - z-index: 1; -} -.ie7 .masthead .logo img, -.ie7 .masthead nav { - *display: inline; - /* IE7 inline-block hack */ - *zoom: 1; -} -.ie7 .masthead .header-image { - display: block; -} -.ie7 .masthead .account .dropdown-menu { - z-index: 10000; -} -.ie7 .module-narrow .nav-item.image { - *zoom: 1; -} -.ie7 .module-narrow .nav-item.image:before, -.ie7 .module-narrow .nav-item.image:after { - display: table; - content: ""; - line-height: 0; -} -.ie7 .module-narrow .nav-item.image:after { - clear: both; -} -.ie7 .nav-facet .nav-item.active a { - content: 'x'; -} -.ie7 .toolbar .breadcrumb li { - padding-right: 10px; - margin-right: 5px; - background: transparent url("../../../base/images/breadcrumb-slash-ie7.png") 100% 50% no-repeat; -} -.ie7 .toolbar .breadcrumb li.active { - background-image: none; -} -.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; -} -.ie7 .module-heading .media-content { - position: relative; -} -.ie7 .module-heading .media-image img { - float: left; -} -.ie7 .group-listing { - 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/client.js b/ckan/public/base/javascript/client.js index d2e3232b912..9dd75ea522f 100644 --- a/ckan/public/base/javascript/client.js +++ b/ckan/public/base/javascript/client.js @@ -309,7 +309,6 @@ * Returns an object of dataset keys. */ convertStorageMetadataToResource: function (meta) { - // TODO: Check this is supported by IE7. U believe that the IE // Date constructor chokes on hyphens and timezones. var modified = new Date(this.normalizeTimestamp(meta._last_modified)); var created = new Date(this.normalizeTimestamp(meta._creation_date)); diff --git a/ckan/public/base/javascript/main.js b/ckan/public/base/javascript/main.js index 1df0c2802cf..27ba0e22f86 100644 --- a/ckan/public/base/javascript/main.js +++ b/ckan/public/base/javascript/main.js @@ -91,16 +91,6 @@ this.ckan = this.ckan || {}; })(this.ckan, this.jQuery); -// Forces this to redraw in Internet Explorer 7 -// 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('html').hasClass('ie7')) { - jQuery(this).css('zoom', 1); - } -}; - - // Show / hide filters for mobile $(function() { $(".show-filters").click(function() { diff --git a/ckan/public/base/javascript/modules/basic-form.js b/ckan/public/base/javascript/modules/basic-form.js index dfd498a2a29..c1ef2da923f 100644 --- a/ckan/public/base/javascript/modules/basic-form.js +++ b/ckan/public/base/javascript/modules/basic-form.js @@ -3,16 +3,6 @@ this.ckan.module('basic-form', function (jQuery, _) { initialize: function () { var message = _('There are unsaved modifications to this form').fetch(); this.el.incompleteFormWarning(message); - // Internet Explorer 7 fix for forms with
- User + User
    @@ -1226,7 +1226,7 @@

    Buttons

    Mini buttons: text and icon

    - +

    diff --git a/ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html b/ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html index 2d9a7a718c2..6f4be2dfc63 100755 --- a/ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html +++ b/ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html @@ -37,9 +37,9 @@
    - - - + + + Project name
    diff --git a/ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html b/ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html index 4bead8ec672..1881e131ae3 100755 --- a/ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html +++ b/ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html @@ -39,9 +39,9 @@
    - - - + + + Project name
    diff --git a/ckan/public/base/vendor/bootstrap/less/tests/navbar.html b/ckan/public/base/vendor/bootstrap/less/tests/navbar.html index d5ad4784ef6..79c302f6222 100755 --- a/ckan/public/base/vendor/bootstrap/less/tests/navbar.html +++ b/ckan/public/base/vendor/bootstrap/less/tests/navbar.html @@ -42,9 +42,9 @@
    - - - + + + Project name
    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 deleted file mode 100644 index 17f07766c42..00000000000 --- a/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css +++ /dev/null @@ -1,1203 +0,0 @@ -/*! - * 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 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 - * - 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://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; - 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-ie7.min.css b/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css deleted file mode 100644 index d3dae63bd8b..00000000000 --- a/ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css +++ /dev/null @@ -1,384 +0,0 @@ -.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 index 7ede1828a78..048cff97398 100644 --- a/ckan/public/base/vendor/font-awesome/css/font-awesome.css +++ b/ckan/public/base/vendor/font-awesome/css/font-awesome.css @@ -1,145 +1,69 @@ /*! - * 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 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 - * - 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://fontawesome.io" - * - * Author - Dave Gandy - * ------------------------------------------------------------------------------ - * Email: dave@fontawesome.io - * Twitter: http://twitter.com/davegandy - * Work: Lead Product Designer @ Kyruus - http://kyruus.com + * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @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'); + src: url('../fonts/fontawesome-webfont.eot?v=4.0.3'); + src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } -/* FONT AWESOME CORE - * -------------------------- */ -[class^="icon-"], -[class*=" icon-"] { +.fa { + display: inline-block; font-family: FontAwesome; - font-weight: normal; font-style: normal; - text-decoration: inherit; + font-weight: normal; + line-height: 1; -webkit-font-smoothing: antialiased; - *margin-right: .3em; -} -[class^="icon-"]:before, -[class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; - speak: none; + -moz-osx-font-smoothing: grayscale; } /* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; +.fa-lg { font-size: 1.3333333333333333em; + line-height: 0.75em; + vertical-align: -15%; } -/* makes sure icons active on rollover in links */ -a [class^="icon-"], -a [class*=" icon-"] { - display: inline; +.fa-2x { + font-size: 2em; } -/* 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; +.fa-3x { + font-size: 3em; } -[class^="icon-"].icon-fixed-width.icon-large, -[class*=" icon-"].icon-fixed-width.icon-large { - width: 1.4285714285714286em; +.fa-4x { + font-size: 4em; +} +.fa-5x { + font-size: 5em; } -.icons-ul { +.fa-fw { + width: 1.2857142857142858em; + text-align: center; +} +.fa-ul { + padding-left: 0; margin-left: 2.142857142857143em; list-style-type: none; } -.icons-ul > li { +.fa-ul > li { position: relative; } -.icons-ul .icon-li { +.fa-li { position: absolute; left: -2.142857142857143em; width: 2.142857142857143em; + top: 0.14285714285714285em; text-align: center; - line-height: inherit; } -[class^="icon-"].hide, -[class*=" icon-"].hide { - display: none; -} -.icon-muted { - color: #eeeeee; -} -.icon-light { - color: #ffffff; +.fa-li.fa-lg { + left: -1.8571428571428572em; } -.icon-dark { - color: #333333; -} -.icon-border { - border: solid 1px #eeeeee; +.fa-border { 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; + border: solid 0.08em #eeeeee; + border-radius: .1em; } .pull-right { float: right; @@ -147,147 +71,18 @@ a [class*=" icon-"] { .pull-left { float: left; } -[class^="icon-"].pull-left, -[class*=" icon-"].pull-left { +.fa.pull-left { margin-right: .3em; } -[class^="icon-"].pull-right, -[class*=" icon-"].pull-right { +.fa.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, -.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; -} -/* 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; +.fa-spin { + -webkit-animation: spin 2s infinite linear; -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); @@ -328,1152 +123,1216 @@ a .icon-spin { transform: rotate(359deg); } } -/* Icon rotations and mirroring */ -.icon-rotate-90:before { +.fa-rotate-90 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); -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 { +.fa-rotate-180 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -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 { +.fa-rotate-270 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -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 { +.fa-flip-horizontal { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1); -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 { +.fa-flip-vertical { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1); -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 { +.fa-stack { + position: relative; display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: middle; +} +.fa-stack-1x, +.fa-stack-2x { + position: absolute; + left: 0; + width: 100%; + text-align: center; +} +.fa-stack-1x { + line-height: inherit; +} +.fa-stack-2x { + font-size: 2em; +} +.fa-inverse { + 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 { +.fa-glass:before { content: "\f000"; } -.icon-music:before { +.fa-music:before { content: "\f001"; } -.icon-search:before { +.fa-search:before { content: "\f002"; } -.icon-envelope-alt:before { +.fa-envelope-o:before { content: "\f003"; } -.icon-heart:before { +.fa-heart:before { content: "\f004"; } -.icon-star:before { +.fa-star:before { content: "\f005"; } -.icon-star-empty:before { +.fa-star-o:before { content: "\f006"; } -.icon-user:before { +.fa-user:before { content: "\f007"; } -.icon-film:before { +.fa-film:before { content: "\f008"; } -.icon-th-large:before { +.fa-th-large:before { content: "\f009"; } -.icon-th:before { +.fa-th:before { content: "\f00a"; } -.icon-th-list:before { +.fa-th-list:before { content: "\f00b"; } -.icon-ok:before { +.fa-check:before { content: "\f00c"; } -.icon-remove:before { +.fa-times:before { content: "\f00d"; } -.icon-zoom-in:before { +.fa-search-plus:before { content: "\f00e"; } -.icon-zoom-out:before { +.fa-search-minus:before { content: "\f010"; } -.icon-power-off:before, -.icon-off:before { +.fa-power-off:before { content: "\f011"; } -.icon-signal:before { +.fa-signal:before { content: "\f012"; } -.icon-gear:before, -.icon-cog:before { +.fa-gear:before, +.fa-cog:before { content: "\f013"; } -.icon-trash:before { +.fa-trash-o:before { content: "\f014"; } -.icon-home:before { +.fa-home:before { content: "\f015"; } -.icon-file-alt:before { +.fa-file-o:before { content: "\f016"; } -.icon-time:before { +.fa-clock-o:before { content: "\f017"; } -.icon-road:before { +.fa-road:before { content: "\f018"; } -.icon-download-alt:before { +.fa-download:before { content: "\f019"; } -.icon-download:before { +.fa-arrow-circle-o-down:before { content: "\f01a"; } -.icon-upload:before { +.fa-arrow-circle-o-up:before { content: "\f01b"; } -.icon-inbox:before { +.fa-inbox:before { content: "\f01c"; } -.icon-play-circle:before { +.fa-play-circle-o:before { content: "\f01d"; } -.icon-rotate-right:before, -.icon-repeat:before { +.fa-rotate-right:before, +.fa-repeat:before { content: "\f01e"; } -.icon-refresh:before { +.fa-refresh:before { content: "\f021"; } -.icon-list-alt:before { +.fa-list-alt:before { content: "\f022"; } -.icon-lock:before { +.fa-lock:before { content: "\f023"; } -.icon-flag:before { +.fa-flag:before { content: "\f024"; } -.icon-headphones:before { +.fa-headphones:before { content: "\f025"; } -.icon-volume-off:before { +.fa-volume-off:before { content: "\f026"; } -.icon-volume-down:before { +.fa-volume-down:before { content: "\f027"; } -.icon-volume-up:before { +.fa-volume-up:before { content: "\f028"; } -.icon-qrcode:before { +.fa-qrcode:before { content: "\f029"; } -.icon-barcode:before { +.fa-barcode:before { content: "\f02a"; } -.icon-tag:before { +.fa-tag:before { content: "\f02b"; } -.icon-tags:before { +.fa-tags:before { content: "\f02c"; } -.icon-book:before { +.fa-book:before { content: "\f02d"; } -.icon-bookmark:before { +.fa-bookmark:before { content: "\f02e"; } -.icon-print:before { +.fa-print:before { content: "\f02f"; } -.icon-camera:before { +.fa-camera:before { content: "\f030"; } -.icon-font:before { +.fa-font:before { content: "\f031"; } -.icon-bold:before { +.fa-bold:before { content: "\f032"; } -.icon-italic:before { +.fa-italic:before { content: "\f033"; } -.icon-text-height:before { +.fa-text-height:before { content: "\f034"; } -.icon-text-width:before { +.fa-text-width:before { content: "\f035"; } -.icon-align-left:before { +.fa-align-left:before { content: "\f036"; } -.icon-align-center:before { +.fa-align-center:before { content: "\f037"; } -.icon-align-right:before { +.fa-align-right:before { content: "\f038"; } -.icon-align-justify:before { +.fa-align-justify:before { content: "\f039"; } -.icon-list:before { +.fa-list:before { content: "\f03a"; } -.icon-indent-left:before { +.fa-dedent:before, +.fa-outdent:before { content: "\f03b"; } -.icon-indent-right:before { +.fa-indent:before { content: "\f03c"; } -.icon-facetime-video:before { +.fa-video-camera:before { content: "\f03d"; } -.icon-picture:before { +.fa-picture-o:before { content: "\f03e"; } -.icon-pencil:before { +.fa-pencil:before { content: "\f040"; } -.icon-map-marker:before { +.fa-map-marker:before { content: "\f041"; } -.icon-adjust:before { +.fa-adjust:before { content: "\f042"; } -.icon-tint:before { +.fa-tint:before { content: "\f043"; } -.icon-edit:before { +.fa-edit:before, +.fa-pencil-square-o:before { content: "\f044"; } -.icon-share:before { +.fa-share-square-o:before { content: "\f045"; } -.icon-check:before { +.fa-check-square-o:before { content: "\f046"; } -.icon-move:before { +.fa-arrows:before { content: "\f047"; } -.icon-step-backward:before { +.fa-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { +.fa-fast-backward:before { content: "\f049"; } -.icon-backward:before { +.fa-backward:before { content: "\f04a"; } -.icon-play:before { +.fa-play:before { content: "\f04b"; } -.icon-pause:before { +.fa-pause:before { content: "\f04c"; } -.icon-stop:before { +.fa-stop:before { content: "\f04d"; } -.icon-forward:before { +.fa-forward:before { content: "\f04e"; } -.icon-fast-forward:before { +.fa-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { +.fa-step-forward:before { content: "\f051"; } -.icon-eject:before { +.fa-eject:before { content: "\f052"; } -.icon-chevron-left:before { +.fa-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { +.fa-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { +.fa-plus-circle:before { content: "\f055"; } -.icon-minus-sign:before { +.fa-minus-circle:before { content: "\f056"; } -.icon-remove-sign:before { +.fa-times-circle:before { content: "\f057"; } -.icon-ok-sign:before { +.fa-check-circle:before { content: "\f058"; } -.icon-question-sign:before { +.fa-question-circle:before { content: "\f059"; } -.icon-info-sign:before { +.fa-info-circle:before { content: "\f05a"; } -.icon-screenshot:before { +.fa-crosshairs:before { content: "\f05b"; } -.icon-remove-circle:before { +.fa-times-circle-o:before { content: "\f05c"; } -.icon-ok-circle:before { +.fa-check-circle-o:before { content: "\f05d"; } -.icon-ban-circle:before { +.fa-ban:before { content: "\f05e"; } -.icon-arrow-left:before { +.fa-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { +.fa-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { +.fa-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { +.fa-arrow-down:before { content: "\f063"; } -.icon-mail-forward:before, -.icon-share-alt:before { +.fa-mail-forward:before, +.fa-share:before { content: "\f064"; } -.icon-resize-full:before { +.fa-expand:before { content: "\f065"; } -.icon-resize-small:before { +.fa-compress:before { content: "\f066"; } -.icon-plus:before { +.fa-plus:before { content: "\f067"; } -.icon-minus:before { +.fa-minus:before { content: "\f068"; } -.icon-asterisk:before { +.fa-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { +.fa-exclamation-circle:before { content: "\f06a"; } -.icon-gift:before { +.fa-gift:before { content: "\f06b"; } -.icon-leaf:before { +.fa-leaf:before { content: "\f06c"; } -.icon-fire:before { +.fa-fire:before { content: "\f06d"; } -.icon-eye-open:before { +.fa-eye:before { content: "\f06e"; } -.icon-eye-close:before { +.fa-eye-slash:before { content: "\f070"; } -.icon-warning-sign:before { +.fa-warning:before, +.fa-exclamation-triangle:before { content: "\f071"; } -.icon-plane:before { +.fa-plane:before { content: "\f072"; } -.icon-calendar:before { +.fa-calendar:before { content: "\f073"; } -.icon-random:before { +.fa-random:before { content: "\f074"; } -.icon-comment:before { +.fa-comment:before { content: "\f075"; } -.icon-magnet:before { +.fa-magnet:before { content: "\f076"; } -.icon-chevron-up:before { +.fa-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { +.fa-chevron-down:before { content: "\f078"; } -.icon-retweet:before { +.fa-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { +.fa-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { +.fa-folder:before { content: "\f07b"; } -.icon-folder-open:before { +.fa-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { +.fa-arrows-v:before { content: "\f07d"; } -.icon-resize-horizontal:before { +.fa-arrows-h:before { content: "\f07e"; } -.icon-bar-chart:before { +.fa-bar-chart-o:before { content: "\f080"; } -.icon-twitter-sign:before { +.fa-twitter-square:before { content: "\f081"; } -.icon-facebook-sign:before { +.fa-facebook-square:before { content: "\f082"; } -.icon-camera-retro:before { +.fa-camera-retro:before { content: "\f083"; } -.icon-key:before { +.fa-key:before { content: "\f084"; } -.icon-gears:before, -.icon-cogs:before { +.fa-gears:before, +.fa-cogs:before { content: "\f085"; } -.icon-comments:before { +.fa-comments:before { content: "\f086"; } -.icon-thumbs-up-alt:before { +.fa-thumbs-o-up:before { content: "\f087"; } -.icon-thumbs-down-alt:before { +.fa-thumbs-o-down:before { content: "\f088"; } -.icon-star-half:before { +.fa-star-half:before { content: "\f089"; } -.icon-heart-empty:before { +.fa-heart-o:before { content: "\f08a"; } -.icon-signout:before { +.fa-sign-out:before { content: "\f08b"; } -.icon-linkedin-sign:before { +.fa-linkedin-square:before { content: "\f08c"; } -.icon-pushpin:before { +.fa-thumb-tack:before { content: "\f08d"; } -.icon-external-link:before { +.fa-external-link:before { content: "\f08e"; } -.icon-signin:before { +.fa-sign-in:before { content: "\f090"; } -.icon-trophy:before { +.fa-trophy:before { content: "\f091"; } -.icon-github-sign:before { +.fa-github-square:before { content: "\f092"; } -.icon-upload-alt:before { +.fa-upload:before { content: "\f093"; } -.icon-lemon:before { +.fa-lemon-o:before { content: "\f094"; } -.icon-phone:before { +.fa-phone:before { content: "\f095"; } -.icon-unchecked:before, -.icon-check-empty:before { +.fa-square-o:before { content: "\f096"; } -.icon-bookmark-empty:before { +.fa-bookmark-o:before { content: "\f097"; } -.icon-phone-sign:before { +.fa-phone-square:before { content: "\f098"; } -.icon-twitter:before { +.fa-twitter:before { content: "\f099"; } -.icon-facebook:before { +.fa-facebook:before { content: "\f09a"; } -.icon-github:before { +.fa-github:before { content: "\f09b"; } -.icon-unlock:before { +.fa-unlock:before { content: "\f09c"; } -.icon-credit-card:before { +.fa-credit-card:before { content: "\f09d"; } -.icon-rss:before { +.fa-rss:before { content: "\f09e"; } -.icon-hdd:before { +.fa-hdd-o:before { content: "\f0a0"; } -.icon-bullhorn:before { +.fa-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { - content: "\f0a2"; +.fa-bell:before { + content: "\f0f3"; } -.icon-certificate:before { +.fa-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { +.fa-hand-o-right:before { content: "\f0a4"; } -.icon-hand-left:before { +.fa-hand-o-left:before { content: "\f0a5"; } -.icon-hand-up:before { +.fa-hand-o-up:before { content: "\f0a6"; } -.icon-hand-down:before { +.fa-hand-o-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { +.fa-arrow-circle-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { +.fa-arrow-circle-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { +.fa-arrow-circle-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { +.fa-arrow-circle-down:before { content: "\f0ab"; } -.icon-globe:before { +.fa-globe:before { content: "\f0ac"; } -.icon-wrench:before { +.fa-wrench:before { content: "\f0ad"; } -.icon-tasks:before { +.fa-tasks:before { content: "\f0ae"; } -.icon-filter:before { +.fa-filter:before { content: "\f0b0"; } -.icon-briefcase:before { +.fa-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { +.fa-arrows-alt:before { content: "\f0b2"; } -.icon-group:before { +.fa-group:before, +.fa-users:before { content: "\f0c0"; } -.icon-link:before { +.fa-chain:before, +.fa-link:before { content: "\f0c1"; } -.icon-cloud:before { +.fa-cloud:before { content: "\f0c2"; } -.icon-beaker:before { +.fa-flask:before { content: "\f0c3"; } -.icon-cut:before { +.fa-cut:before, +.fa-scissors:before { content: "\f0c4"; } -.icon-copy:before { +.fa-copy:before, +.fa-files-o:before { content: "\f0c5"; } -.icon-paperclip:before, -.icon-paper-clip:before { +.fa-paperclip:before { content: "\f0c6"; } -.icon-save:before { +.fa-save:before, +.fa-floppy-o:before { content: "\f0c7"; } -.icon-sign-blank:before { +.fa-square:before { content: "\f0c8"; } -.icon-reorder:before { +.fa-bars:before { content: "\f0c9"; } -.icon-list-ul:before { +.fa-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { +.fa-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { +.fa-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { +.fa-underline:before { content: "\f0cd"; } -.icon-table:before { +.fa-table:before { content: "\f0ce"; } -.icon-magic:before { +.fa-magic:before { content: "\f0d0"; } -.icon-truck:before { +.fa-truck:before { content: "\f0d1"; } -.icon-pinterest:before { +.fa-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { +.fa-pinterest-square:before { content: "\f0d3"; } -.icon-google-plus-sign:before { +.fa-google-plus-square:before { content: "\f0d4"; } -.icon-google-plus:before { +.fa-google-plus:before { content: "\f0d5"; } -.icon-money:before { +.fa-money:before { content: "\f0d6"; } -.icon-caret-down:before { +.fa-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { +.fa-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { +.fa-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { +.fa-caret-right:before { content: "\f0da"; } -.icon-columns:before { +.fa-columns:before { content: "\f0db"; } -.icon-sort:before { +.fa-unsorted:before, +.fa-sort:before { content: "\f0dc"; } -.icon-sort-down:before { +.fa-sort-down:before, +.fa-sort-asc:before { content: "\f0dd"; } -.icon-sort-up:before { +.fa-sort-up:before, +.fa-sort-desc:before { content: "\f0de"; } -.icon-envelope:before { +.fa-envelope:before { content: "\f0e0"; } -.icon-linkedin:before { +.fa-linkedin:before { content: "\f0e1"; } -.icon-rotate-left:before, -.icon-undo:before { +.fa-rotate-left:before, +.fa-undo:before { content: "\f0e2"; } -.icon-legal:before { +.fa-legal:before, +.fa-gavel:before { content: "\f0e3"; } -.icon-dashboard:before { +.fa-dashboard:before, +.fa-tachometer:before { content: "\f0e4"; } -.icon-comment-alt:before { +.fa-comment-o:before { content: "\f0e5"; } -.icon-comments-alt:before { +.fa-comments-o:before { content: "\f0e6"; } -.icon-bolt:before { +.fa-flash:before, +.fa-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { +.fa-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { +.fa-umbrella:before { content: "\f0e9"; } -.icon-paste:before { +.fa-paste:before, +.fa-clipboard:before { content: "\f0ea"; } -.icon-lightbulb:before { +.fa-lightbulb-o:before { content: "\f0eb"; } -.icon-exchange:before { +.fa-exchange:before { content: "\f0ec"; } -.icon-cloud-download:before { +.fa-cloud-download:before { content: "\f0ed"; } -.icon-cloud-upload:before { +.fa-cloud-upload:before { content: "\f0ee"; } -.icon-user-md:before { +.fa-user-md:before { content: "\f0f0"; } -.icon-stethoscope:before { +.fa-stethoscope:before { content: "\f0f1"; } -.icon-suitcase:before { +.fa-suitcase:before { content: "\f0f2"; } -.icon-bell-alt:before { - content: "\f0f3"; +.fa-bell-o:before { + content: "\f0a2"; } -.icon-coffee:before { +.fa-coffee:before { content: "\f0f4"; } -.icon-food:before { +.fa-cutlery:before { content: "\f0f5"; } -.icon-file-text-alt:before { +.fa-file-text-o:before { content: "\f0f6"; } -.icon-building:before { +.fa-building-o:before { content: "\f0f7"; } -.icon-hospital:before { +.fa-hospital-o:before { content: "\f0f8"; } -.icon-ambulance:before { +.fa-ambulance:before { content: "\f0f9"; } -.icon-medkit:before { +.fa-medkit:before { content: "\f0fa"; } -.icon-fighter-jet:before { +.fa-fighter-jet:before { content: "\f0fb"; } -.icon-beer:before { +.fa-beer:before { content: "\f0fc"; } -.icon-h-sign:before { +.fa-h-square:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { +.fa-plus-square:before { content: "\f0fe"; } -.icon-double-angle-left:before { +.fa-angle-double-left:before { content: "\f100"; } -.icon-double-angle-right:before { +.fa-angle-double-right:before { content: "\f101"; } -.icon-double-angle-up:before { +.fa-angle-double-up:before { content: "\f102"; } -.icon-double-angle-down:before { +.fa-angle-double-down:before { content: "\f103"; } -.icon-angle-left:before { +.fa-angle-left:before { content: "\f104"; } -.icon-angle-right:before { +.fa-angle-right:before { content: "\f105"; } -.icon-angle-up:before { +.fa-angle-up:before { content: "\f106"; } -.icon-angle-down:before { +.fa-angle-down:before { content: "\f107"; } -.icon-desktop:before { +.fa-desktop:before { content: "\f108"; } -.icon-laptop:before { +.fa-laptop:before { content: "\f109"; } -.icon-tablet:before { +.fa-tablet:before { content: "\f10a"; } -.icon-mobile-phone:before { +.fa-mobile-phone:before, +.fa-mobile:before { content: "\f10b"; } -.icon-circle-blank:before { +.fa-circle-o:before { content: "\f10c"; } -.icon-quote-left:before { +.fa-quote-left:before { content: "\f10d"; } -.icon-quote-right:before { +.fa-quote-right:before { content: "\f10e"; } -.icon-spinner:before { +.fa-spinner:before { content: "\f110"; } -.icon-circle:before { +.fa-circle:before { content: "\f111"; } -.icon-mail-reply:before, -.icon-reply:before { +.fa-mail-reply:before, +.fa-reply:before { content: "\f112"; } -.icon-github-alt:before { +.fa-github-alt:before { content: "\f113"; } -.icon-folder-close-alt:before { +.fa-folder-o:before { content: "\f114"; } -.icon-folder-open-alt:before { +.fa-folder-open-o:before { content: "\f115"; } -.icon-expand-alt:before { - content: "\f116"; -} -.icon-collapse-alt:before { - content: "\f117"; -} -.icon-smile:before { +.fa-smile-o:before { content: "\f118"; } -.icon-frown:before { +.fa-frown-o:before { content: "\f119"; } -.icon-meh:before { +.fa-meh-o:before { content: "\f11a"; } -.icon-gamepad:before { +.fa-gamepad:before { content: "\f11b"; } -.icon-keyboard:before { +.fa-keyboard-o:before { content: "\f11c"; } -.icon-flag-alt:before { +.fa-flag-o:before { content: "\f11d"; } -.icon-flag-checkered:before { +.fa-flag-checkered:before { content: "\f11e"; } -.icon-terminal:before { +.fa-terminal:before { content: "\f120"; } -.icon-code:before { +.fa-code:before { content: "\f121"; } -.icon-reply-all:before { +.fa-reply-all:before { content: "\f122"; } -.icon-mail-reply-all:before { +.fa-mail-reply-all:before { content: "\f122"; } -.icon-star-half-full:before, -.icon-star-half-empty:before { +.fa-star-half-empty:before, +.fa-star-half-full:before, +.fa-star-half-o:before { content: "\f123"; } -.icon-location-arrow:before { +.fa-location-arrow:before { content: "\f124"; } -.icon-crop:before { +.fa-crop:before { content: "\f125"; } -.icon-code-fork:before { +.fa-code-fork:before { content: "\f126"; } -.icon-unlink:before { +.fa-unlink:before, +.fa-chain-broken:before { content: "\f127"; } -.icon-question:before { +.fa-question:before { content: "\f128"; } -.icon-info:before { +.fa-info:before { content: "\f129"; } -.icon-exclamation:before { +.fa-exclamation:before { content: "\f12a"; } -.icon-superscript:before { +.fa-superscript:before { content: "\f12b"; } -.icon-subscript:before { +.fa-subscript:before { content: "\f12c"; } -.icon-eraser:before { +.fa-eraser:before { content: "\f12d"; } -.icon-puzzle-piece:before { +.fa-puzzle-piece:before { content: "\f12e"; } -.icon-microphone:before { +.fa-microphone:before { content: "\f130"; } -.icon-microphone-off:before { +.fa-microphone-slash:before { content: "\f131"; } -.icon-shield:before { +.fa-shield:before { content: "\f132"; } -.icon-calendar-empty:before { +.fa-calendar-o:before { content: "\f133"; } -.icon-fire-extinguisher:before { +.fa-fire-extinguisher:before { content: "\f134"; } -.icon-rocket:before { +.fa-rocket:before { content: "\f135"; } -.icon-maxcdn:before { +.fa-maxcdn:before { content: "\f136"; } -.icon-chevron-sign-left:before { +.fa-chevron-circle-left:before { content: "\f137"; } -.icon-chevron-sign-right:before { +.fa-chevron-circle-right:before { content: "\f138"; } -.icon-chevron-sign-up:before { +.fa-chevron-circle-up:before { content: "\f139"; } -.icon-chevron-sign-down:before { +.fa-chevron-circle-down:before { content: "\f13a"; } -.icon-html5:before { +.fa-html5:before { content: "\f13b"; } -.icon-css3:before { +.fa-css3:before { content: "\f13c"; } -.icon-anchor:before { +.fa-anchor:before { content: "\f13d"; } -.icon-unlock-alt:before { +.fa-unlock-alt:before { content: "\f13e"; } -.icon-bullseye:before { +.fa-bullseye:before { content: "\f140"; } -.icon-ellipsis-horizontal:before { +.fa-ellipsis-h:before { content: "\f141"; } -.icon-ellipsis-vertical:before { +.fa-ellipsis-v:before { content: "\f142"; } -.icon-rss-sign:before { +.fa-rss-square:before { content: "\f143"; } -.icon-play-sign:before { +.fa-play-circle:before { content: "\f144"; } -.icon-ticket:before { +.fa-ticket:before { content: "\f145"; } -.icon-minus-sign-alt:before { +.fa-minus-square:before { content: "\f146"; } -.icon-check-minus:before { +.fa-minus-square-o:before { content: "\f147"; } -.icon-level-up:before { +.fa-level-up:before { content: "\f148"; } -.icon-level-down:before { +.fa-level-down:before { content: "\f149"; } -.icon-check-sign:before { +.fa-check-square:before { content: "\f14a"; } -.icon-edit-sign:before { +.fa-pencil-square:before { content: "\f14b"; } -.icon-external-link-sign:before { +.fa-external-link-square:before { content: "\f14c"; } -.icon-share-sign:before { +.fa-share-square:before { content: "\f14d"; } -.icon-compass:before { +.fa-compass:before { content: "\f14e"; } -.icon-collapse:before { +.fa-toggle-down:before, +.fa-caret-square-o-down:before { content: "\f150"; } -.icon-collapse-top:before { +.fa-toggle-up:before, +.fa-caret-square-o-up:before { content: "\f151"; } -.icon-expand:before { +.fa-toggle-right:before, +.fa-caret-square-o-right:before { content: "\f152"; } -.icon-euro:before, -.icon-eur:before { +.fa-euro:before, +.fa-eur:before { content: "\f153"; } -.icon-gbp:before { +.fa-gbp:before { content: "\f154"; } -.icon-dollar:before, -.icon-usd:before { +.fa-dollar:before, +.fa-usd:before { content: "\f155"; } -.icon-rupee:before, -.icon-inr:before { +.fa-rupee:before, +.fa-inr:before { content: "\f156"; } -.icon-yen:before, -.icon-jpy:before { +.fa-cny:before, +.fa-rmb:before, +.fa-yen:before, +.fa-jpy:before { content: "\f157"; } -.icon-renminbi:before, -.icon-cny:before { +.fa-ruble:before, +.fa-rouble:before, +.fa-rub:before { content: "\f158"; } -.icon-won:before, -.icon-krw:before { +.fa-won:before, +.fa-krw:before { content: "\f159"; } -.icon-bitcoin:before, -.icon-btc:before { +.fa-bitcoin:before, +.fa-btc:before { content: "\f15a"; } -.icon-file:before { +.fa-file:before { content: "\f15b"; } -.icon-file-text:before { +.fa-file-text:before { content: "\f15c"; } -.icon-sort-by-alphabet:before { +.fa-sort-alpha-asc:before { content: "\f15d"; } -.icon-sort-by-alphabet-alt:before { +.fa-sort-alpha-desc:before { content: "\f15e"; } -.icon-sort-by-attributes:before { +.fa-sort-amount-asc:before { content: "\f160"; } -.icon-sort-by-attributes-alt:before { +.fa-sort-amount-desc:before { content: "\f161"; } -.icon-sort-by-order:before { +.fa-sort-numeric-asc:before { content: "\f162"; } -.icon-sort-by-order-alt:before { +.fa-sort-numeric-desc:before { content: "\f163"; } -.icon-thumbs-up:before { +.fa-thumbs-up:before { content: "\f164"; } -.icon-thumbs-down:before { +.fa-thumbs-down:before { content: "\f165"; } -.icon-youtube-sign:before { +.fa-youtube-square:before { content: "\f166"; } -.icon-youtube:before { +.fa-youtube:before { content: "\f167"; } -.icon-xing:before { +.fa-xing:before { content: "\f168"; } -.icon-xing-sign:before { +.fa-xing-square:before { content: "\f169"; } -.icon-youtube-play:before { +.fa-youtube-play:before { content: "\f16a"; } -.icon-dropbox:before { +.fa-dropbox:before { content: "\f16b"; } -.icon-stackexchange:before { +.fa-stack-overflow:before { content: "\f16c"; } -.icon-instagram:before { +.fa-instagram:before { content: "\f16d"; } -.icon-flickr:before { +.fa-flickr:before { content: "\f16e"; } -.icon-adn:before { +.fa-adn:before { content: "\f170"; } -.icon-bitbucket:before { +.fa-bitbucket:before { content: "\f171"; } -.icon-bitbucket-sign:before { +.fa-bitbucket-square:before { content: "\f172"; } -.icon-tumblr:before { +.fa-tumblr:before { content: "\f173"; } -.icon-tumblr-sign:before { +.fa-tumblr-square:before { content: "\f174"; } -.icon-long-arrow-down:before { +.fa-long-arrow-down:before { content: "\f175"; } -.icon-long-arrow-up:before { +.fa-long-arrow-up:before { content: "\f176"; } -.icon-long-arrow-left:before { +.fa-long-arrow-left:before { content: "\f177"; } -.icon-long-arrow-right:before { +.fa-long-arrow-right:before { content: "\f178"; } -.icon-apple:before { +.fa-apple:before { content: "\f179"; } -.icon-windows:before { +.fa-windows:before { content: "\f17a"; } -.icon-android:before { +.fa-android:before { content: "\f17b"; } -.icon-linux:before { +.fa-linux:before { content: "\f17c"; } -.icon-dribbble:before { +.fa-dribbble:before { content: "\f17d"; } -.icon-skype:before { +.fa-skype:before { content: "\f17e"; } -.icon-foursquare:before { +.fa-foursquare:before { content: "\f180"; } -.icon-trello:before { +.fa-trello:before { content: "\f181"; } -.icon-female:before { +.fa-female:before { content: "\f182"; } -.icon-male:before { +.fa-male:before { content: "\f183"; } -.icon-gittip:before { +.fa-gittip:before { content: "\f184"; } -.icon-sun:before { +.fa-sun-o:before { content: "\f185"; } -.icon-moon:before { +.fa-moon-o:before { content: "\f186"; } -.icon-archive:before { +.fa-archive:before { content: "\f187"; } -.icon-bug:before { +.fa-bug:before { content: "\f188"; } -.icon-vk:before { +.fa-vk:before { content: "\f189"; } -.icon-weibo:before { +.fa-weibo:before { content: "\f18a"; } -.icon-renren:before { +.fa-renren:before { content: "\f18b"; } +.fa-pagelines:before { + content: "\f18c"; +} +.fa-stack-exchange:before { + content: "\f18d"; +} +.fa-arrow-circle-o-right:before { + content: "\f18e"; +} +.fa-arrow-circle-o-left:before { + content: "\f190"; +} +.fa-toggle-left:before, +.fa-caret-square-o-left:before { + content: "\f191"; +} +.fa-dot-circle-o:before { + content: "\f192"; +} +.fa-wheelchair:before { + content: "\f193"; +} +.fa-vimeo-square:before { + content: "\f194"; +} +.fa-turkish-lira:before, +.fa-try:before { + content: "\f195"; +} +.fa-plus-square-o:before { + content: "\f196"; +} 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 index 866437fa415..449d6ac551a 100644 --- a/ckan/public/base/vendor/font-awesome/css/font-awesome.min.css +++ b/ckan/public/base/vendor/font-awesome/css/font-awesome.min.css @@ -1,403 +1,4 @@ -@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";} +/*! + * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.3');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.2857142857142858em;text-align:center}.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-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)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0,mirror=1);-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2,mirror=1);-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-asc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-desc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-reply-all:before{content:"\f122"}.fa-mail-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"} \ No newline at end of file diff --git a/ckan/public/base/vendor/font-awesome/font/FontAwesome.otf b/ckan/public/base/vendor/font-awesome/font/FontAwesome.otf deleted file mode 100644 index 70125459f7d..00000000000 Binary files a/ckan/public/base/vendor/font-awesome/font/FontAwesome.otf and /dev/null 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 deleted file mode 100755 index 0662cb96bfb..00000000000 Binary files a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot and /dev/null 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 deleted file mode 100755 index b9bd17e158d..00000000000 Binary files a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff and /dev/null differ diff --git a/ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf b/ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf new file mode 100644 index 00000000000..8b0f54e47e1 Binary files /dev/null and b/ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf differ diff --git a/ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot b/ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot new file mode 100755 index 00000000000..7c79c6a6bc9 Binary files /dev/null and b/ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot differ diff --git a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg b/ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg similarity index 96% rename from ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg rename to ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg index 2edb4ec34cb..45fdf338301 100755 --- a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg +++ b/ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg @@ -280,8 +280,8 @@ - - + + @@ -310,7 +310,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -390,10 +390,25 @@ - - - - + + + + + + + + + + + + + + + + + + + \ 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/fonts/fontawesome-webfont.ttf similarity index 91% rename from ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf rename to ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf index d3659246915..e89738de5ea 100755 Binary files a/ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf and b/ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf differ diff --git a/ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff b/ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff new file mode 100755 index 00000000000..8c1748aab7a Binary files /dev/null and b/ckan/public/base/vendor/font-awesome/fonts/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 deleted file mode 100644 index a2c96046b4c..00000000000 --- a/ckan/public/base/vendor/font-awesome/less/bootstrap.less +++ /dev/null @@ -1,84 +0,0 @@ -/* 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/bordered-pulled.less b/ckan/public/base/vendor/font-awesome/less/bordered-pulled.less new file mode 100644 index 00000000000..0c90eb5672b --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/bordered-pulled.less @@ -0,0 +1,16 @@ +// Bordered & Pulled +// ------------------------- + +.@{fa-css-prefix}-border { + padding: .2em .25em .15em; + border: solid .08em @fa-border-color; + border-radius: .1em; +} + +.pull-right { float: right; } +.pull-left { float: left; } + +.@{fa-css-prefix} { + &.pull-left { margin-right: .3em; } + &.pull-right { margin-left: .3em; } +} diff --git a/ckan/public/base/vendor/font-awesome/less/core.less b/ckan/public/base/vendor/font-awesome/less/core.less index 1ef7e223542..6d223bc2f00 100644 --- a/ckan/public/base/vendor/font-awesome/less/core.less +++ b/ckan/public/base/vendor/font-awesome/less/core.less @@ -1,129 +1,12 @@ -/* 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 +// Base Class Definition // ------------------------- -.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; - } +.@{fa-css-prefix} { + display: inline-block; + font-family: FontAwesome; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } diff --git a/ckan/public/base/vendor/font-awesome/less/extras.less b/ckan/public/base/vendor/font-awesome/less/extras.less index c93c260c850..89faf70fc9b 100644 --- a/ckan/public/base/vendor/font-awesome/less/extras.less +++ b/ckan/public/base/vendor/font-awesome/less/extras.less @@ -1,93 +1,2 @@ -/* 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; } - } -} +// Extras +// -------------------------- diff --git a/ckan/public/base/vendor/font-awesome/less/fixed-width.less b/ckan/public/base/vendor/font-awesome/less/fixed-width.less new file mode 100644 index 00000000000..110289f2f4b --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/fixed-width.less @@ -0,0 +1,6 @@ +// Fixed Width Icons +// ------------------------- +.@{fa-css-prefix}-fw { + width: (18em / 14); + text-align: center; +} 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 deleted file mode 100644 index 6675c49892f..00000000000 --- a/ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less +++ /dev/null @@ -1,1953 +0,0 @@ -/*! - * 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 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 - * - 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://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: 4/3em; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; - vertical-align: middle; -} - -.nav { - [class^="icon-"], - [class*=" icon-"] { - vertical-align: inherit; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; - &.icon-large { - vertical-align: -25%; - } - } -} - -.nav-pills, .nav-tabs { - [class^="icon-"], - [class*=" icon-"] { - &.icon-large { - line-height: .75em; - margin-top: -7px; - padding-top: 5px; - margin-bottom: -5px; - padding-bottom: 4px; - } - } -} - -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { vertical-align: inherit; } - &.icon-large { - margin-top: -.5em; - } - } -} - -a [class^="icon-"], -a [class*=" icon-"] { - cursor: pointer; -} - -.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 index 0f454612b93..96d2f222544 100644 --- a/ckan/public/base/vendor/font-awesome/less/font-awesome.less +++ b/ckan/public/base/vendor/font-awesome/less/font-awesome.less @@ -1,33 +1,17 @@ /*! - * 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 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 - * - 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://fontawesome.io" - * - * Author - Dave Gandy - * ------------------------------------------------------------------------------ - * Email: dave@fontawesome.io - * Twitter: http://twitter.com/davegandy - * Work: Lead Product Designer @ Kyruus - http://kyruus.com + * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ -@import "variables.less"; -@import "mixins.less"; -@import "path.less"; -@import "core.less"; -@import "bootstrap.less"; -@import "extras.less"; -@import "icons.less"; +@import "variables"; +@import "mixins"; +@import "path"; +@import "core"; +@import "larger"; +@import "fixed-width"; +@import "list"; +@import "bordered-pulled"; +@import "spinning"; +@import "rotated-flipped"; +@import "stacked"; +@import "icons"; diff --git a/ckan/public/base/vendor/font-awesome/less/icons.less b/ckan/public/base/vendor/font-awesome/less/icons.less index 476d201ec69..bf0f856fcbb 100644 --- a/ckan/public/base/vendor/font-awesome/less/icons.less +++ b/ckan/public/base/vendor/font-awesome/less/icons.less @@ -1,381 +1,412 @@ /* 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; } +.@{fa-css-prefix}-glass:before { content: @fa-var-glass; } +.@{fa-css-prefix}-music:before { content: @fa-var-music; } +.@{fa-css-prefix}-search:before { content: @fa-var-search; } +.@{fa-css-prefix}-envelope-o:before { content: @fa-var-envelope-o; } +.@{fa-css-prefix}-heart:before { content: @fa-var-heart; } +.@{fa-css-prefix}-star:before { content: @fa-var-star; } +.@{fa-css-prefix}-star-o:before { content: @fa-var-star-o; } +.@{fa-css-prefix}-user:before { content: @fa-var-user; } +.@{fa-css-prefix}-film:before { content: @fa-var-film; } +.@{fa-css-prefix}-th-large:before { content: @fa-var-th-large; } +.@{fa-css-prefix}-th:before { content: @fa-var-th; } +.@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; } +.@{fa-css-prefix}-check:before { content: @fa-var-check; } +.@{fa-css-prefix}-times:before { content: @fa-var-times; } +.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; } +.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; } +.@{fa-css-prefix}-power-off:before { content: @fa-var-power-off; } +.@{fa-css-prefix}-signal:before { content: @fa-var-signal; } +.@{fa-css-prefix}-gear:before, +.@{fa-css-prefix}-cog:before { content: @fa-var-cog; } +.@{fa-css-prefix}-trash-o:before { content: @fa-var-trash-o; } +.@{fa-css-prefix}-home:before { content: @fa-var-home; } +.@{fa-css-prefix}-file-o:before { content: @fa-var-file-o; } +.@{fa-css-prefix}-clock-o:before { content: @fa-var-clock-o; } +.@{fa-css-prefix}-road:before { content: @fa-var-road; } +.@{fa-css-prefix}-download:before { content: @fa-var-download; } +.@{fa-css-prefix}-arrow-circle-o-down:before { content: @fa-var-arrow-circle-o-down; } +.@{fa-css-prefix}-arrow-circle-o-up:before { content: @fa-var-arrow-circle-o-up; } +.@{fa-css-prefix}-inbox:before { content: @fa-var-inbox; } +.@{fa-css-prefix}-play-circle-o:before { content: @fa-var-play-circle-o; } +.@{fa-css-prefix}-rotate-right:before, +.@{fa-css-prefix}-repeat:before { content: @fa-var-repeat; } +.@{fa-css-prefix}-refresh:before { content: @fa-var-refresh; } +.@{fa-css-prefix}-list-alt:before { content: @fa-var-list-alt; } +.@{fa-css-prefix}-lock:before { content: @fa-var-lock; } +.@{fa-css-prefix}-flag:before { content: @fa-var-flag; } +.@{fa-css-prefix}-headphones:before { content: @fa-var-headphones; } +.@{fa-css-prefix}-volume-off:before { content: @fa-var-volume-off; } +.@{fa-css-prefix}-volume-down:before { content: @fa-var-volume-down; } +.@{fa-css-prefix}-volume-up:before { content: @fa-var-volume-up; } +.@{fa-css-prefix}-qrcode:before { content: @fa-var-qrcode; } +.@{fa-css-prefix}-barcode:before { content: @fa-var-barcode; } +.@{fa-css-prefix}-tag:before { content: @fa-var-tag; } +.@{fa-css-prefix}-tags:before { content: @fa-var-tags; } +.@{fa-css-prefix}-book:before { content: @fa-var-book; } +.@{fa-css-prefix}-bookmark:before { content: @fa-var-bookmark; } +.@{fa-css-prefix}-print:before { content: @fa-var-print; } +.@{fa-css-prefix}-camera:before { content: @fa-var-camera; } +.@{fa-css-prefix}-font:before { content: @fa-var-font; } +.@{fa-css-prefix}-bold:before { content: @fa-var-bold; } +.@{fa-css-prefix}-italic:before { content: @fa-var-italic; } +.@{fa-css-prefix}-text-height:before { content: @fa-var-text-height; } +.@{fa-css-prefix}-text-width:before { content: @fa-var-text-width; } +.@{fa-css-prefix}-align-left:before { content: @fa-var-align-left; } +.@{fa-css-prefix}-align-center:before { content: @fa-var-align-center; } +.@{fa-css-prefix}-align-right:before { content: @fa-var-align-right; } +.@{fa-css-prefix}-align-justify:before { content: @fa-var-align-justify; } +.@{fa-css-prefix}-list:before { content: @fa-var-list; } +.@{fa-css-prefix}-dedent:before, +.@{fa-css-prefix}-outdent:before { content: @fa-var-outdent; } +.@{fa-css-prefix}-indent:before { content: @fa-var-indent; } +.@{fa-css-prefix}-video-camera:before { content: @fa-var-video-camera; } +.@{fa-css-prefix}-picture-o:before { content: @fa-var-picture-o; } +.@{fa-css-prefix}-pencil:before { content: @fa-var-pencil; } +.@{fa-css-prefix}-map-marker:before { content: @fa-var-map-marker; } +.@{fa-css-prefix}-adjust:before { content: @fa-var-adjust; } +.@{fa-css-prefix}-tint:before { content: @fa-var-tint; } +.@{fa-css-prefix}-edit:before, +.@{fa-css-prefix}-pencil-square-o:before { content: @fa-var-pencil-square-o; } +.@{fa-css-prefix}-share-square-o:before { content: @fa-var-share-square-o; } +.@{fa-css-prefix}-check-square-o:before { content: @fa-var-check-square-o; } +.@{fa-css-prefix}-arrows:before { content: @fa-var-arrows; } +.@{fa-css-prefix}-step-backward:before { content: @fa-var-step-backward; } +.@{fa-css-prefix}-fast-backward:before { content: @fa-var-fast-backward; } +.@{fa-css-prefix}-backward:before { content: @fa-var-backward; } +.@{fa-css-prefix}-play:before { content: @fa-var-play; } +.@{fa-css-prefix}-pause:before { content: @fa-var-pause; } +.@{fa-css-prefix}-stop:before { content: @fa-var-stop; } +.@{fa-css-prefix}-forward:before { content: @fa-var-forward; } +.@{fa-css-prefix}-fast-forward:before { content: @fa-var-fast-forward; } +.@{fa-css-prefix}-step-forward:before { content: @fa-var-step-forward; } +.@{fa-css-prefix}-eject:before { content: @fa-var-eject; } +.@{fa-css-prefix}-chevron-left:before { content: @fa-var-chevron-left; } +.@{fa-css-prefix}-chevron-right:before { content: @fa-var-chevron-right; } +.@{fa-css-prefix}-plus-circle:before { content: @fa-var-plus-circle; } +.@{fa-css-prefix}-minus-circle:before { content: @fa-var-minus-circle; } +.@{fa-css-prefix}-times-circle:before { content: @fa-var-times-circle; } +.@{fa-css-prefix}-check-circle:before { content: @fa-var-check-circle; } +.@{fa-css-prefix}-question-circle:before { content: @fa-var-question-circle; } +.@{fa-css-prefix}-info-circle:before { content: @fa-var-info-circle; } +.@{fa-css-prefix}-crosshairs:before { content: @fa-var-crosshairs; } +.@{fa-css-prefix}-times-circle-o:before { content: @fa-var-times-circle-o; } +.@{fa-css-prefix}-check-circle-o:before { content: @fa-var-check-circle-o; } +.@{fa-css-prefix}-ban:before { content: @fa-var-ban; } +.@{fa-css-prefix}-arrow-left:before { content: @fa-var-arrow-left; } +.@{fa-css-prefix}-arrow-right:before { content: @fa-var-arrow-right; } +.@{fa-css-prefix}-arrow-up:before { content: @fa-var-arrow-up; } +.@{fa-css-prefix}-arrow-down:before { content: @fa-var-arrow-down; } +.@{fa-css-prefix}-mail-forward:before, +.@{fa-css-prefix}-share:before { content: @fa-var-share; } +.@{fa-css-prefix}-expand:before { content: @fa-var-expand; } +.@{fa-css-prefix}-compress:before { content: @fa-var-compress; } +.@{fa-css-prefix}-plus:before { content: @fa-var-plus; } +.@{fa-css-prefix}-minus:before { content: @fa-var-minus; } +.@{fa-css-prefix}-asterisk:before { content: @fa-var-asterisk; } +.@{fa-css-prefix}-exclamation-circle:before { content: @fa-var-exclamation-circle; } +.@{fa-css-prefix}-gift:before { content: @fa-var-gift; } +.@{fa-css-prefix}-leaf:before { content: @fa-var-leaf; } +.@{fa-css-prefix}-fire:before { content: @fa-var-fire; } +.@{fa-css-prefix}-eye:before { content: @fa-var-eye; } +.@{fa-css-prefix}-eye-slash:before { content: @fa-var-eye-slash; } +.@{fa-css-prefix}-warning:before, +.@{fa-css-prefix}-exclamation-triangle:before { content: @fa-var-exclamation-triangle; } +.@{fa-css-prefix}-plane:before { content: @fa-var-plane; } +.@{fa-css-prefix}-calendar:before { content: @fa-var-calendar; } +.@{fa-css-prefix}-random:before { content: @fa-var-random; } +.@{fa-css-prefix}-comment:before { content: @fa-var-comment; } +.@{fa-css-prefix}-magnet:before { content: @fa-var-magnet; } +.@{fa-css-prefix}-chevron-up:before { content: @fa-var-chevron-up; } +.@{fa-css-prefix}-chevron-down:before { content: @fa-var-chevron-down; } +.@{fa-css-prefix}-retweet:before { content: @fa-var-retweet; } +.@{fa-css-prefix}-shopping-cart:before { content: @fa-var-shopping-cart; } +.@{fa-css-prefix}-folder:before { content: @fa-var-folder; } +.@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; } +.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; } +.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; } +.@{fa-css-prefix}-bar-chart-o:before { content: @fa-var-bar-chart-o; } +.@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; } +.@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; } +.@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; } +.@{fa-css-prefix}-key:before { content: @fa-var-key; } +.@{fa-css-prefix}-gears:before, +.@{fa-css-prefix}-cogs:before { content: @fa-var-cogs; } +.@{fa-css-prefix}-comments:before { content: @fa-var-comments; } +.@{fa-css-prefix}-thumbs-o-up:before { content: @fa-var-thumbs-o-up; } +.@{fa-css-prefix}-thumbs-o-down:before { content: @fa-var-thumbs-o-down; } +.@{fa-css-prefix}-star-half:before { content: @fa-var-star-half; } +.@{fa-css-prefix}-heart-o:before { content: @fa-var-heart-o; } +.@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; } +.@{fa-css-prefix}-linkedin-square:before { content: @fa-var-linkedin-square; } +.@{fa-css-prefix}-thumb-tack:before { content: @fa-var-thumb-tack; } +.@{fa-css-prefix}-external-link:before { content: @fa-var-external-link; } +.@{fa-css-prefix}-sign-in:before { content: @fa-var-sign-in; } +.@{fa-css-prefix}-trophy:before { content: @fa-var-trophy; } +.@{fa-css-prefix}-github-square:before { content: @fa-var-github-square; } +.@{fa-css-prefix}-upload:before { content: @fa-var-upload; } +.@{fa-css-prefix}-lemon-o:before { content: @fa-var-lemon-o; } +.@{fa-css-prefix}-phone:before { content: @fa-var-phone; } +.@{fa-css-prefix}-square-o:before { content: @fa-var-square-o; } +.@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; } +.@{fa-css-prefix}-phone-square:before { content: @fa-var-phone-square; } +.@{fa-css-prefix}-twitter:before { content: @fa-var-twitter; } +.@{fa-css-prefix}-facebook:before { content: @fa-var-facebook; } +.@{fa-css-prefix}-github:before { content: @fa-var-github; } +.@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; } +.@{fa-css-prefix}-credit-card:before { content: @fa-var-credit-card; } +.@{fa-css-prefix}-rss:before { content: @fa-var-rss; } +.@{fa-css-prefix}-hdd-o:before { content: @fa-var-hdd-o; } +.@{fa-css-prefix}-bullhorn:before { content: @fa-var-bullhorn; } +.@{fa-css-prefix}-bell:before { content: @fa-var-bell; } +.@{fa-css-prefix}-certificate:before { content: @fa-var-certificate; } +.@{fa-css-prefix}-hand-o-right:before { content: @fa-var-hand-o-right; } +.@{fa-css-prefix}-hand-o-left:before { content: @fa-var-hand-o-left; } +.@{fa-css-prefix}-hand-o-up:before { content: @fa-var-hand-o-up; } +.@{fa-css-prefix}-hand-o-down:before { content: @fa-var-hand-o-down; } +.@{fa-css-prefix}-arrow-circle-left:before { content: @fa-var-arrow-circle-left; } +.@{fa-css-prefix}-arrow-circle-right:before { content: @fa-var-arrow-circle-right; } +.@{fa-css-prefix}-arrow-circle-up:before { content: @fa-var-arrow-circle-up; } +.@{fa-css-prefix}-arrow-circle-down:before { content: @fa-var-arrow-circle-down; } +.@{fa-css-prefix}-globe:before { content: @fa-var-globe; } +.@{fa-css-prefix}-wrench:before { content: @fa-var-wrench; } +.@{fa-css-prefix}-tasks:before { content: @fa-var-tasks; } +.@{fa-css-prefix}-filter:before { content: @fa-var-filter; } +.@{fa-css-prefix}-briefcase:before { content: @fa-var-briefcase; } +.@{fa-css-prefix}-arrows-alt:before { content: @fa-var-arrows-alt; } +.@{fa-css-prefix}-group:before, +.@{fa-css-prefix}-users:before { content: @fa-var-users; } +.@{fa-css-prefix}-chain:before, +.@{fa-css-prefix}-link:before { content: @fa-var-link; } +.@{fa-css-prefix}-cloud:before { content: @fa-var-cloud; } +.@{fa-css-prefix}-flask:before { content: @fa-var-flask; } +.@{fa-css-prefix}-cut:before, +.@{fa-css-prefix}-scissors:before { content: @fa-var-scissors; } +.@{fa-css-prefix}-copy:before, +.@{fa-css-prefix}-files-o:before { content: @fa-var-files-o; } +.@{fa-css-prefix}-paperclip:before { content: @fa-var-paperclip; } +.@{fa-css-prefix}-save:before, +.@{fa-css-prefix}-floppy-o:before { content: @fa-var-floppy-o; } +.@{fa-css-prefix}-square:before { content: @fa-var-square; } +.@{fa-css-prefix}-bars:before { content: @fa-var-bars; } +.@{fa-css-prefix}-list-ul:before { content: @fa-var-list-ul; } +.@{fa-css-prefix}-list-ol:before { content: @fa-var-list-ol; } +.@{fa-css-prefix}-strikethrough:before { content: @fa-var-strikethrough; } +.@{fa-css-prefix}-underline:before { content: @fa-var-underline; } +.@{fa-css-prefix}-table:before { content: @fa-var-table; } +.@{fa-css-prefix}-magic:before { content: @fa-var-magic; } +.@{fa-css-prefix}-truck:before { content: @fa-var-truck; } +.@{fa-css-prefix}-pinterest:before { content: @fa-var-pinterest; } +.@{fa-css-prefix}-pinterest-square:before { content: @fa-var-pinterest-square; } +.@{fa-css-prefix}-google-plus-square:before { content: @fa-var-google-plus-square; } +.@{fa-css-prefix}-google-plus:before { content: @fa-var-google-plus; } +.@{fa-css-prefix}-money:before { content: @fa-var-money; } +.@{fa-css-prefix}-caret-down:before { content: @fa-var-caret-down; } +.@{fa-css-prefix}-caret-up:before { content: @fa-var-caret-up; } +.@{fa-css-prefix}-caret-left:before { content: @fa-var-caret-left; } +.@{fa-css-prefix}-caret-right:before { content: @fa-var-caret-right; } +.@{fa-css-prefix}-columns:before { content: @fa-var-columns; } +.@{fa-css-prefix}-unsorted:before, +.@{fa-css-prefix}-sort:before { content: @fa-var-sort; } +.@{fa-css-prefix}-sort-down:before, +.@{fa-css-prefix}-sort-asc:before { content: @fa-var-sort-asc; } +.@{fa-css-prefix}-sort-up:before, +.@{fa-css-prefix}-sort-desc:before { content: @fa-var-sort-desc; } +.@{fa-css-prefix}-envelope:before { content: @fa-var-envelope; } +.@{fa-css-prefix}-linkedin:before { content: @fa-var-linkedin; } +.@{fa-css-prefix}-rotate-left:before, +.@{fa-css-prefix}-undo:before { content: @fa-var-undo; } +.@{fa-css-prefix}-legal:before, +.@{fa-css-prefix}-gavel:before { content: @fa-var-gavel; } +.@{fa-css-prefix}-dashboard:before, +.@{fa-css-prefix}-tachometer:before { content: @fa-var-tachometer; } +.@{fa-css-prefix}-comment-o:before { content: @fa-var-comment-o; } +.@{fa-css-prefix}-comments-o:before { content: @fa-var-comments-o; } +.@{fa-css-prefix}-flash:before, +.@{fa-css-prefix}-bolt:before { content: @fa-var-bolt; } +.@{fa-css-prefix}-sitemap:before { content: @fa-var-sitemap; } +.@{fa-css-prefix}-umbrella:before { content: @fa-var-umbrella; } +.@{fa-css-prefix}-paste:before, +.@{fa-css-prefix}-clipboard:before { content: @fa-var-clipboard; } +.@{fa-css-prefix}-lightbulb-o:before { content: @fa-var-lightbulb-o; } +.@{fa-css-prefix}-exchange:before { content: @fa-var-exchange; } +.@{fa-css-prefix}-cloud-download:before { content: @fa-var-cloud-download; } +.@{fa-css-prefix}-cloud-upload:before { content: @fa-var-cloud-upload; } +.@{fa-css-prefix}-user-md:before { content: @fa-var-user-md; } +.@{fa-css-prefix}-stethoscope:before { content: @fa-var-stethoscope; } +.@{fa-css-prefix}-suitcase:before { content: @fa-var-suitcase; } +.@{fa-css-prefix}-bell-o:before { content: @fa-var-bell-o; } +.@{fa-css-prefix}-coffee:before { content: @fa-var-coffee; } +.@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; } +.@{fa-css-prefix}-file-text-o:before { content: @fa-var-file-text-o; } +.@{fa-css-prefix}-building-o:before { content: @fa-var-building-o; } +.@{fa-css-prefix}-hospital-o:before { content: @fa-var-hospital-o; } +.@{fa-css-prefix}-ambulance:before { content: @fa-var-ambulance; } +.@{fa-css-prefix}-medkit:before { content: @fa-var-medkit; } +.@{fa-css-prefix}-fighter-jet:before { content: @fa-var-fighter-jet; } +.@{fa-css-prefix}-beer:before { content: @fa-var-beer; } +.@{fa-css-prefix}-h-square:before { content: @fa-var-h-square; } +.@{fa-css-prefix}-plus-square:before { content: @fa-var-plus-square; } +.@{fa-css-prefix}-angle-double-left:before { content: @fa-var-angle-double-left; } +.@{fa-css-prefix}-angle-double-right:before { content: @fa-var-angle-double-right; } +.@{fa-css-prefix}-angle-double-up:before { content: @fa-var-angle-double-up; } +.@{fa-css-prefix}-angle-double-down:before { content: @fa-var-angle-double-down; } +.@{fa-css-prefix}-angle-left:before { content: @fa-var-angle-left; } +.@{fa-css-prefix}-angle-right:before { content: @fa-var-angle-right; } +.@{fa-css-prefix}-angle-up:before { content: @fa-var-angle-up; } +.@{fa-css-prefix}-angle-down:before { content: @fa-var-angle-down; } +.@{fa-css-prefix}-desktop:before { content: @fa-var-desktop; } +.@{fa-css-prefix}-laptop:before { content: @fa-var-laptop; } +.@{fa-css-prefix}-tablet:before { content: @fa-var-tablet; } +.@{fa-css-prefix}-mobile-phone:before, +.@{fa-css-prefix}-mobile:before { content: @fa-var-mobile; } +.@{fa-css-prefix}-circle-o:before { content: @fa-var-circle-o; } +.@{fa-css-prefix}-quote-left:before { content: @fa-var-quote-left; } +.@{fa-css-prefix}-quote-right:before { content: @fa-var-quote-right; } +.@{fa-css-prefix}-spinner:before { content: @fa-var-spinner; } +.@{fa-css-prefix}-circle:before { content: @fa-var-circle; } +.@{fa-css-prefix}-mail-reply:before, +.@{fa-css-prefix}-reply:before { content: @fa-var-reply; } +.@{fa-css-prefix}-github-alt:before { content: @fa-var-github-alt; } +.@{fa-css-prefix}-folder-o:before { content: @fa-var-folder-o; } +.@{fa-css-prefix}-folder-open-o:before { content: @fa-var-folder-open-o; } +.@{fa-css-prefix}-smile-o:before { content: @fa-var-smile-o; } +.@{fa-css-prefix}-frown-o:before { content: @fa-var-frown-o; } +.@{fa-css-prefix}-meh-o:before { content: @fa-var-meh-o; } +.@{fa-css-prefix}-gamepad:before { content: @fa-var-gamepad; } +.@{fa-css-prefix}-keyboard-o:before { content: @fa-var-keyboard-o; } +.@{fa-css-prefix}-flag-o:before { content: @fa-var-flag-o; } +.@{fa-css-prefix}-flag-checkered:before { content: @fa-var-flag-checkered; } +.@{fa-css-prefix}-terminal:before { content: @fa-var-terminal; } +.@{fa-css-prefix}-code:before { content: @fa-var-code; } +.@{fa-css-prefix}-reply-all:before { content: @fa-var-reply-all; } +.@{fa-css-prefix}-mail-reply-all:before { content: @fa-var-mail-reply-all; } +.@{fa-css-prefix}-star-half-empty:before, +.@{fa-css-prefix}-star-half-full:before, +.@{fa-css-prefix}-star-half-o:before { content: @fa-var-star-half-o; } +.@{fa-css-prefix}-location-arrow:before { content: @fa-var-location-arrow; } +.@{fa-css-prefix}-crop:before { content: @fa-var-crop; } +.@{fa-css-prefix}-code-fork:before { content: @fa-var-code-fork; } +.@{fa-css-prefix}-unlink:before, +.@{fa-css-prefix}-chain-broken:before { content: @fa-var-chain-broken; } +.@{fa-css-prefix}-question:before { content: @fa-var-question; } +.@{fa-css-prefix}-info:before { content: @fa-var-info; } +.@{fa-css-prefix}-exclamation:before { content: @fa-var-exclamation; } +.@{fa-css-prefix}-superscript:before { content: @fa-var-superscript; } +.@{fa-css-prefix}-subscript:before { content: @fa-var-subscript; } +.@{fa-css-prefix}-eraser:before { content: @fa-var-eraser; } +.@{fa-css-prefix}-puzzle-piece:before { content: @fa-var-puzzle-piece; } +.@{fa-css-prefix}-microphone:before { content: @fa-var-microphone; } +.@{fa-css-prefix}-microphone-slash:before { content: @fa-var-microphone-slash; } +.@{fa-css-prefix}-shield:before { content: @fa-var-shield; } +.@{fa-css-prefix}-calendar-o:before { content: @fa-var-calendar-o; } +.@{fa-css-prefix}-fire-extinguisher:before { content: @fa-var-fire-extinguisher; } +.@{fa-css-prefix}-rocket:before { content: @fa-var-rocket; } +.@{fa-css-prefix}-maxcdn:before { content: @fa-var-maxcdn; } +.@{fa-css-prefix}-chevron-circle-left:before { content: @fa-var-chevron-circle-left; } +.@{fa-css-prefix}-chevron-circle-right:before { content: @fa-var-chevron-circle-right; } +.@{fa-css-prefix}-chevron-circle-up:before { content: @fa-var-chevron-circle-up; } +.@{fa-css-prefix}-chevron-circle-down:before { content: @fa-var-chevron-circle-down; } +.@{fa-css-prefix}-html5:before { content: @fa-var-html5; } +.@{fa-css-prefix}-css3:before { content: @fa-var-css3; } +.@{fa-css-prefix}-anchor:before { content: @fa-var-anchor; } +.@{fa-css-prefix}-unlock-alt:before { content: @fa-var-unlock-alt; } +.@{fa-css-prefix}-bullseye:before { content: @fa-var-bullseye; } +.@{fa-css-prefix}-ellipsis-h:before { content: @fa-var-ellipsis-h; } +.@{fa-css-prefix}-ellipsis-v:before { content: @fa-var-ellipsis-v; } +.@{fa-css-prefix}-rss-square:before { content: @fa-var-rss-square; } +.@{fa-css-prefix}-play-circle:before { content: @fa-var-play-circle; } +.@{fa-css-prefix}-ticket:before { content: @fa-var-ticket; } +.@{fa-css-prefix}-minus-square:before { content: @fa-var-minus-square; } +.@{fa-css-prefix}-minus-square-o:before { content: @fa-var-minus-square-o; } +.@{fa-css-prefix}-level-up:before { content: @fa-var-level-up; } +.@{fa-css-prefix}-level-down:before { content: @fa-var-level-down; } +.@{fa-css-prefix}-check-square:before { content: @fa-var-check-square; } +.@{fa-css-prefix}-pencil-square:before { content: @fa-var-pencil-square; } +.@{fa-css-prefix}-external-link-square:before { content: @fa-var-external-link-square; } +.@{fa-css-prefix}-share-square:before { content: @fa-var-share-square; } +.@{fa-css-prefix}-compass:before { content: @fa-var-compass; } +.@{fa-css-prefix}-toggle-down:before, +.@{fa-css-prefix}-caret-square-o-down:before { content: @fa-var-caret-square-o-down; } +.@{fa-css-prefix}-toggle-up:before, +.@{fa-css-prefix}-caret-square-o-up:before { content: @fa-var-caret-square-o-up; } +.@{fa-css-prefix}-toggle-right:before, +.@{fa-css-prefix}-caret-square-o-right:before { content: @fa-var-caret-square-o-right; } +.@{fa-css-prefix}-euro:before, +.@{fa-css-prefix}-eur:before { content: @fa-var-eur; } +.@{fa-css-prefix}-gbp:before { content: @fa-var-gbp; } +.@{fa-css-prefix}-dollar:before, +.@{fa-css-prefix}-usd:before { content: @fa-var-usd; } +.@{fa-css-prefix}-rupee:before, +.@{fa-css-prefix}-inr:before { content: @fa-var-inr; } +.@{fa-css-prefix}-cny:before, +.@{fa-css-prefix}-rmb:before, +.@{fa-css-prefix}-yen:before, +.@{fa-css-prefix}-jpy:before { content: @fa-var-jpy; } +.@{fa-css-prefix}-ruble:before, +.@{fa-css-prefix}-rouble:before, +.@{fa-css-prefix}-rub:before { content: @fa-var-rub; } +.@{fa-css-prefix}-won:before, +.@{fa-css-prefix}-krw:before { content: @fa-var-krw; } +.@{fa-css-prefix}-bitcoin:before, +.@{fa-css-prefix}-btc:before { content: @fa-var-btc; } +.@{fa-css-prefix}-file:before { content: @fa-var-file; } +.@{fa-css-prefix}-file-text:before { content: @fa-var-file-text; } +.@{fa-css-prefix}-sort-alpha-asc:before { content: @fa-var-sort-alpha-asc; } +.@{fa-css-prefix}-sort-alpha-desc:before { content: @fa-var-sort-alpha-desc; } +.@{fa-css-prefix}-sort-amount-asc:before { content: @fa-var-sort-amount-asc; } +.@{fa-css-prefix}-sort-amount-desc:before { content: @fa-var-sort-amount-desc; } +.@{fa-css-prefix}-sort-numeric-asc:before { content: @fa-var-sort-numeric-asc; } +.@{fa-css-prefix}-sort-numeric-desc:before { content: @fa-var-sort-numeric-desc; } +.@{fa-css-prefix}-thumbs-up:before { content: @fa-var-thumbs-up; } +.@{fa-css-prefix}-thumbs-down:before { content: @fa-var-thumbs-down; } +.@{fa-css-prefix}-youtube-square:before { content: @fa-var-youtube-square; } +.@{fa-css-prefix}-youtube:before { content: @fa-var-youtube; } +.@{fa-css-prefix}-xing:before { content: @fa-var-xing; } +.@{fa-css-prefix}-xing-square:before { content: @fa-var-xing-square; } +.@{fa-css-prefix}-youtube-play:before { content: @fa-var-youtube-play; } +.@{fa-css-prefix}-dropbox:before { content: @fa-var-dropbox; } +.@{fa-css-prefix}-stack-overflow:before { content: @fa-var-stack-overflow; } +.@{fa-css-prefix}-instagram:before { content: @fa-var-instagram; } +.@{fa-css-prefix}-flickr:before { content: @fa-var-flickr; } +.@{fa-css-prefix}-adn:before { content: @fa-var-adn; } +.@{fa-css-prefix}-bitbucket:before { content: @fa-var-bitbucket; } +.@{fa-css-prefix}-bitbucket-square:before { content: @fa-var-bitbucket-square; } +.@{fa-css-prefix}-tumblr:before { content: @fa-var-tumblr; } +.@{fa-css-prefix}-tumblr-square:before { content: @fa-var-tumblr-square; } +.@{fa-css-prefix}-long-arrow-down:before { content: @fa-var-long-arrow-down; } +.@{fa-css-prefix}-long-arrow-up:before { content: @fa-var-long-arrow-up; } +.@{fa-css-prefix}-long-arrow-left:before { content: @fa-var-long-arrow-left; } +.@{fa-css-prefix}-long-arrow-right:before { content: @fa-var-long-arrow-right; } +.@{fa-css-prefix}-apple:before { content: @fa-var-apple; } +.@{fa-css-prefix}-windows:before { content: @fa-var-windows; } +.@{fa-css-prefix}-android:before { content: @fa-var-android; } +.@{fa-css-prefix}-linux:before { content: @fa-var-linux; } +.@{fa-css-prefix}-dribbble:before { content: @fa-var-dribbble; } +.@{fa-css-prefix}-skype:before { content: @fa-var-skype; } +.@{fa-css-prefix}-foursquare:before { content: @fa-var-foursquare; } +.@{fa-css-prefix}-trello:before { content: @fa-var-trello; } +.@{fa-css-prefix}-female:before { content: @fa-var-female; } +.@{fa-css-prefix}-male:before { content: @fa-var-male; } +.@{fa-css-prefix}-gittip:before { content: @fa-var-gittip; } +.@{fa-css-prefix}-sun-o:before { content: @fa-var-sun-o; } +.@{fa-css-prefix}-moon-o:before { content: @fa-var-moon-o; } +.@{fa-css-prefix}-archive:before { content: @fa-var-archive; } +.@{fa-css-prefix}-bug:before { content: @fa-var-bug; } +.@{fa-css-prefix}-vk:before { content: @fa-var-vk; } +.@{fa-css-prefix}-weibo:before { content: @fa-var-weibo; } +.@{fa-css-prefix}-renren:before { content: @fa-var-renren; } +.@{fa-css-prefix}-pagelines:before { content: @fa-var-pagelines; } +.@{fa-css-prefix}-stack-exchange:before { content: @fa-var-stack-exchange; } +.@{fa-css-prefix}-arrow-circle-o-right:before { content: @fa-var-arrow-circle-o-right; } +.@{fa-css-prefix}-arrow-circle-o-left:before { content: @fa-var-arrow-circle-o-left; } +.@{fa-css-prefix}-toggle-left:before, +.@{fa-css-prefix}-caret-square-o-left:before { content: @fa-var-caret-square-o-left; } +.@{fa-css-prefix}-dot-circle-o:before { content: @fa-var-dot-circle-o; } +.@{fa-css-prefix}-wheelchair:before { content: @fa-var-wheelchair; } +.@{fa-css-prefix}-vimeo-square:before { content: @fa-var-vimeo-square; } +.@{fa-css-prefix}-turkish-lira:before, +.@{fa-css-prefix}-try:before { content: @fa-var-try; } +.@{fa-css-prefix}-plus-square-o:before { content: @fa-var-plus-square-o; } diff --git a/ckan/public/base/vendor/font-awesome/less/larger.less b/ckan/public/base/vendor/font-awesome/less/larger.less new file mode 100644 index 00000000000..c9d646770e2 --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/larger.less @@ -0,0 +1,13 @@ +// Icon Sizes +// ------------------------- + +/* makes the font 33% larger relative to the icon container */ +.@{fa-css-prefix}-lg { + font-size: (4em / 3); + line-height: (3em / 4); + vertical-align: -15%; +} +.@{fa-css-prefix}-2x { font-size: 2em; } +.@{fa-css-prefix}-3x { font-size: 3em; } +.@{fa-css-prefix}-4x { font-size: 4em; } +.@{fa-css-prefix}-5x { font-size: 5em; } diff --git a/ckan/public/base/vendor/font-awesome/less/list.less b/ckan/public/base/vendor/font-awesome/less/list.less new file mode 100644 index 00000000000..eed93405152 --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/list.less @@ -0,0 +1,19 @@ +// List Icons +// ------------------------- + +.@{fa-css-prefix}-ul { + padding-left: 0; + margin-left: @fa-li-width; + list-style-type: none; + > li { position: relative; } +} +.@{fa-css-prefix}-li { + position: absolute; + left: -@fa-li-width; + width: @fa-li-width; + top: (2em / 14); + text-align: center; + &.@{fa-css-prefix}-lg { + left: -@fa-li-width + (4em / 14); + } +} diff --git a/ckan/public/base/vendor/font-awesome/less/mixins.less b/ckan/public/base/vendor/font-awesome/less/mixins.less index f7fdda59068..19e5a6457b6 100644 --- a/ckan/public/base/vendor/font-awesome/less/mixins.less +++ b/ckan/public/base/vendor/font-awesome/less/mixins.less @@ -1,48 +1,20 @@ // Mixins // -------------------------- -.icon(@icon) { - .icon-FontAwesome(); - content: @icon; +.fa-icon-rotate(@degrees, @rotation) { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation); + -webkit-transform: rotate(@degrees); + -moz-transform: rotate(@degrees); + -ms-transform: rotate(@degrees); + -o-transform: rotate(@degrees); + transform: rotate(@degrees); } -.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; - } - } +.fa-icon-flip(@horiz, @vert, @rotation) { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1); + -webkit-transform: scale(@horiz, @vert); + -moz-transform: scale(@horiz, @vert); + -ms-transform: scale(@horiz, @vert); + -o-transform: scale(@horiz, @vert); + transform: scale(@horiz, @vert); } diff --git a/ckan/public/base/vendor/font-awesome/less/path.less b/ckan/public/base/vendor/font-awesome/less/path.less index 8ccef8cf09b..c5a691246d6 100644 --- a/ckan/public/base/vendor/font-awesome/less/path.less +++ b/ckan/public/base/vendor/font-awesome/less/path.less @@ -3,12 +3,12 @@ @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 + src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); + src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), + url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), + url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), + url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); +// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/ckan/public/base/vendor/font-awesome/less/rotated-flipped.less b/ckan/public/base/vendor/font-awesome/less/rotated-flipped.less new file mode 100644 index 00000000000..8fff3a6c417 --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/rotated-flipped.less @@ -0,0 +1,9 @@ +// Rotated & Flipped Icons +// ------------------------- + +.@{fa-css-prefix}-rotate-90 { .fa-icon-rotate(90deg, 1); } +.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); } +.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); } + +.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); } +.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); } diff --git a/ckan/public/base/vendor/font-awesome/less/spinning.less b/ckan/public/base/vendor/font-awesome/less/spinning.less new file mode 100644 index 00000000000..60828fe5c0b --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/spinning.less @@ -0,0 +1,30 @@ +// Spinning Icons +// -------------------------- + +.@{fa-css-prefix}-spin { + -webkit-animation: spin 2s infinite linear; + -moz-animation: spin 2s infinite linear; + -o-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); } +} diff --git a/ckan/public/base/vendor/font-awesome/less/stacked.less b/ckan/public/base/vendor/font-awesome/less/stacked.less new file mode 100644 index 00000000000..fc53fb0e7ab --- /dev/null +++ b/ckan/public/base/vendor/font-awesome/less/stacked.less @@ -0,0 +1,20 @@ +// Stacked Icons +// ------------------------- + +.@{fa-css-prefix}-stack { + position: relative; + display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: middle; +} +.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x { + position: absolute; + left: 0; + width: 100%; + text-align: center; +} +.@{fa-css-prefix}-stack-1x { line-height: inherit; } +.@{fa-css-prefix}-stack-2x { font-size: 2em; } +.@{fa-css-prefix}-inverse { color: @fa-inverse; } diff --git a/ckan/public/base/vendor/font-awesome/less/variables.less b/ckan/public/base/vendor/font-awesome/less/variables.less index 9d0879b0ddf..f40a555f09f 100644 --- a/ckan/public/base/vendor/font-awesome/less/variables.less +++ b/ckan/public/base/vendor/font-awesome/less/variables.less @@ -1,735 +1,381 @@ // 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"; +@fa-font-path: "../fonts"; +//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.0.3/fonts"; // for referencing Bootstrap CDN font files directly +@fa-css-prefix: fa; +@fa-version: "4.0.3"; +@fa-border-color: #eee; +@fa-inverse: #fff; +@fa-li-width: (30em / 14); + +@fa-var-glass: "\f000"; +@fa-var-music: "\f001"; +@fa-var-search: "\f002"; +@fa-var-envelope-o: "\f003"; +@fa-var-heart: "\f004"; +@fa-var-star: "\f005"; +@fa-var-star-o: "\f006"; +@fa-var-user: "\f007"; +@fa-var-film: "\f008"; +@fa-var-th-large: "\f009"; +@fa-var-th: "\f00a"; +@fa-var-th-list: "\f00b"; +@fa-var-check: "\f00c"; +@fa-var-times: "\f00d"; +@fa-var-search-plus: "\f00e"; +@fa-var-search-minus: "\f010"; +@fa-var-power-off: "\f011"; +@fa-var-signal: "\f012"; +@fa-var-cog: "\f013"; +@fa-var-trash-o: "\f014"; +@fa-var-home: "\f015"; +@fa-var-file-o: "\f016"; +@fa-var-clock-o: "\f017"; +@fa-var-road: "\f018"; +@fa-var-download: "\f019"; +@fa-var-arrow-circle-o-down: "\f01a"; +@fa-var-arrow-circle-o-up: "\f01b"; +@fa-var-inbox: "\f01c"; +@fa-var-play-circle-o: "\f01d"; +@fa-var-repeat: "\f01e"; +@fa-var-refresh: "\f021"; +@fa-var-list-alt: "\f022"; +@fa-var-lock: "\f023"; +@fa-var-flag: "\f024"; +@fa-var-headphones: "\f025"; +@fa-var-volume-off: "\f026"; +@fa-var-volume-down: "\f027"; +@fa-var-volume-up: "\f028"; +@fa-var-qrcode: "\f029"; +@fa-var-barcode: "\f02a"; +@fa-var-tag: "\f02b"; +@fa-var-tags: "\f02c"; +@fa-var-book: "\f02d"; +@fa-var-bookmark: "\f02e"; +@fa-var-print: "\f02f"; +@fa-var-camera: "\f030"; +@fa-var-font: "\f031"; +@fa-var-bold: "\f032"; +@fa-var-italic: "\f033"; +@fa-var-text-height: "\f034"; +@fa-var-text-width: "\f035"; +@fa-var-align-left: "\f036"; +@fa-var-align-center: "\f037"; +@fa-var-align-right: "\f038"; +@fa-var-align-justify: "\f039"; +@fa-var-list: "\f03a"; +@fa-var-outdent: "\f03b"; +@fa-var-indent: "\f03c"; +@fa-var-video-camera: "\f03d"; +@fa-var-picture-o: "\f03e"; +@fa-var-pencil: "\f040"; +@fa-var-map-marker: "\f041"; +@fa-var-adjust: "\f042"; +@fa-var-tint: "\f043"; +@fa-var-pencil-square-o: "\f044"; +@fa-var-share-square-o: "\f045"; +@fa-var-check-square-o: "\f046"; +@fa-var-arrows: "\f047"; +@fa-var-step-backward: "\f048"; +@fa-var-fast-backward: "\f049"; +@fa-var-backward: "\f04a"; +@fa-var-play: "\f04b"; +@fa-var-pause: "\f04c"; +@fa-var-stop: "\f04d"; +@fa-var-forward: "\f04e"; +@fa-var-fast-forward: "\f050"; +@fa-var-step-forward: "\f051"; +@fa-var-eject: "\f052"; +@fa-var-chevron-left: "\f053"; +@fa-var-chevron-right: "\f054"; +@fa-var-plus-circle: "\f055"; +@fa-var-minus-circle: "\f056"; +@fa-var-times-circle: "\f057"; +@fa-var-check-circle: "\f058"; +@fa-var-question-circle: "\f059"; +@fa-var-info-circle: "\f05a"; +@fa-var-crosshairs: "\f05b"; +@fa-var-times-circle-o: "\f05c"; +@fa-var-check-circle-o: "\f05d"; +@fa-var-ban: "\f05e"; +@fa-var-arrow-left: "\f060"; +@fa-var-arrow-right: "\f061"; +@fa-var-arrow-up: "\f062"; +@fa-var-arrow-down: "\f063"; +@fa-var-share: "\f064"; +@fa-var-expand: "\f065"; +@fa-var-compress: "\f066"; +@fa-var-plus: "\f067"; +@fa-var-minus: "\f068"; +@fa-var-asterisk: "\f069"; +@fa-var-exclamation-circle: "\f06a"; +@fa-var-gift: "\f06b"; +@fa-var-leaf: "\f06c"; +@fa-var-fire: "\f06d"; +@fa-var-eye: "\f06e"; +@fa-var-eye-slash: "\f070"; +@fa-var-exclamation-triangle: "\f071"; +@fa-var-plane: "\f072"; +@fa-var-calendar: "\f073"; +@fa-var-random: "\f074"; +@fa-var-comment: "\f075"; +@fa-var-magnet: "\f076"; +@fa-var-chevron-up: "\f077"; +@fa-var-chevron-down: "\f078"; +@fa-var-retweet: "\f079"; +@fa-var-shopping-cart: "\f07a"; +@fa-var-folder: "\f07b"; +@fa-var-folder-open: "\f07c"; +@fa-var-arrows-v: "\f07d"; +@fa-var-arrows-h: "\f07e"; +@fa-var-bar-chart-o: "\f080"; +@fa-var-twitter-square: "\f081"; +@fa-var-facebook-square: "\f082"; +@fa-var-camera-retro: "\f083"; +@fa-var-key: "\f084"; +@fa-var-cogs: "\f085"; +@fa-var-comments: "\f086"; +@fa-var-thumbs-o-up: "\f087"; +@fa-var-thumbs-o-down: "\f088"; +@fa-var-star-half: "\f089"; +@fa-var-heart-o: "\f08a"; +@fa-var-sign-out: "\f08b"; +@fa-var-linkedin-square: "\f08c"; +@fa-var-thumb-tack: "\f08d"; +@fa-var-external-link: "\f08e"; +@fa-var-sign-in: "\f090"; +@fa-var-trophy: "\f091"; +@fa-var-github-square: "\f092"; +@fa-var-upload: "\f093"; +@fa-var-lemon-o: "\f094"; +@fa-var-phone: "\f095"; +@fa-var-square-o: "\f096"; +@fa-var-bookmark-o: "\f097"; +@fa-var-phone-square: "\f098"; +@fa-var-twitter: "\f099"; +@fa-var-facebook: "\f09a"; +@fa-var-github: "\f09b"; +@fa-var-unlock: "\f09c"; +@fa-var-credit-card: "\f09d"; +@fa-var-rss: "\f09e"; +@fa-var-hdd-o: "\f0a0"; +@fa-var-bullhorn: "\f0a1"; +@fa-var-bell: "\f0f3"; +@fa-var-certificate: "\f0a3"; +@fa-var-hand-o-right: "\f0a4"; +@fa-var-hand-o-left: "\f0a5"; +@fa-var-hand-o-up: "\f0a6"; +@fa-var-hand-o-down: "\f0a7"; +@fa-var-arrow-circle-left: "\f0a8"; +@fa-var-arrow-circle-right: "\f0a9"; +@fa-var-arrow-circle-up: "\f0aa"; +@fa-var-arrow-circle-down: "\f0ab"; +@fa-var-globe: "\f0ac"; +@fa-var-wrench: "\f0ad"; +@fa-var-tasks: "\f0ae"; +@fa-var-filter: "\f0b0"; +@fa-var-briefcase: "\f0b1"; +@fa-var-arrows-alt: "\f0b2"; +@fa-var-users: "\f0c0"; +@fa-var-link: "\f0c1"; +@fa-var-cloud: "\f0c2"; +@fa-var-flask: "\f0c3"; +@fa-var-scissors: "\f0c4"; +@fa-var-files-o: "\f0c5"; +@fa-var-paperclip: "\f0c6"; +@fa-var-floppy-o: "\f0c7"; +@fa-var-square: "\f0c8"; +@fa-var-bars: "\f0c9"; +@fa-var-list-ul: "\f0ca"; +@fa-var-list-ol: "\f0cb"; +@fa-var-strikethrough: "\f0cc"; +@fa-var-underline: "\f0cd"; +@fa-var-table: "\f0ce"; +@fa-var-magic: "\f0d0"; +@fa-var-truck: "\f0d1"; +@fa-var-pinterest: "\f0d2"; +@fa-var-pinterest-square: "\f0d3"; +@fa-var-google-plus-square: "\f0d4"; +@fa-var-google-plus: "\f0d5"; +@fa-var-money: "\f0d6"; +@fa-var-caret-down: "\f0d7"; +@fa-var-caret-up: "\f0d8"; +@fa-var-caret-left: "\f0d9"; +@fa-var-caret-right: "\f0da"; +@fa-var-columns: "\f0db"; +@fa-var-sort: "\f0dc"; +@fa-var-sort-asc: "\f0dd"; +@fa-var-sort-desc: "\f0de"; +@fa-var-envelope: "\f0e0"; +@fa-var-linkedin: "\f0e1"; +@fa-var-undo: "\f0e2"; +@fa-var-gavel: "\f0e3"; +@fa-var-tachometer: "\f0e4"; +@fa-var-comment-o: "\f0e5"; +@fa-var-comments-o: "\f0e6"; +@fa-var-bolt: "\f0e7"; +@fa-var-sitemap: "\f0e8"; +@fa-var-umbrella: "\f0e9"; +@fa-var-clipboard: "\f0ea"; +@fa-var-lightbulb-o: "\f0eb"; +@fa-var-exchange: "\f0ec"; +@fa-var-cloud-download: "\f0ed"; +@fa-var-cloud-upload: "\f0ee"; +@fa-var-user-md: "\f0f0"; +@fa-var-stethoscope: "\f0f1"; +@fa-var-suitcase: "\f0f2"; +@fa-var-bell-o: "\f0a2"; +@fa-var-coffee: "\f0f4"; +@fa-var-cutlery: "\f0f5"; +@fa-var-file-text-o: "\f0f6"; +@fa-var-building-o: "\f0f7"; +@fa-var-hospital-o: "\f0f8"; +@fa-var-ambulance: "\f0f9"; +@fa-var-medkit: "\f0fa"; +@fa-var-fighter-jet: "\f0fb"; +@fa-var-beer: "\f0fc"; +@fa-var-h-square: "\f0fd"; +@fa-var-plus-square: "\f0fe"; +@fa-var-angle-double-left: "\f100"; +@fa-var-angle-double-right: "\f101"; +@fa-var-angle-double-up: "\f102"; +@fa-var-angle-double-down: "\f103"; +@fa-var-angle-left: "\f104"; +@fa-var-angle-right: "\f105"; +@fa-var-angle-up: "\f106"; +@fa-var-angle-down: "\f107"; +@fa-var-desktop: "\f108"; +@fa-var-laptop: "\f109"; +@fa-var-tablet: "\f10a"; +@fa-var-mobile: "\f10b"; +@fa-var-circle-o: "\f10c"; +@fa-var-quote-left: "\f10d"; +@fa-var-quote-right: "\f10e"; +@fa-var-spinner: "\f110"; +@fa-var-circle: "\f111"; +@fa-var-reply: "\f112"; +@fa-var-github-alt: "\f113"; +@fa-var-folder-o: "\f114"; +@fa-var-folder-open-o: "\f115"; +@fa-var-smile-o: "\f118"; +@fa-var-frown-o: "\f119"; +@fa-var-meh-o: "\f11a"; +@fa-var-gamepad: "\f11b"; +@fa-var-keyboard-o: "\f11c"; +@fa-var-flag-o: "\f11d"; +@fa-var-flag-checkered: "\f11e"; +@fa-var-terminal: "\f120"; +@fa-var-code: "\f121"; +@fa-var-reply-all: "\f122"; +@fa-var-mail-reply-all: "\f122"; +@fa-var-star-half-o: "\f123"; +@fa-var-location-arrow: "\f124"; +@fa-var-crop: "\f125"; +@fa-var-code-fork: "\f126"; +@fa-var-chain-broken: "\f127"; +@fa-var-question: "\f128"; +@fa-var-info: "\f129"; +@fa-var-exclamation: "\f12a"; +@fa-var-superscript: "\f12b"; +@fa-var-subscript: "\f12c"; +@fa-var-eraser: "\f12d"; +@fa-var-puzzle-piece: "\f12e"; +@fa-var-microphone: "\f130"; +@fa-var-microphone-slash: "\f131"; +@fa-var-shield: "\f132"; +@fa-var-calendar-o: "\f133"; +@fa-var-fire-extinguisher: "\f134"; +@fa-var-rocket: "\f135"; +@fa-var-maxcdn: "\f136"; +@fa-var-chevron-circle-left: "\f137"; +@fa-var-chevron-circle-right: "\f138"; +@fa-var-chevron-circle-up: "\f139"; +@fa-var-chevron-circle-down: "\f13a"; +@fa-var-html5: "\f13b"; +@fa-var-css3: "\f13c"; +@fa-var-anchor: "\f13d"; +@fa-var-unlock-alt: "\f13e"; +@fa-var-bullseye: "\f140"; +@fa-var-ellipsis-h: "\f141"; +@fa-var-ellipsis-v: "\f142"; +@fa-var-rss-square: "\f143"; +@fa-var-play-circle: "\f144"; +@fa-var-ticket: "\f145"; +@fa-var-minus-square: "\f146"; +@fa-var-minus-square-o: "\f147"; +@fa-var-level-up: "\f148"; +@fa-var-level-down: "\f149"; +@fa-var-check-square: "\f14a"; +@fa-var-pencil-square: "\f14b"; +@fa-var-external-link-square: "\f14c"; +@fa-var-share-square: "\f14d"; +@fa-var-compass: "\f14e"; +@fa-var-caret-square-o-down: "\f150"; +@fa-var-caret-square-o-up: "\f151"; +@fa-var-caret-square-o-right: "\f152"; +@fa-var-eur: "\f153"; +@fa-var-gbp: "\f154"; +@fa-var-usd: "\f155"; +@fa-var-inr: "\f156"; +@fa-var-jpy: "\f157"; +@fa-var-rub: "\f158"; +@fa-var-krw: "\f159"; +@fa-var-btc: "\f15a"; +@fa-var-file: "\f15b"; +@fa-var-file-text: "\f15c"; +@fa-var-sort-alpha-asc: "\f15d"; +@fa-var-sort-alpha-desc: "\f15e"; +@fa-var-sort-amount-asc: "\f160"; +@fa-var-sort-amount-desc: "\f161"; +@fa-var-sort-numeric-asc: "\f162"; +@fa-var-sort-numeric-desc: "\f163"; +@fa-var-thumbs-up: "\f164"; +@fa-var-thumbs-down: "\f165"; +@fa-var-youtube-square: "\f166"; +@fa-var-youtube: "\f167"; +@fa-var-xing: "\f168"; +@fa-var-xing-square: "\f169"; +@fa-var-youtube-play: "\f16a"; +@fa-var-dropbox: "\f16b"; +@fa-var-stack-overflow: "\f16c"; +@fa-var-instagram: "\f16d"; +@fa-var-flickr: "\f16e"; +@fa-var-adn: "\f170"; +@fa-var-bitbucket: "\f171"; +@fa-var-bitbucket-square: "\f172"; +@fa-var-tumblr: "\f173"; +@fa-var-tumblr-square: "\f174"; +@fa-var-long-arrow-down: "\f175"; +@fa-var-long-arrow-up: "\f176"; +@fa-var-long-arrow-left: "\f177"; +@fa-var-long-arrow-right: "\f178"; +@fa-var-apple: "\f179"; +@fa-var-windows: "\f17a"; +@fa-var-android: "\f17b"; +@fa-var-linux: "\f17c"; +@fa-var-dribbble: "\f17d"; +@fa-var-skype: "\f17e"; +@fa-var-foursquare: "\f180"; +@fa-var-trello: "\f181"; +@fa-var-female: "\f182"; +@fa-var-male: "\f183"; +@fa-var-gittip: "\f184"; +@fa-var-sun-o: "\f185"; +@fa-var-moon-o: "\f186"; +@fa-var-archive: "\f187"; +@fa-var-bug: "\f188"; +@fa-var-vk: "\f189"; +@fa-var-weibo: "\f18a"; +@fa-var-renren: "\f18b"; +@fa-var-pagelines: "\f18c"; +@fa-var-stack-exchange: "\f18d"; +@fa-var-arrow-circle-o-right: "\f18e"; +@fa-var-arrow-circle-o-left: "\f190"; +@fa-var-caret-square-o-left: "\f191"; +@fa-var-dot-circle-o: "\f192"; +@fa-var-wheelchair: "\f193"; +@fa-var-vimeo-square: "\f194"; +@fa-var-try: "\f195"; +@fa-var-plus-square-o: "\f196"; diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config index d7125923a08..e82bf1e7930 100644 --- a/ckan/public/base/vendor/resource.config +++ b/ckan/public/base/vendor/resource.config @@ -7,7 +7,6 @@ force_top = html5.js [IE conditional] lte IE 8 = html5.js block_html5_shim polyfill-object-keys.js -IE 7 = font-awesome/css/font-awesome-ie7.css [custom render order] @@ -39,7 +38,6 @@ vendor = bootstrap = bootstrap/js/bootstrap.js font-awesome/css/font-awesome.css - font-awesome/css/font-awesome-ie7.css fileupload = jquery.ui.widget.js diff --git a/ckan/templates/admin/config.html b/ckan/templates/admin/config.html index 29f2d101fb8..798d9b46b5c 100644 --- a/ckan/templates/admin/config.html +++ b/ckan/templates/admin/config.html @@ -23,7 +23,7 @@ {% block secondary_content %}

    - + {{ _('CKAN config options') }}

    diff --git a/ckan/templates/admin/index.html b/ckan/templates/admin/index.html index 73947b537a0..498da63d440 100644 --- a/ckan/templates/admin/index.html +++ b/ckan/templates/admin/index.html @@ -11,7 +11,7 @@ {% block secondary_content %}

    - + {{ _('Administer CKAN') }}

    diff --git a/ckan/templates/admin/trash.html b/ckan/templates/admin/trash.html index baa70cfaba0..2484eb7cefd 100644 --- a/ckan/templates/admin/trash.html +++ b/ckan/templates/admin/trash.html @@ -25,7 +25,7 @@ {% block secondary_content %}

    - + {{ _('Trash') }}

    diff --git a/ckan/templates/dataviewer/snippets/data_preview.html b/ckan/templates/dataviewer/snippets/data_preview.html index 84a23cfd876..d33a6fd8f94 100644 --- a/ckan/templates/dataviewer/snippets/data_preview.html +++ b/ckan/templates/dataviewer/snippets/data_preview.html @@ -5,7 +5,7 @@ {% else %}

    - + {{ _('This resource can not be previewed at the moment.') }} {{ _('Click here for more information.') }} @@ -14,7 +14,7 @@

    - + {{ _('Download resource') }}

    diff --git a/ckan/templates/dataviewer/snippets/no_preview.html b/ckan/templates/dataviewer/snippets/no_preview.html index a0a89ace362..0a0e46975fc 100644 --- a/ckan/templates/dataviewer/snippets/no_preview.html +++ b/ckan/templates/dataviewer/snippets/no_preview.html @@ -2,7 +2,7 @@
    {{ _('No preview available.') }}
    {% if reason %} diff --git a/ckan/templates/development/primer.html b/ckan/templates/development/primer.html index 6fecf8673e6..9ae39586ca0 100644 --- a/ckan/templates/development/primer.html +++ b/ckan/templates/development/primer.html @@ -14,7 +14,7 @@ {% snippet 'development/snippets/context.html' %}
    -

    Helper text

    +

    Helper text

    {{ lipsum(1) }}
    @@ -30,7 +30,7 @@

    Helper text

    - +
    diff --git a/ckan/templates/development/snippets/actions.html b/ckan/templates/development/snippets/actions.html index 7a01233158d..20a6962f7bb 100644 --- a/ckan/templates/development/snippets/actions.html +++ b/ckan/templates/development/snippets/actions.html @@ -1,2 +1,2 @@ -
  • Button
    • -
  • Primary Button
    • +
  • Button
    • +
  • Primary Button
    • diff --git a/ckan/templates/development/snippets/facet.html b/ckan/templates/development/snippets/facet.html index 7280bf9a3d2..188d0269cd4 100644 --- a/ckan/templates/development/snippets/facet.html +++ b/ckan/templates/development/snippets/facet.html @@ -1,6 +1,6 @@
    {% with items=(("First", true), ("Second", false), ("Third", true), ("Fourth", false), ("Last", false)) %} -

    Facet List

    +

    Facet List